OPENGIT/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-04-06 12:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 02d4229ece4366d6262bb9a0323351dc74a0bdde into 374bb6cc384d2a19422c0b07d69de0a41d1f3f4d

Browse Source
This commit is contained in:
LoganBooker 2025-03-06 23:16:52 +08:00 committed by GitHub
commit ebdc67ff82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/images.py
View File

@ -24,7 +24,7 @@ from modules.paths_internal import roboto_ttf_file
from modules.shared import opts from modules.shared import opts
LANCZOS = (Image.Resampling.LANCZOS if hasattr(Image, 'Resampling') else Image.LANCZOS) LANCZOS = (Image.Resampling.LANCZOS if hasattr(Image, 'Resampling') else Image.LANCZOS)
BILINEAR = (Image.Resampling.BILINEAR if hasattr(Image, 'Resampling') else Image.BILINEAR)
def get_font(fontsize: int): def get_font(fontsize: int):
try: try:
@ -268,7 +268,7 @@ def resize_image(resize_mode, im, width, height, upscaler_name=None):
def resize(im, w, h): def resize(im, w, h):
if upscaler_name is None or upscaler_name == "None" or im.mode == 'L': if upscaler_name is None or upscaler_name == "None" or im.mode == 'L':
return im.resize((w, h), resample=LANCZOS) return im.resize((w, h), resample=BILINEAR if im.mode == 'L' and opts.img2img_bilinear_grayscale_resize else LANCZOS)
scale = max(w / im.width, h / im.height) scale = max(w / im.width, h / im.height)
@ -283,7 +283,7 @@ def resize_image(resize_mode, im, width, height, upscaler_name=None):
im = upscaler.scaler.upscale(im, scale, upscaler.data_path) im = upscaler.scaler.upscale(im, scale, upscaler.data_path)
if im.width != w or im.height != h: if im.width != w or im.height != h:
im = im.resize((w, h), resample=LANCZOS) im = im.resize((w, h), resample=BILINEAR if im.mode == 'L' and opts.img2img_bilinear_grayscale_resize else LANCZOS)
return im return im

1
modules/shared_options.py
View File

@ -228,6 +228,7 @@ options_templates.update(options_section(('img2img', "img2img", "sd"), {
"return_mask_composite": OptionInfo(False, "For inpainting, include masked composite in results for web"), "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'), "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."), "overlay_inpaint": OptionInfo(True, "Overlay original for inpaint").info("when inpainting, overlay the original image over the areas that weren't inpainted."),
"img2img_bilinear_grayscale_resize": OptionInfo(False, "Use bilinear filtering for grayscale images (masks)").info("when resizing, grayscale images (which are almost always masks) will use bilinear filtering instead of Lanczos, which can introduce ringing artifacts"),
})) }))
options_templates.update(options_section(('optimizations', "Optimizations", "sd"), { options_templates.update(options_section(('optimizations', "Optimizations", "sd"), {