diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-12-03 07:19:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-03 07:19:51 +0000 |
| commit | c9a2cfdf2a53d37c2de1908423e4f548088667ef (patch) | |
| tree | eabdca1b7665e0ee00f130e9f8544ffd23e474a2 /modules/upscaler.py | |
| parent | 39541d7725bc42f456a604b07c50aba503a5a09a (diff) | |
| parent | 5cd5a672f7889dcc018c3873ec557d645ebe35d0 (diff) | |
| download | stable-diffusion-webui-gfx803-c9a2cfdf2a53d37c2de1908423e4f548088667ef.tar.gz stable-diffusion-webui-gfx803-c9a2cfdf2a53d37c2de1908423e4f548088667ef.tar.bz2 stable-diffusion-webui-gfx803-c9a2cfdf2a53d37c2de1908423e4f548088667ef.zip | |
Merge branch 'master' into racecond_fix
Diffstat (limited to 'modules/upscaler.py')
| -rw-r--r-- | modules/upscaler.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/modules/upscaler.py b/modules/upscaler.py index 83fde7ca..c4e6e6bd 100644 --- a/modules/upscaler.py +++ b/modules/upscaler.py @@ -57,10 +57,18 @@ class Upscaler: self.scale = scale dest_w = img.width * scale dest_h = img.height * scale + for i in range(3): - if img.width > dest_w and img.height > dest_h: - break + shape = (img.width, img.height) + img = self.do_upscale(img, selected_model) + + if shape == (img.width, img.height): + break + + if img.width >= dest_w and img.height >= dest_h: + break + if img.width != dest_w or img.height != dest_h: img = img.resize((int(dest_w), int(dest_h)), resample=LANCZOS) |