Merge branch 'master' into master

1 files changed, 11 insertions, 4 deletions

diff --git a/modules/images.py b/modules/images.py
index 38404de3..7030aaaa 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -556,7 +556,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
             elif image_to_save.mode == 'I;16':

                 image_to_save = image_to_save.point(lambda p: p * 0.0038910505836576).convert("RGB" if extension.lower() == ".webp" else "L")

 

-            image_to_save.save(temp_file_path, format=image_format, quality=opts.jpeg_quality)

+            image_to_save.save(temp_file_path, format=image_format, quality=opts.jpeg_quality, lossless=opts.webp_lossless)

 

             if opts.enable_pnginfo and info is not None:

                 exif_bytes = piexif.dump({

@@ -573,6 +573,11 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
         os.replace(temp_file_path, filename_without_extension + extension)

 

     fullfn_without_extension, extension = os.path.splitext(params.filename)

+    if hasattr(os, 'statvfs'):

+        max_name_len = os.statvfs(path).f_namemax

+        fullfn_without_extension = fullfn_without_extension[:max_name_len - max(4, len(extension))]

+        params.filename = fullfn_without_extension + extension

+        fullfn = params.filename

     _atomically_save_image(image, fullfn_without_extension, extension)

 

     image.already_saved_as = fullfn

@@ -582,9 +587,9 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
         ratio = image.width / image.height

 

         if oversize and ratio > 1:

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

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

         elif oversize:

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

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

 

         try:

             _atomically_save_image(image, fullfn_without_extension, ".jpg")

@@ -640,6 +645,8 @@ Steps: {json_info["steps"]}, Sampler: {sampler}, CFG scale: {json_info["scale"]}
 

 

 def image_data(data):

+    import gradio as gr

+

     try:

         image = Image.open(io.BytesIO(data))

         textinfo, _ = read_info_from_image(image)

@@ -655,7 +662,7 @@ def image_data(data):
     except Exception:

         pass

 

-    return '', None

+    return gr.update(), None

 

 

 def flatten(img, bgcolor):