Merge pull request #698 from glubsy/fix_630

Workaround for #630
Try to handle conversion to int or fail gracefully
2025-05-07 09:19:50 +00:00 · 2020-08-06 23:16:02 -05:00 · 2020-08-07 00:37:37 +02:00 · 2020-08-06 00:23:49 +02:00
1 changed files with 9 additions and 0 deletions
--- a/qt/pe/photo.py
+++ b/qt/pe/photo.py
@ -29,6 +29,15 @@ class File(PhotoBase):
    def _plat_get_blocks(self, block_count_per_side, orientation):
        image = QImage(str(self.path))
        image = image.convertToFormat(QImage.Format_RGB888)
+        if type(orientation) == str:
+            logging.warning("Orientation for file '%s' was a str '%s', not an int.",
+                            str(self.path), orientation)
+            try:
+                orientation = int(orientation)
+            except Exception as e:
+                logging.exception("Skipping transformation because could not \
+convert str to int. %s", e)
+                return getblocks(image, block_count_per_side)
        # MYSTERY TO SOLVE: For reasons I cannot explain, orientations 5 and 7 don't work for
        # duplicate scanning. The transforms seems to work fine (if I try to save the image after
        # the transform, we see that the image has been correctly flipped and rotated), but the