From 0d7a17add52d8d7bfb3b7294afcb2ffb3adf9357 Mon Sep 17 00:00:00 2001 From: Andray Date: Sat, 20 Jul 2024 12:25:00 +0400 Subject: [PATCH 1/2] fix inpaint only masked --- modules/masking.py | 38 ++++++++++++++++++++++++++++++++++++++ modules/processing.py | 8 +++++++- modules/shared_options.py | 1 + 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/modules/masking.py b/modules/masking.py index 2fc830319..29548bd8d 100644 --- a/modules/masking.py +++ b/modules/masking.py @@ -1,3 +1,4 @@ +import math from PIL import Image, ImageFilter, ImageOps @@ -77,6 +78,43 @@ def expand_crop_region(crop_region, processing_width, processing_height, image_w return x1, y1, x2, y2 +def fix_crop_region_integer_scale(crop_region, processing_width, processing_height, image_width, image_height): + """expands crop region get_crop_region() to avoid non-integer scaling artifacts (different pixels size) after applying overlay""" + + x1, y1, x2, y2 = crop_region + + ratio_w = (x2 - x1) / processing_width + ratio_h = (y2 - y1) / processing_height + + desired_w = math.ceil(ratio_w) * processing_width + diff_w = desired_w - (x2 - x1) + diff_w_l = diff_w // 2 + diff_w_r = diff_w - diff_w_l + x1 -= diff_w_l + x2 += diff_w_r + if x1 < 0: + x2 -= x1 + x1 -= x1 + if x2 >= image_width: + x2 = image_width + + desired_h = math.ceil(ratio_h) * processing_height + diff_h = desired_h - (y2 - y1) + diff_h_u = diff_h // 2 + diff_h_d = diff_h - diff_h_u + y1 -= diff_h_u + y2 += diff_h_d + if y1 < 0: + y2 -= y1 + y1 -= y1 + if y2 >= image_height: + y2 = image_height + + print(f"padding was increased by {max(diff_w_l, diff_w_r, diff_h_u, diff_h_d)} after integer upscale correction") + + return x1, y1, x2, y2 + + def fill(image, mask): """fills masked regions with colors from image using blur. Not extremely effective.""" diff --git a/modules/processing.py b/modules/processing.py index 7535b56e1..a7fd3e031 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -65,8 +65,12 @@ def apply_color_correction(correction, original_image): def uncrop(image, dest_size, paste_loc): x, y, w, h = paste_loc base_image = Image.new('RGBA', dest_size) + factor_x = w // image.size[0] + factor_y = h // image.size[1] image = images.resize_image(1, image, w, h) - base_image.paste(image, (x, y)) + paste_x = max(x - factor_x, 0) + paste_y = max(y - factor_y, 0) + base_image.paste(image, (paste_x, paste_y)) image = base_image return image @@ -1639,6 +1643,8 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing): crop_region = masking.get_crop_region_v2(mask, self.inpaint_full_res_padding) if crop_region: crop_region = masking.expand_crop_region(crop_region, self.width, self.height, mask.width, mask.height) + if shared.opts.integer_only_masked: + crop_region = masking.fix_crop_region_integer_scale(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) diff --git a/modules/shared_options.py b/modules/shared_options.py index 096366e0a..15331d4b5 100644 --- a/modules/shared_options.py +++ b/modules/shared_options.py @@ -226,6 +226,7 @@ options_templates.update(options_section(('img2img', "img2img", "sd"), { "return_mask_composite": OptionInfo(False, "For inpainting, include masked composite in results for web"), "img2img_batch_show_results_limit": OptionInfo(32, "Show the first N batch img2img results in UI", gr.Slider, {"minimum": -1, "maximum": 1000, "step": 1}).info('0: disable, -1: show all images. Too many images can cause lag'), "overlay_inpaint": OptionInfo(True, "Overlay original for inpaint").info("when inpainting, overlay the original image over the areas that weren't inpainted."), + "integer_only_masked": OptionInfo(False, "Integer upscale in inpaint only masked").info("Correct inpaint padding for only masked to have integer upscaling after fitting cropped region in original image"), })) options_templates.update(options_section(('optimizations', "Optimizations", "sd"), { From c21be9601e5573c60f56907d959e714271eab47a Mon Sep 17 00:00:00 2001 From: Andray Date: Tue, 29 Oct 2024 00:34:46 +0400 Subject: [PATCH 2/2] add threshold; remove `integer_only_masked` --- modules/masking.py | 38 -------------------------------------- modules/processing.py | 17 +++++++++++------ modules/shared_options.py | 2 +- 3 files changed, 12 insertions(+), 45 deletions(-) diff --git a/modules/masking.py b/modules/masking.py index 29548bd8d..2fc830319 100644 --- a/modules/masking.py +++ b/modules/masking.py @@ -1,4 +1,3 @@ -import math from PIL import Image, ImageFilter, ImageOps @@ -78,43 +77,6 @@ def expand_crop_region(crop_region, processing_width, processing_height, image_w return x1, y1, x2, y2 -def fix_crop_region_integer_scale(crop_region, processing_width, processing_height, image_width, image_height): - """expands crop region get_crop_region() to avoid non-integer scaling artifacts (different pixels size) after applying overlay""" - - x1, y1, x2, y2 = crop_region - - ratio_w = (x2 - x1) / processing_width - ratio_h = (y2 - y1) / processing_height - - desired_w = math.ceil(ratio_w) * processing_width - diff_w = desired_w - (x2 - x1) - diff_w_l = diff_w // 2 - diff_w_r = diff_w - diff_w_l - x1 -= diff_w_l - x2 += diff_w_r - if x1 < 0: - x2 -= x1 - x1 -= x1 - if x2 >= image_width: - x2 = image_width - - desired_h = math.ceil(ratio_h) * processing_height - diff_h = desired_h - (y2 - y1) - diff_h_u = diff_h // 2 - diff_h_d = diff_h - diff_h_u - y1 -= diff_h_u - y2 += diff_h_d - if y1 < 0: - y2 -= y1 - y1 -= y1 - if y2 >= image_height: - y2 = image_height - - print(f"padding was increased by {max(diff_w_l, diff_w_r, diff_h_u, diff_h_d)} after integer upscale correction") - - return x1, y1, x2, y2 - - def fill(image, mask): """fills masked regions with colors from image using blur. Not extremely effective.""" diff --git a/modules/processing.py b/modules/processing.py index a7fd3e031..6012a506e 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -65,11 +65,18 @@ def apply_color_correction(correction, original_image): def uncrop(image, dest_size, paste_loc): x, y, w, h = paste_loc base_image = Image.new('RGBA', dest_size) - factor_x = w // image.size[0] - factor_y = h // image.size[1] + + if image.width > shared.opts.img2img_inpaint_correct_paste_xy_side_length_threshold: + paste_x = max(x - w // image.width, 0) + else: + paste_x = x + + if image.height > shared.opts.img2img_inpaint_correct_paste_xy_side_length_threshold: + paste_y = max(y - h // image.height, 0) + else: + paste_y = y + image = images.resize_image(1, image, w, h) - paste_x = max(x - factor_x, 0) - paste_y = max(y - factor_y, 0) base_image.paste(image, (paste_x, paste_y)) image = base_image @@ -1643,8 +1650,6 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing): crop_region = masking.get_crop_region_v2(mask, self.inpaint_full_res_padding) if crop_region: crop_region = masking.expand_crop_region(crop_region, self.width, self.height, mask.width, mask.height) - if shared.opts.integer_only_masked: - crop_region = masking.fix_crop_region_integer_scale(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) diff --git a/modules/shared_options.py b/modules/shared_options.py index 15331d4b5..9c6d43929 100644 --- a/modules/shared_options.py +++ b/modules/shared_options.py @@ -226,7 +226,7 @@ options_templates.update(options_section(('img2img', "img2img", "sd"), { "return_mask_composite": OptionInfo(False, "For inpainting, include masked composite in results for web"), "img2img_batch_show_results_limit": OptionInfo(32, "Show the first N batch img2img results in UI", gr.Slider, {"minimum": -1, "maximum": 1000, "step": 1}).info('0: disable, -1: show all images. Too many images can cause lag'), "overlay_inpaint": OptionInfo(True, "Overlay original for inpaint").info("when inpainting, overlay the original image over the areas that weren't inpainted."), - "integer_only_masked": OptionInfo(False, "Integer upscale in inpaint only masked").info("Correct inpaint padding for only masked to have integer upscaling after fitting cropped region in original image"), + "img2img_inpaint_correct_paste_xy_side_length_threshold": OptionInfo(400, "If a side of generation resolution is bigger then the threshold, paste_xy will be corrected in only masked mode to fix shifting. The bigger resolution means less details are lost in downscaling step", gr.Slider, {"minimum": 0, "maximum": 1000, "step": 1}), })) options_templates.update(options_section(('optimizations', "Optimizations", "sd"), {