From 437fbb4b3a1168a0ce69525f17d0a4b31e864ec7 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 18 Oct 2017 23:27:41 +0000
Subject: [PATCH] Fixed circleci
---
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 7618a09..975adb1 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
@@ -70,7 +72,7 @@
std::ifstream file(filename);
std::vector<std::string> file_lines;
if (!file.is_open()) return file_lines;
- for(std::string line; file >> line;) file_lines.push_back(line);
+ for(std::string line; getline(file, line);) file_lines.push_back(line);
std::cout << "object names loaded \n";
return file_lines;
}
@@ -98,7 +100,7 @@
std::string const file_ext = filename.substr(filename.find_last_of(".") + 1);
std::string const protocol = filename.substr(0, 7);
if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov" || // video file
- protocol == "rtsp://" || protocol == "http://" || protocol == "https:/") // video network stream
+ protocol == "rtmp://" || protocol == "rtsp://" || protocol == "http://" || protocol == "https:/") // video network stream
{
cv::Mat cap_frame, cur_frame, det_frame, write_frame;
std::shared_ptr<image_t> det_image;
--
Gitblit v1.10.0