From 4a666381bf98333ba4512db0f0033df5f6a08771 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 2 Dec 2023 12:11:21 +0300
Subject: extras tab batch: actually use original filename preprocessing
 upscale: do not do an extra upscale step if it's not needed

---
 modules/upscaler.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/upscaler.py')

diff --git a/modules/upscaler.py b/modules/upscaler.py
index e682bbaa..b256e085 100644
--- a/modules/upscaler.py
+++ b/modules/upscaler.py
@@ -57,6 +57,9 @@ class Upscaler:
         dest_h = int((img.height * scale) // 8 * 8)
 
         for _ 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)
@@ -64,9 +67,6 @@ class Upscaler:
             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)
 
-- 
cgit v1.2.1


From b0f59342346b1c8b405f97c0e0bb01c6ae05c601 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 25 Dec 2023 14:43:51 +0200
Subject: Use Spandrel for upscaling and face restoration architectures (aside
 from GFPGAN and LDSR)

---
 modules/upscaler.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/upscaler.py')

diff --git a/modules/upscaler.py b/modules/upscaler.py
index b256e085..3aee69db 100644
--- a/modules/upscaler.py
+++ b/modules/upscaler.py
@@ -98,6 +98,9 @@ class UpscalerData:
         self.scale = scale
         self.model = model
 
+    def __repr__(self):
+        return f"<UpscalerData name={self.name} path={self.data_path} scale={self.scale}>"
+
 
 class UpscalerNone(Upscaler):
     name = "None"
-- 
cgit v1.2.1