From 996227049d62bfe4d7b0e1de048a3f8a23db97bc Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 23 Oct 2017 13:55:06 +0000
Subject: [PATCH] yolo_console_dll.cpp OpenCV 3.3.0
---
src/yolo_console_dll.cpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index a1db75c..62ffef8 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -8,7 +8,9 @@
#include <mutex> // std::mutex, std::unique_lock
#include <condition_variable> // std::condition_variable
+#ifdef _WIN32
#define OPENCV
+#endif
#include "yolo_v2_class.hpp" // imported functions from DLL
@@ -17,7 +19,7 @@
#include "opencv2/core/version.hpp"
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio.hpp"
-#pragma comment(lib, "opencv_world320.lib")
+#pragma comment(lib, "opencv_world330.lib")
#else
#pragma comment(lib, "opencv_core2413.lib")
#pragma comment(lib, "opencv_imgproc2413.lib")
@@ -216,7 +218,7 @@
auto img = detector.load_image(filename);
std::vector<bbox_t> result_vec = detector.detect(img);
detector.free_image(img);
- show_result(result_vec, obj_names);
+ show_console_result(result_vec, obj_names);
#endif
}
catch (std::exception &e) { std::cerr << "exception: " << e.what() << "\n"; getchar(); }
--
Gitblit v1.10.0