This commit is contained in:
Glenn Jocher 2019-11-30 17:38:29 -08:00
parent f2ec1cb9ea
commit a699c901d3
1 changed files with 7 additions and 3 deletions

View File

@ -614,11 +614,15 @@ def letterbox(img, new_shape=(416, 416), color=(128, 128, 128), auto=True, scale
if isinstance(new_shape, int): if isinstance(new_shape, int):
new_shape = (new_shape, new_shape) new_shape = (new_shape, new_shape)
r = max(new_shape) / max(shape) # ratio = new / old # Scale ratio (new / old)
ratio = r, r # width, height ratios scaleup_ok = True
new_unpad = int(round(shape[1] * r)), int(round(shape[0] * r)) r = max(new_shape) / max(shape)
if not scaleup_ok: # only scale down
r = min(r, 1.0)
# Compute padding # Compute padding
ratio = r, r # width, height ratios
new_unpad = int(round(shape[1] * r)), int(round(shape[0] * r))
dw, dh = new_shape[1] - new_unpad[0], new_shape[0] - new_unpad[1] # wh padding dw, dh = new_shape[1] - new_unpad[0], new_shape[0] - new_unpad[1] # wh padding
if auto: # minimum rectangle if auto: # minimum rectangle
dw, dh = np.mod(dw, 32), np.mod(dh, 32) # wh padding dw, dh = np.mod(dw, 32), np.mod(dh, 32) # wh padding