Restore side-by-side output, add aspect-ratio-preserving resize

app.py

@@ -167,6 +167,19 @@ def mask_composite(warped, original, mask):
     return (warped * mask_3 + original * (1.0 - mask_3)).astype(np.uint8)
 
 
+def resize_preserve_aspect(image, size=512):
+    """Resize image to size x size, padding to preserve aspect ratio."""
+    h, w = image.shape[:2]
+    scale = size / max(h, w)
+    new_w, new_h = int(w * scale), int(h * scale)
+    resized = cv2.resize(image, (new_w, new_h))
+    canvas = np.zeros((size, size, 3), dtype=np.uint8)
+    y_off = (size - new_h) // 2
+    x_off = (size - new_w) // 2
+    canvas[y_off : y_off + new_h, x_off : x_off + new_w] = resized
+    return canvas
+
+
 PROCEDURES = list(PROCEDURE_LANDMARKS.keys())
 
 
@@ -192,7 +205,7 @@ def process_image(image_rgb, procedure, intensity):
 
     try:
         image_bgr = cv2.cvtColor(np.asarray(image_rgb, dtype=np.uint8), cv2.COLOR_RGB2BGR)
-        image_bgr = cv2.resize(image_bgr, (512, 512))
+        image_bgr = resize_preserve_aspect(image_bgr, 512)
         image_rgb_512 = cv2.cvtColor(image_bgr, cv2.COLOR_BGR2RGB)
     except Exception as exc:
         logger.error("Image conversion failed: %s", exc)
@@ -226,8 +239,6 @@ def process_image(image_rgb, procedure, intensity):
         composited = mask_composite(warped, image_bgr, mask)
         composited_rgb = cv2.cvtColor(composited, cv2.COLOR_BGR2RGB)
 
-        side_by_side = np.hstack([image_rgb_512, composited_rgb])
-
         displacement = np.mean(
             np.linalg.norm(manipulated.pixel_coords - face.pixel_coords, axis=1)
         )
@@ -243,6 +254,8 @@ def process_image(image_rgb, procedure, intensity):
             f"Processing time: {elapsed:.2f}s\n"
             f"Mode: TPS (CPU)"
         )
+        side_by_side = np.hstack([image_rgb_512, composited_rgb])
+
         return wireframe_rgb, mask_vis, composited_rgb, side_by_side, info
 
     except Exception as exc:
@@ -260,7 +273,7 @@ def compare_procedures(image_rgb, intensity):
 
     try:
         image_bgr = cv2.cvtColor(np.asarray(image_rgb, dtype=np.uint8), cv2.COLOR_RGB2BGR)
-        image_bgr = cv2.resize(image_bgr, (512, 512))
+        image_bgr = resize_preserve_aspect(image_bgr, 512)
 
         face = extract_landmarks(image_bgr)
         if face is None:
@@ -291,7 +304,7 @@ def intensity_sweep(image_rgb, procedure):
 
     try:
         image_bgr = cv2.cvtColor(np.asarray(image_rgb, dtype=np.uint8), cv2.COLOR_RGB2BGR)
-        image_bgr = cv2.resize(image_bgr, (512, 512))
+        image_bgr = resize_preserve_aspect(image_bgr, 512)
 
         face = extract_landmarks(image_bgr)
         if face is None: