From f996bd59a61338d8d51e2b19482d684f6dd04d0f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 23 Sep 2015 21:16:48 +0000
Subject: [PATCH] more writing fixes
---
src/data.h | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/data.h b/src/data.h
index f71e04a..b91819f 100644
--- a/src/data.h
+++ b/src/data.h
@@ -26,7 +26,7 @@
} data;
typedef enum {
- CLASSIFICATION_DATA, DETECTION_DATA, CAPTCHA_DATA, REGION_DATA, IMAGE_DATA
+ CLASSIFICATION_DATA, DETECTION_DATA, CAPTCHA_DATA, REGION_DATA, IMAGE_DATA, COMPARE_DATA, WRITING_DATA
} data_type;
typedef struct load_args{
@@ -35,9 +35,10 @@
int n;
int m;
char **labels;
- int k;
int h;
int w;
+ int out_w;
+ int out_h;
int nh;
int nw;
int num_boxes;
@@ -49,6 +50,12 @@
data_type type;
} load_args;
+typedef struct{
+ int id;
+ float x,y,w,h;
+ float left, right, top, bottom;
+} box_label;
+
void free_data(data d);
pthread_t load_data_in_thread(load_args args);
@@ -59,10 +66,11 @@
data load_data(char **paths, int n, int m, char **labels, int k, int w, int h);
data load_data_detection(int n, char **paths, int m, int classes, int w, int h, int num_boxes, int background);
+box_label *read_boxes(char *filename, int *n);
data load_cifar10_data(char *filename);
data load_all_cifar10();
-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 out_w, int out_h);
list *get_paths(char *filename);
char **get_labels(char *filename);
--
Gitblit v1.10.0