From d0b9326a352ed2fbc3ae66fdef40b4533a2f211d Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 11 Aug 2015 06:22:27 +0000
Subject: [PATCH] Hacks to get nightmare to not break gridsizing
---
src/data.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/data.c b/src/data.c
index dafcc98..6a41d13 100644
--- a/src/data.c
+++ b/src/data.c
@@ -140,7 +140,7 @@
void fill_truth_detection(char *path, float *truth, int classes, int num_boxes, int flip, int background, float dx, float dy, float sx, float sy)
{
- char *labelpath = find_replace(path, "detection_images", "labels");
+ char *labelpath = find_replace(path, "JPEGImages", "labels");
labelpath = find_replace(labelpath, ".jpg", ".txt");
labelpath = find_replace(labelpath, ".JPEG", ".txt");
int count = 0;
@@ -197,8 +197,6 @@
h = constrain(0, 1, h);
if (w < .01 || h < .01) continue;
if(1){
- //w = sqrt(w);
- //h = sqrt(h);
w = pow(w, 1./2.);
h = pow(h, 1./2.);
}
@@ -332,7 +330,7 @@
++count;
}
}
- if(count != 1) printf("%d, %s\n", count, path);
+ if(count != 1) printf("Too many or too few labels: %d, %s\n", count, path);
}
matrix load_labels_paths(char **paths, int n, char **labels, int k)
@@ -456,16 +454,18 @@
int flip = rand_r(&data_seed)%2;
image cropped = crop_image(orig, pleft, ptop, swidth, sheight);
+
float dx = ((float)pleft/ow)/sx;
float dy = ((float)ptop /oh)/sy;
- free_image(orig);
image sized = resize_image(cropped, w, h);
- free_image(cropped);
if(flip) flip_image(sized);
d.X.vals[i] = sized.data;
fill_truth_detection(random_paths[i], d.y.vals[i], classes, num_boxes, flip, background, dx, dy, 1./sx, 1./sy);
+
+ free_image(orig);
+ free_image(cropped);
}
free(random_paths);
return d;
--
Gitblit v1.10.0