Merge branch 'master' of https://github.com/AlexeyAB/darknet

Tino Hager

2018-06-27 393eaec1600a434e4496b3a11e08c38da5858377

 src/network.h

@@ -146,6 +146,8 @@
YOLODLL_API int network_width(network *net);
YOLODLL_API int network_height(network *net);

YOLODLL_API void optimize_picture(network *net, image orig, int max_layer, float scale, float rate, float thresh, int norm);

int get_network_nuisance(network net);
int get_network_background(network net);
YOLODLL_API void fuse_conv_batchnorm(network net);