apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Glenn Jocher
2019-04-22 14:59:39 +02:00
parent cf2caaad41
commit e5d11c68ac
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/datasets.py
+1 -1
View File
@@ -74,7 +74,7 @@ class LoadImages: # for inference
print('image %g/%g %s: ' % (self.count, self.nF, path), end='')
# Padded resize
img, _, _, _ = letterbox(img0, height=self.height)
img, _, _, _ = letterbox_rect(img0, height=self.height)
print('%gx%g ' % img.shape[:2], end='') # print image size
# Normalize RGB
utils/utils.py
+3 -7
View File
@@ -102,13 +102,9 @@ def xywh2xyxy(x):
def scale_coords(img1_shape, coords, img0_shape):
# Rescale coords1 (xyxy) from img1_shape to img0_shape
gain = img1_shape / max(img0_shape[:2]) # gain = old / new
# pad_x = np.mod(img1_shape - img0_shape[1] * gain, 32) / 2 # width padding
# pad_y = np.mod(img1_shape - img0_shape[0] * gain, 32) / 2 # height padding
pad_x = (img1_shape - img0_shape[1] * gain) / 2 # width padding
pad_y = (img1_shape - img0_shape[0] * gain) / 2 # height padding
coords[:, [0, 2]] -= pad_x
coords[:, [1, 3]] -= pad_y
gain = max(img1_shape) / max(img0_shape) # gain = old / new
coords[:, [0, 2]] -= (img1_shape[3] - img0_shape[1] * gain) / 2 # x padding
coords[:, [1, 3]] -= (img1_shape[2] - img0_shape[0] * gain) / 2 # y padding
coords[:, :4] /= gain
coords[:, :4] = coords[:, :4].clamp(min=0)
return coords