Merge branch 'main' into build1518

# Conflicts: # main.spec
leslievan · Aug 4, 2023 · 7560664 · 7560664
2 parents 9506901 + cc734a7
commit 7560664
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/entity/image_container.py b/entity/image_container.py
@@ -241,4 +241,9 @@ def save(self, target_path, quality=100):
 
         if self.watermark_img.mode != 'RGB':
             self.watermark_img = self.watermark_img.convert('RGB')
-        self.watermark_img.save(target_path, quality=quality, encoding='utf-8', exif=self.img.info['exif'])
+
+        if 'exif' in self.img.info:
+            self.watermark_img.save(target_path, quality=quality, encoding='utf-8',
+                                    exif=self.img.info['exif'] if 'exif' in self.img.info else '')
+        else:
+            self.watermark_img.save(target_path, quality=quality, encoding='utf-8')