From f0abcfa02b2094396f955c743f7f11fcdb2e3d13 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Mon, 04 Jun 2018 15:57:15 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/AlexeyAB/darknet into Fix_get_color_depth

---
 src/network.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/network.h b/src/network.h
index fe160a9..4198c4b 100644
--- a/src/network.h
+++ b/src/network.h
@@ -138,6 +138,7 @@
 YOLODLL_API detection *make_network_boxes(network *net, float thresh, int *num);
 YOLODLL_API void free_detections(detection *dets, int n);
 YOLODLL_API void reset_rnn(network *net);
+YOLODLL_API network *load_network_custom(char *cfg, char *weights, int clear, int batch);
 YOLODLL_API network *load_network(char *cfg, char *weights, int clear);
 YOLODLL_API float *network_predict_image(network *net, image im);
 YOLODLL_API void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, int ngpus, int clear, int dont_show);
@@ -146,7 +147,7 @@
 
 int get_network_nuisance(network net);
 int get_network_background(network net);
-void fuse_conv_batchnorm(network net);
+YOLODLL_API void fuse_conv_batchnorm(network net);
 
 #ifdef __cplusplus
 }

--
Gitblit v1.10.0