From ca2e92ba1a70b799717c0fc4e30806f2cf2ac388 Mon Sep 17 00:00:00 2001
From: Adesun <AvenSun@live.com>
Date: Thu, 28 Dec 2017 12:23:05 +0000
Subject: [PATCH] #270 #325 fix windows format EOL handle. https://en.wikipedia.org/wiki/Newline
---
src/yolo_console_dll.cpp | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index 58b3893..25497ce 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -19,11 +19,13 @@
#include "opencv2/core/version.hpp"
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio.hpp"
-#pragma comment(lib, "opencv_world320.lib")
+#define OPENCV_VERSION CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)""CVAUX_STR(CV_VERSION_REVISION)
+#pragma comment(lib, "opencv_world" OPENCV_VERSION ".lib")
#else
-#pragma comment(lib, "opencv_core2413.lib")
-#pragma comment(lib, "opencv_imgproc2413.lib")
-#pragma comment(lib, "opencv_highgui2413.lib")
+#define OPENCV_VERSION CVAUX_STR(CV_VERSION_EPOCH)""CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)
+#pragma comment(lib, "opencv_core" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_imgproc" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_highgui" OPENCV_VERSION ".lib")
#endif
@@ -83,7 +85,7 @@
std::string filename;
if (argc > 1) filename = argv[1];
- Detector detector("yolo-voc.cfg", "yolo-voc.weights");
+ Detector detector("cfg/yolo-voc.cfg", "yolo-voc.weights");
auto obj_names = objects_names_from_file("data/voc.names");
std::string out_videofile = "result.avi";
--
Gitblit v1.10.0