Update app.py

app.py

@@ -189,34 +189,31 @@ class Model:
                 if detail:
                     print(msg + "ratio out of limit")
                 continue
-            # 扩展边界
             expand_pixel = (bounds[3] - bounds[1]) // 20
-            bounds = (max(bounds[0] - expand_pixel // 2, 0),
+            bounds = [max(bounds[0] - expand_pixel // 2, 0),
                       max(bounds[1] - expand_pixel, 0),
                       min(bounds[2] + expand_pixel // 2, im0.shape[1]),
                       min(bounds[3] + expand_pixel, im0.shape[0]),
-                      )
-            if bounds[3] - bounds[1] >= (bounds[2] - bounds[0]) * 2:  # 等高度剪裁
-                cx = (bounds[2] + bounds[0]) // 2
-                h = bounds[3] - bounds[1]
-                w = h // 2
-                w2 = w // 2
-                l1 = max(cx - w2, 0)
-                r1 = min(cx + w2, im0.shape[1])
-                bounds = (l1, bounds[1], r1, bounds[3])
-                temp_bound = (w2 - (cx - l1), 0, w2 + (r1 - cx), h)
-            else:  # 等宽度剪裁
-                cy = (bounds[3] + bounds[1]) // 2
-                w = bounds[2] - bounds[0]
-                h = w * 2
-                h2 = h // 2
-                tp1 = max(cy - h2, 0)
-                b1 = min(cy + h2, im0.shape[0])
-                bounds = (bounds[0], tp1, bounds[2], b1)
-                temp_bound = (0, h2 - (cy - tp1), w, h2 + (b1 - cy))
+                      ]
+            # corp and resize
+            w = bounds[2] - bounds[0]
+            h = bounds[3] - bounds[1]
+            bounds[3] += h % 2
+            h += h % 2
+            r = min(512 / w, 1024 / h)
+            pw, ph = int(512 / r - w), int(1024 / r - h)
+            bounds_tmp = (bounds[0] - pw // 2, bounds[1] - ph // 2,
+                          bounds[2] + pw // 2 + pw % 2, bounds[3] + ph // 2 + ph % 2)
+            bounds = (max(0, bounds_tmp[0]), max(0, bounds_tmp[1]),
+                      min(im0.shape[1], bounds_tmp[2]), min(im0.shape[0], bounds_tmp[3]))
+            dl = bounds[0] - bounds_tmp[0]
+            dr = bounds[2] - bounds_tmp[2]
+            dt = bounds[1] - bounds_tmp[1]
+            db = bounds[3] - bounds_tmp[3]
+            w = bounds_tmp[2] - bounds_tmp[0]
+            h = bounds_tmp[3] - bounds_tmp[1]
             temp_img = np.full((h, w, 3), 255, dtype=np.uint8)
-            temp_img[temp_bound[1]:temp_bound[3], temp_bound[0]:temp_bound[2]] = im0[bounds[1]:bounds[3],
-                                                                                 bounds[0]:bounds[2]]
+            temp_img[dt:h + db, dl:w + dr] = im0[bounds[1]:bounds[3], bounds[0]:bounds[2]]
             temp_img = transform.resize(temp_img, (1024, 512), preserve_range=True).astype(np.uint8)
             imgs.append(temp_img)
         return imgs