compact expand_too_small_crop_region

Author: w-e-w

modules/masking.py

@@ -80,47 +80,26 @@ def expand_crop_region(crop_region, processing_width, processing_height, image_w
 def expand_too_small_crop_region(crop_region, processing_width, processing_height, image_width, image_height):
     """expands crop region to not have width and height smaller then processing_width and processing_height"""
 
-    x1, y1, x2, y2 = crop_region
-
-    desired_w = processing_width
-    diff_w = desired_w - (x2 - x1)
-    if diff_w > 0:
-        diff_w_l = diff_w // 2
-        diff_w_r = diff_w - diff_w_l
-        x1 -= diff_w_l
-        x2 += diff_w_r
-        if x2 >= image_width:
-            diff = x2 - image_width
-            x2 -= diff
-            x1 -= diff
-        if x1 < 0:
-            x2 -= x1
-            x1 -= x1
-        if x2 >= image_width:
-            x2 = image_width
-
-    desired_h = processing_height
-    diff_h = desired_h - (y2 - y1)
-    if diff_h > 0:
-        diff_h_u = diff_h // 2
-        diff_h_d = diff_h - diff_h_u
-        y1 -= diff_h_u
-        y2 += diff_h_d
-        if y2 >= image_height:
-            diff = y2 - image_height
-            y2 -= diff
-            y1 -= diff
-        if y1 < 0:
-            y2 -= y1
-            y1 -= y1
-        if y2 >= image_height:
-            y2 = image_height
-
-    if diff_h > 0 or diff_w > 0:
-        print("Crop region was smaller then resolution and has been corrected")
-
-    return x1, y1, x2, y2
+    def _expand(c1, c2, processing_dimension, image_dimension):
+        if (diff := processing_dimension - (c2 - c1)) > 0:
+            diff_w_l = diff // 2
+            c1 -= diff_w_l
+            c2 += diff - diff_w_l
+            if c2 >= image_dimension:
+                c1 -= c2 - image_dimension
+                c2 = image_dimension
+            if c1 < 0:
+                c2 = min(c2 - c1, image_dimension)
+                c1 = 0
+        return c1, c2
 
+    x1, y1, x2, y2 = crop_region
+    x1, x2 = _expand(x1, x2, processing_width, image_width)
+    y1, y2 = _expand(y1, y2, processing_height, image_height)
+    new_crop_region = x1, y1, x2, y2
+    if new_crop_region != crop_region:
+        print(f"Crop region {crop_region} was smaller then resolution and has been expanded to {new_crop_region}")
+    return new_crop_region
 
 
 def fill(image, mask):