diff --git a/modules/processing.py b/modules/processing.py index 0e9f137c0..a50988884 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -55,7 +55,7 @@ def apply_overlay(image, paste_loc, index, overlays): if paste_loc is not None: x, y, w, h = paste_loc base_image = Image.new('RGBA', (overlay.width, overlay.height)) - image = images.resize_image(1, image, w, h) + image = images.resize_image(2, image, w, h) base_image.paste(image, (x, y)) image = base_image image = image.convert('RGBA') @@ -749,7 +749,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: output_images.append(image) if hasattr(p, 'mask_for_overlay') and p.mask_for_overlay and any([shared.opts.save_mask, shared.opts.save_mask_composite, shared.opts.return_mask, shared.opts.return_mask_composite]): image_mask = p.mask_for_overlay.convert('RGB') - image_mask_composite = Image.composite(image.convert('RGBA').convert('RGBa'), Image.new('RGBa', image.size), images.resize_image(2, p.mask_for_overlay, image.width, image.height).convert('L')).convert('RGBA') + image_mask_composite = Image.composite(image.convert('RGBA').convert('RGBa'), Image.new('RGBa', image.size), images.resize_image(3, p.mask_for_overlay, image.width, image.height).convert('L')).convert('RGBA') if shared.opts.save_mask: images.save_image(image_mask, p.outpath_samples, "", seeds[i], prompts[i], shared.opts.samples_format, info=infotext(n, i), p=p, suffix="-mask") if shared.opts.save_mask_composite: @@ -941,7 +941,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing): x_sample = x_sample.astype(np.uint8) image = Image.fromarray(x_sample) save_intermediate(image, i) - image = images.resize_image(0, image, target_width, target_height, upscaler_name=self.hr_upscaler) + image = images.resize_image(1, image, target_width, target_height, upscaler_name=self.hr_upscaler) image = np.array(image).astype(np.float32) / 255.0 image = np.moveaxis(image, 2, 0) batch_images.append(image) @@ -1030,7 +1030,7 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing): crop_region = masking.expand_crop_region(crop_region, self.width, self.height, mask.width, mask.height) x1, y1, x2, y2 = crop_region mask = mask.crop(crop_region) - image_mask = images.resize_image(2, mask, self.width, self.height) + image_mask = images.resize_image(3, mask, self.width, self.height) self.paste_to = (x1, y1, x2-x1, y2-y1) else: image_mask = images.resize_image(self.resize_mode, image_mask, self.width, self.height) @@ -1061,7 +1061,7 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing): # crop_region is not None if we are doing inpaint full res if crop_region is not None: image = image.crop(crop_region) - image = images.resize_image(2, image, self.width, self.height) + image = images.resize_image(3, image, self.width, self.height) self.init_images = image # assign early for diffusers if image_mask is not None: if self.inpainting_fill != 1: