Use fault-tolerant PNG loading (Fix issue #14).

Hierosoft · Apr 11, 2024 · cc46d19 · cc46d19
1 parent cbb2184
commit cc46d19
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/channeltinkerpil/__init__.py b/channeltinkerpil/__init__.py
@@ -14,6 +14,10 @@
 )
 
 ImageFile.LOAD_TRUNCATED_IMAGES = True
+# ^ Avoids issue #14 (GIMP images with
+#   "Raw profile type exif"), and image is displayed
+#   (often image isn't really broken,
+#   such as if saved with GIMP)
 
 
 def gen_diff_image(base, head, diff=None, diff_path=None):

diff --git a/channeltinkerpil/diffimagetk.py b/channeltinkerpil/diffimagetk.py
@@ -5,7 +5,7 @@
 from collections import OrderedDict
 import tkinter as tk
 import PIL
-from PIL import ImageTk, Image
+from PIL import ImageTk, ImageFile, Image
 
 if __name__ == "__main__":
     MODULE_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -16,6 +16,13 @@
     gen_diff_image,
 )
 
+ImageFile.LOAD_TRUNCATED_IMAGES = True
+# ^ Avoids issue #14 (GIMP images with
+#   "Raw profile type exif"), and image is displayed
+#   (often image isn't really broken,
+#   such as if saved with GIMP)
+
+
 # from channeltinker import diff_images
 
 

diff --git a/channeltinkerpil/findbyappearance.py b/channeltinkerpil/findbyappearance.py
@@ -19,9 +19,17 @@
     sys.stderr.flush()
     sys.exit(1)
 
-from PIL import Image
+from PIL import Image, ImageFile
 import PIL
 
+
+ImageFile.LOAD_TRUNCATED_IMAGES = True
+# ^ Avoids issue #14 (GIMP images with
+#   "Raw profile type exif"), and image is displayed
+#   (often image isn't really broken,
+#   such as if saved with GIMP)
+
+
 results = []
 
 

diff --git a/channeltinkerpil/imageprocessorframe.py b/channeltinkerpil/imageprocessorframe.py
@@ -63,7 +63,8 @@
 
 try:
     import PIL
-    from PIL import Image
+    from PIL import Image, ImageFile
+    ImageFile.LOAD_TRUNCATED_IMAGES = True  # Fix issue #14 GIMP-saved
 except ModuleNotFoundError as ex:
     print("{}".format(ex))
     print()
@@ -905,10 +906,16 @@ def loadImage(self, path):
                 self.markBtn['state'] = tk.NORMAL
                 echo1('- loaded.')
             except PIL.UnidentifiedImageError:
+                # Must be *really* corrupt if
+                # ImageFile.LOAD_TRUNCATED_IMAGES = True
+                # doesn't work.
                 # self.imageLabels[index].configure(image='')
                 echo0(prefix+"index={}".format(index))
                 self.imageErrorVars[index].set("unreadable")
                 err = "Error: unreadable image"
+                # err = "{}: {}".format(type(ex).__name__, ex)
+                # ^ str(ex) is long & contains path, but path
+                #   will be shown anyway.
                 self.statusSV.set(err)
                 # return False, err
             except Exception as ex: