Treat IFDs as LONG8

radarhere · Nov 4, 2024 · 33fac14 · 33fac14
1 parent a609816
commit 33fac14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/PIL/TiffTags.py b/src/PIL/TiffTags.py
@@ -207,12 +207,12 @@ def lookup(tag: int, group: int | None = None) -> TagInfo:
     33723: ("IptcNaaInfo", UNDEFINED, 1),
     34377: ("PhotoshopInfo", BYTE, 0),
     # FIXME add more tags here
-    34665: ("ExifIFD", LONG, 1),
+    34665: ("ExifIFD", LONG8, 1),
     34675: ("ICCProfile", UNDEFINED, 1),
-    34853: ("GPSInfoIFD", LONG, 1),
+    34853: ("GPSInfoIFD", LONG8, 1),
     36864: ("ExifVersion", UNDEFINED, 1),
     37724: ("ImageSourceData", UNDEFINED, 1),
-    40965: ("InteroperabilityIFD", LONG, 1),
+    40965: ("InteroperabilityIFD", LONG8, 1),
     41730: ("CFAPattern", UNDEFINED, 1),
     # MPInfo
     45056: ("MPFVersion", UNDEFINED, 1),
@@ -245,7 +245,7 @@ def lookup(tag: int, group: int | None = None) -> TagInfo:
     34665: {
         36864: ("ExifVersion", UNDEFINED, 1),
         40960: ("FlashPixVersion", UNDEFINED, 1),
-        40965: ("InteroperabilityIFD", LONG, 1),
+        40965: ("InteroperabilityIFD", LONG8, 1),
         41730: ("CFAPattern", UNDEFINED, 1),
     },
     # GPSInfoIFD

diff --git a/src/encode.c b/src/encode.c
@@ -736,7 +736,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
             }
             if (tag_type) {
                 int type_int = PyLong_AsLong(tag_type);
-                if (type_int >= TIFF_BYTE && type_int <= TIFF_DOUBLE) {
+                if (type_int >= TIFF_BYTE && type_int <= TIFF_LONG8) {
                     type = (TIFFDataType)type_int;
                 }
             }
@@ -929,7 +929,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                 );
             } else if (type == TIFF_LONG) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value)
+                    &encoder->state, (ttag_t)key_int, (UINT32)PyLong_AsLong(value)
                 );
             } else if (type == TIFF_SSHORT) {
                 status = ImagingLibTiffSetField(
@@ -959,6 +959,10 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                 status = ImagingLibTiffSetField(
                     &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value)
                 );
+            } else if (type == TIFF_LONG8) {
+                status = ImagingLibTiffSetField(
+                    &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value)
+                );
             } else {
                 TRACE(
                     ("Unhandled type for key %d : %s \n",