From f593cbfec417a3ea40589fe64e7f8806c9a81e5a Mon Sep 17 00:00:00 2001
From: AngelBottomless <aria1th@naver.com>
Date: Sun, 3 Sep 2023 21:07:36 +0900
Subject: fallback if exif data was invalid

---
 modules/images.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules/images.py')

diff --git a/modules/images.py b/modules/images.py
index eb644733..8512a46e 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -718,7 +718,12 @@ def read_info_from_image(image: Image.Image) -> tuple[str | None, dict]:
     geninfo = items.pop('parameters', None)
 
     if "exif" in items:
-        exif = piexif.load(items["exif"])
+        exif_data = items["exif"]
+        try:
+            exif = piexif.load(exif_data)
+        except OSError:
+            # memory / exif was not valid so piexif tried to read from a file
+            exif = None
         exif_comment = (exif or {}).get("Exif", {}).get(piexif.ExifIFD.UserComment, b'')
         try:
             exif_comment = piexif.helper.UserComment.load(exif_comment)
-- 
cgit v1.2.3


From 022639a145751d61db1c144e5e657aa6481e2bc0 Mon Sep 17 00:00:00 2001
From: JaredTherriault <noirjt@live.com>
Date: Mon, 4 Sep 2023 17:37:48 -0700
Subject: Load comments from gif images to gather geninfo from gif outputs

---
 modules/images.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules/images.py')

diff --git a/modules/images.py b/modules/images.py
index eb644733..8c6e862f 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -728,6 +728,8 @@ def read_info_from_image(image: Image.Image) -> tuple[str | None, dict]:
         if exif_comment:
             items['exif comment'] = exif_comment
             geninfo = exif_comment
+    elif "comment" in items: # for gif
+        geninfo = items["comment"].decode('utf8', errors="ignore")
 
     for field in IGNORED_INFO_KEYS:
         items.pop(field, None)
-- 
cgit v1.2.3


From 35d1c94549cf75e7e312372d90fee0acc2806426 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Wed, 6 Sep 2023 20:24:26 +0900
Subject: save_images_add_number_suffix

---
 modules/images.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'modules/images.py')

diff --git a/modules/images.py b/modules/images.py
index eb644733..10dcd9ab 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -661,7 +661,15 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
 
         save_image_with_geninfo(image_to_save, info, temp_file_path, extension, existing_pnginfo=params.pnginfo, pnginfo_section_name=pnginfo_section_name)
 
-        os.replace(temp_file_path, filename_without_extension + extension)
+        full_file_name = filename_without_extension + extension
+        if shared.opts.save_images_add_number_suffix and os.path.exists(full_file_name):
+            count = 1
+            while True:
+                full_file_name = f"{filename_without_extension}_{count}{extension}"
+                if not os.path.exists(full_file_name):
+                    break
+                count += 1
+        os.replace(temp_file_path, full_file_name)
 
     fullfn_without_extension, extension = os.path.splitext(params.filename)
     if hasattr(os, 'statvfs'):
-- 
cgit v1.2.3


From 3ca4655a18eb80cca5f806412f2cb2d56cc536e5 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 9 Sep 2023 09:08:31 +0300
Subject: update for #12926

---
 modules/images.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'modules/images.py')

diff --git a/modules/images.py b/modules/images.py
index 10dcd9ab..5cf3c825 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -661,15 +661,13 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
 
         save_image_with_geninfo(image_to_save, info, temp_file_path, extension, existing_pnginfo=params.pnginfo, pnginfo_section_name=pnginfo_section_name)
 
-        full_file_name = filename_without_extension + extension
-        if shared.opts.save_images_add_number_suffix and os.path.exists(full_file_name):
-            count = 1
-            while True:
-                full_file_name = f"{filename_without_extension}_{count}{extension}"
-                if not os.path.exists(full_file_name):
-                    break
-                count += 1
-        os.replace(temp_file_path, full_file_name)
+        filename = filename_without_extension + extension
+        if shared.opts.save_images_replace_action != "Replace":
+            n = 0
+            while os.path.exists(filename):
+                n += 1
+                filename = f"{filename_without_extension}-{n}{extension}"
+        os.replace(temp_file_path, filename)
 
     fullfn_without_extension, extension = os.path.splitext(params.filename)
     if hasattr(os, 'statvfs'):
-- 
cgit v1.2.3


From ab63054f95a7b7dfb2f0ffa88e805c8d2f950605 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 30 Sep 2023 09:34:50 +0300
Subject: write infotext to gif image as comment

---
 modules/images.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules/images.py')

diff --git a/modules/images.py b/modules/images.py
index 1e63118e..daf4eebe 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -561,6 +561,8 @@ def save_image_with_geninfo(image, geninfo, filename, extension=None, existing_p
             })
 
             piexif.insert(exif_bytes, filename)
+    elif extension.lower() == ".gif":
+        image.save(filename, format=image_format, comment=geninfo)
     else:
         image.save(filename, format=image_format, quality=opts.jpeg_quality)
 
-- 
cgit v1.2.3