From a4485b8a6656c2a2fa0b78ca7c035523c8149b8c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 10 Jun 2015 15:49:25 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet

---
 src/data.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/data.h b/src/data.h
index 8e3e1d9..bda804f 100644
--- a/src/data.h
+++ b/src/data.h
@@ -36,10 +36,13 @@
 
 pthread_t load_data_detection_thread(int n, char **paths, int m, int classes, int w, int h, int nh, int nw, int background, data *d);
 data load_data_detection_jitter_random(int n, char **paths, int m, int classes, int w, int h, int num_boxes, int background);
+pthread_t load_data_localization_thread(int n, char **paths, int m, int classes, int w, int h, data *d);
 
 data load_cifar10_data(char *filename);
 data load_all_cifar10();
 
+data load_data_writing(char **paths, int n, int m, int w, int h);
+
 list *get_paths(char *filename);
 char **get_labels(char *filename);
 void get_random_batch(data d, int n, float *X, float *y);
@@ -50,5 +53,6 @@
 void translate_data_rows(data d, float s);
 void randomize_data(data d);
 data *split_data(data d, int part, int total);
+data concat_data(data d1, data d2);
 
 #endif

--
Gitblit v1.10.0