From 83d9b0b6d81755ce3f7b856b56a485b0abb34f81 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 28 Dec 2017 12:55:39 +0000
Subject: [PATCH] Merge branch 'master' of github.com:AlexeyAB/darknet
---
src/yolo_v2_class.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/yolo_v2_class.cpp b/src/yolo_v2_class.cpp
index 4418ce9..1777aa2 100644
--- a/src/yolo_v2_class.cpp
+++ b/src/yolo_v2_class.cpp
@@ -54,7 +54,7 @@
char *cfgfile = const_cast<char *>(cfg_filename.data());
char *weightfile = const_cast<char *>(weight_filename.data());
- net = parse_network_cfg(cfgfile);
+ net = parse_network_cfg_custom(cfgfile, 1);
if (weightfile) {
load_weights(&net, weightfile);
}
@@ -109,11 +109,11 @@
#endif
}
-YOLODLL_API int Detector::get_net_width() {
+YOLODLL_API int Detector::get_net_width() const {
detector_gpu_t &detector_gpu = *reinterpret_cast<detector_gpu_t *>(detector_gpu_ptr.get());
return detector_gpu.net.w;
}
-YOLODLL_API int Detector::get_net_height() {
+YOLODLL_API int Detector::get_net_height() const {
detector_gpu_t &detector_gpu = *reinterpret_cast<detector_gpu_t *>(detector_gpu_ptr.get());
return detector_gpu.net.h;
}
--
Gitblit v1.10.0