Merge branch 'master' into image_info_tab

1 files changed, 7 insertions, 6 deletions

diff --git a/modules/images.py b/modules/images.py
index f37f5f08..a3064333 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -274,7 +274,7 @@ def apply_filename_pattern(x, p, seed, prompt):
         x = x.replace("[height]", str(p.height))

         x = x.replace("[sampler]", sd_samplers.samplers[p.sampler_index].name)

 

-    x = x.replace("[model_hash]", shared.sd_model_hash)

+    x = x.replace("[model_hash]", shared.sd_model.sd_model_hash)

     x = x.replace("[date]", datetime.date.today().isoformat())

 

     if cmd_opts.hide_ui_dir_config:

@@ -353,13 +353,12 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
         })

 

     if extension.lower() in ("jpg", "jpeg", "webp"):

-        image.save(fullfn, quality=opts.jpeg_quality, exif_bytes=exif_bytes())

+        image.save(fullfn, quality=opts.jpeg_quality)

+        if opts.enable_pnginfo and info is not None:

+            piexif.insert(exif_bytes(), fullfn)

     else:

         image.save(fullfn, quality=opts.jpeg_quality, pnginfo=pnginfo)

 

-    if extension.lower() == "webp":

-        piexif.insert(exif_bytes, fullfn)

-

     target_side_length = 4000

     oversize = image.width > target_side_length or image.height > target_side_length

     if opts.export_for_4chan and (oversize or os.stat(fullfn).st_size > 4 * 1024 * 1024):

@@ -370,7 +369,9 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
         elif oversize:

             image = image.resize((image.width * target_side_length // image.height, target_side_length), LANCZOS)

 

-        image.save(fullfn_without_extension + ".jpg", quality=opts.jpeg_quality, exif_bytes=exif_bytes())

+        image.save(fullfn_without_extension + ".jpg", quality=opts.jpeg_quality)

+        if opts.enable_pnginfo and info is not None:

+            piexif.insert(exif_bytes(), fullfn)

 

     if opts.save_txt and info is not None:

         with open(f"{fullfn_without_extension}.txt", "w", encoding="utf8") as file: