Undo previous commit that attempted to make the QR code larger if the resolution was larger because it fucked things

app.py

@@ -43,25 +43,25 @@ pipe = StableDiffusionControlNetImg2ImgPipeline.from_pretrained(
 
 def resize_for_condition_image(input_image: Image.Image, resolution: int, canvas_width: int = None, canvas_height: int = None):
     input_image = input_image.convert("RGB")
+    W, H = input_image.size
+    k = float(resolution) / min(H, W)
+    H *= k
+    W *= k
+    H = int(round(H / 64.0)) * 64
+    W = int(round(W / 64.0)) * 64
+    input_image = input_image.resize((W, H), resample=Image.LANCZOS)
     
-    # Default canvas size (if not provided)
-    if canvas_width is None or canvas_height is None:
-        raise ValueError("Canvas width and height must be provided for consistent resizing")
-
-    # Determine desired QR code size as a fraction of canvas height
-    desired_qr_height = canvas_height // 2  # QR code height = 1/2 of canvas height
-    aspect_ratio = input_image.width / input_image.height
-    desired_qr_width = int(desired_qr_height * aspect_ratio)
-
-    # Resize the QR code
-    input_image = input_image.resize((desired_qr_width, desired_qr_height), resample=Image.LANCZOS)
-
     # Create a blank canvas with the specified dimensions
+    if canvas_width is None:
+        canvas_width = W
+    if canvas_height is None:
+        canvas_height = H
+
     canvas = Image.new("RGB", (canvas_width, canvas_height), "white")
 
-    # Paste the resized QR code 2/3rds of the way over the canvas
-    qr_x = int(canvas_width * (2 / 3)) - (desired_qr_width // 2)  # Center around 2/3 of canvas width
-    qr_y = (canvas_height - desired_qr_height) // 2  # Center the QR code vertically
+    # Paste the resized QR code on the right half of the canvas
+    qr_x = int(canvas_width * (2 / 3)) - (W // 2)  # 2/3rd of the canvas width, centering the QR code
+    qr_y = (canvas_height - H) // 2  # Center the QR code vertically
     canvas.paste(input_image, (qr_x, qr_y))
     return canvas