Fixed for OpenCV 4.x

AlexeyAB · Apr 16, 2019 · 1c846d1 · 1c846d1
1 parent 61ae338
commit 1c846d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/main.cpp b/main.cpp
@@ -33,6 +33,9 @@
 #pragma comment(lib, "opencv_highgui" OPENCV_VERSION LIB_SUFFIX)
 #endif
 
+#ifndef CV_FILLED
+#define CV_FILLED cv::FILLED
+#endif
 
 using namespace cv;
 
@@ -153,7 +156,11 @@ int main(int argc, char *argv[])
 		if (argc >= 4 && (train_filename == "cap_video" || train_filename == "cap_video_backward")) {
 			const std::string videofile = synset_filename;
 			cv::VideoCapture cap(videofile);
-			const int fps = cap.get(CV_CAP_PROP_FPS);
+#ifndef CV_VERSION_EPOCH    // OpenCV 3.x
+            const int fps = cap.get(cv::CAP_PROP_FPS);
+#else                        // OpenCV 2.x
+            const int fps = cap.get(CV_CAP_PROP_FPS);
+#endif
             int frame_counter = 0, image_counter = 0;
             int backward = (train_filename == "cap_video_backward") ? 1 : 0;
             if (backward) image_counter = 99999999; // 99M

diff --git a/yolo_mark.vcxproj b/yolo_mark.vcxproj
@@ -81,11 +81,11 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\opencv_3.0\opencv\build\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OPENCV_DIR)\include;C:\opencv_3.0\opencv\build\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)lib\$(PlatformName);C:\opencv_3.0\opencv\build\x64\vc14\lib;C:\opencv_2.4.13\opencv\build\x64\vc12\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OPENCV_DIR)\x64\vc15\lib;$(OPENCV_DIR)\x64\vc14\lib;C:\opencv_3.0\opencv\build\x64\vc14\lib;C:\opencv_2.4.13\opencv\build\x64\vc12\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies />
     </Link>
   </ItemDefinitionGroup>
@@ -111,14 +111,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\opencv_3.0\opencv\build\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OPENCV_DIR)\include;C:\opencv_3.0\opencv\build\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)lib\$(PlatformName);C:\opencv_3.0\opencv\build\x64\vc14\lib;C:\opencv_2.4.13\opencv\build\x64\vc12\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OPENCV_DIR)\x64\vc15\lib;$(OPENCV_DIR)\x64\vc14\lib;C:\opencv_3.0\opencv\build\x64\vc14\lib;C:\opencv_2.4.13\opencv\build\x64\vc12\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies />
     </Link>
   </ItemDefinitionGroup>