Merge remote-tracking branch 'origin/test_resolve_conflicts' into test_resolve_conflicts

1 files changed, 3 insertions, 6 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 1f6fcdc9..13ba3142 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -158,10 +158,7 @@ def save_files(js_data, images, do_make_zip, index):
             writer.writerow(["prompt", "seed", "width", "height", "sampler", "cfgs", "steps", "filename", "negative_prompt"])

 

         for image_index, filedata in enumerate(images, start_index):

-            if filedata.startswith("data:image/png;base64,"):

-                filedata = filedata[len("data:image/png;base64,"):]

-

-            image = Image.open(io.BytesIO(base64.decodebytes(filedata.encode('utf-8'))))

+            image = image_from_url_text(filedata)

 

             is_grid = image_index < p.index_of_first_image

             i = 0 if is_grid else (image_index - p.index_of_first_image)

@@ -638,7 +635,7 @@ def create_ui(wrap_gradio_gpu_call):
                     txt2img_preview = gr.Image(elem_id='txt2img_preview', visible=False)

                     txt2img_gallery = gr.Gallery(label='Output', show_label=False, elem_id='txt2img_gallery').style(grid=4)

 

-                with gr.Group():

+                with gr.Column():

                     with gr.Row():

                         save = gr.Button('Save')

                         send_to_img2img = gr.Button('Send to img2img')

@@ -862,7 +859,7 @@ def create_ui(wrap_gradio_gpu_call):
                     img2img_preview = gr.Image(elem_id='img2img_preview', visible=False)

                     img2img_gallery = gr.Gallery(label='Output', show_label=False, elem_id='img2img_gallery').style(grid=4)

 

-                with gr.Group():

+                with gr.Column():

                     with gr.Row():

                         save = gr.Button('Save')

                         img2img_send_to_img2img = gr.Button('Send to img2img')