From 55fbdd1007488b2e98dbe4b07cc798954b5e165f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 23 Sep 2015 06:29:03 +0000
Subject: [PATCH] fixes to image
---
src/data.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/data.c b/src/data.c
index 003338e..7574a44 100644
--- a/src/data.c
+++ b/src/data.c
@@ -54,7 +54,12 @@
X.cols = 0;
for(i = 0; i < n; ++i){
- image im = load_image(paths[i], w, h, 1);
+ image im = load_image(paths[i], w, h, 3);
+
+ image gray = grayscale_image(im);
+ free_image(im);
+ im = gray;
+
X.vals[i] = im.data;
X.cols = im.h*im.w*im.c;
}
@@ -176,8 +181,10 @@
int index = (col+row*num_boxes)*(5+classes);
if (truth[index]) continue;
truth[index++] = 1;
- if (classes) truth[index+id] = 1;
+
+ if (id < classes) truth[index+id] = 1;
index += classes;
+
truth[index++] = x;
truth[index++] = y;
truth[index++] = w;
@@ -546,6 +553,8 @@
*a.d = load_data(a.paths, a.n, a.m, a.labels, a.classes, a.w, a.h);
} else if (a.type == DETECTION_DATA){
*a.d = load_data_detection(a.n, a.paths, a.m, a.classes, a.w, a.h, a.num_boxes, a.background);
+ } else if (a.type == WRITING_DATA){
+ *a.d = load_data_writing(a.paths, a.n, a.m, a.w, a.h, a.downsample);
} else if (a.type == REGION_DATA){
*a.d = load_data_region(a.n, a.paths, a.m, a.w, a.h, a.num_boxes, a.classes);
} else if (a.type == COMPARE_DATA){
@@ -569,14 +578,14 @@
return thread;
}
-data load_data_writing(char **paths, int n, int m, int w, int h)
+data load_data_writing(char **paths, int n, int m, int w, int h, int downsample)
{
if(m) paths = get_random_paths(paths, n, m);
char **replace_paths = find_replace_paths(paths, n, ".png", "-label.png");
data d;
d.shallow = 0;
d.X = load_image_paths(paths, n, w, h);
- d.y = load_image_paths_gray(replace_paths, n, w/8, h/8);
+ d.y = load_image_paths_gray(replace_paths, n, w/downsample, h/downsample);
if(m) free(paths);
int i;
for(i = 0; i < n; ++i) free(replace_paths[i]);
--
Gitblit v1.10.0