Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into tomesd

1 files changed, 4 insertions, 7 deletions

diff --git a/modules/img2img.py b/modules/img2img.py
index 56c846d6..d704bf90 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -1,19 +1,15 @@
-import math

 import os

-import sys

-import traceback

 

 import numpy as np

 from PIL import Image, ImageOps, ImageFilter, ImageEnhance, ImageChops, UnidentifiedImageError

 

-from modules import devices, sd_samplers

+from modules import sd_samplers

 from modules.generation_parameters_copypaste import create_override_settings_dict

 from modules.processing import Processed, StableDiffusionProcessingImg2Img, process_images

 from modules.shared import opts, state

 import modules.shared as shared

 import modules.processing as processing

 from modules.ui import plaintext_to_html

-import modules.images as images

 import modules.scripts

 

 

@@ -48,7 +44,8 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
 

         try:

             img = Image.open(image)

-        except UnidentifiedImageError:

+        except UnidentifiedImageError as e:

+            print(e)

             continue

         # Use the EXIF orientation of photos taken by smartphones.

         img = ImageOps.exif_transpose(img)

@@ -58,7 +55,7 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
             # try to find corresponding mask for an image using simple filename matching

             mask_image_path = os.path.join(inpaint_mask_dir, os.path.basename(image))

             # if not found use first one ("same mask for all images" use-case)

-            if not mask_image_path in inpaint_masks:

+            if mask_image_path not in inpaint_masks:

                 mask_image_path = inpaint_masks[0]

             mask_image = Image.open(mask_image_path)

             p.image_mask = mask_image