OpenCV4 upgrade with CUDA (#89)

brosenberg42 · web-flow · commit 76053c8c8261 · 2020-12-16T10:40:40.000-05:00
diff --git a/detection/api/CMakeLists.txt b/detection/api/CMakeLists.txt
@@ -30,7 +30,7 @@ project(openmpf-cpp-component-api)
 
 set(CMAKE_CXX_STANDARD 11)
 
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0
     COMPONENTS opencv_core opencv_imgcodecs opencv_imgproc opencv_videoio)
 
 
diff --git a/detection/api/include/MPFDetectionComponent.h b/detection/api/include/MPFDetectionComponent.h
@@ -32,7 +32,6 @@
 #include <map>
 #include <string>
 #include <vector>
-#include <opencv2/core.hpp>
 
 #include "MPFComponentInterface.h"
 #include "MPFDetectionObjects.h"
diff --git a/detection/api/test/test_detection_api.cpp b/detection/api/test/test_detection_api.cpp
@@ -1307,6 +1307,14 @@ TEST(AffineFrameTransformerTest, RotateFullFrame) {
 }
 
 
+bool isSameImage(const cv::Mat &im1, const cv::Mat &im2) {
+    if (im1.size() != im2.size()) {
+        return false;
+    }
+    return std::equal(im1.begin<Pixel>(), im1.end<Pixel>(), im2.begin<Pixel>());
+}
+
+
 TEST(AffineFrameTransformerTest, TestRotationThreshold) {
     const auto *test_img_path = "test/test_imgs/rotation/hello-world.png";
     auto original_img = cv::imread(test_img_path);
@@ -1315,14 +1323,14 @@ TEST(AffineFrameTransformerTest, TestRotationThreshold) {
                         { {"ROTATION", "10"}, {"ROTATION_THRESHOLD", "10.001"} }, {});
 
         auto img = MPFImageReader(job).GetImage();
-        ASSERT_EQ(0, cv::countNonZero(img != original_img));
+        ASSERT_TRUE(isSameImage(original_img, img));
     }
     {
         MPFImageJob job("test", test_img_path,
                         { {"ROTATION", "10"}, {"ROTATION_THRESHOLD", "9.99"} }, {});
 
         auto img = MPFImageReader(job).GetImage();
-        ASSERT_NE(original_img.size(), img.size());
+        ASSERT_FALSE(isSameImage(original_img, img));
     }
 }
 
@@ -1337,13 +1345,13 @@ TEST(AffineFrameTransformerTest, TestRotationThresholdWithFeedForward) {
         MPFImageJob job("test", test_img_path, ff_img_loc,
                         { {"ROTATION_THRESHOLD", "5.12"}, {"FEED_FORWARD_TYPE", "REGION"} }, {});
         auto img = MPFImageReader(job).GetImage();
-        ASSERT_EQ(0, cv::countNonZero(img != original_img));
+        ASSERT_TRUE(isSameImage(original_img, img));
     }
     {
         MPFImageJob job("test", test_img_path, ff_img_loc,
                         { {"ROTATION_THRESHOLD", "5.00"}, {"FEED_FORWARD_TYPE", "REGION"} }, {});
         auto img = MPFImageReader(job).GetImage();
-        ASSERT_NE(0, cv::countNonZero(img != original_img));
+        ASSERT_FALSE(isSameImage(original_img, img));
     }
 }
 
diff --git a/detection/examples/AudioOnlyComponent/CMakeLists.txt b/detection/examples/AudioOnlyComponent/CMakeLists.txt
@@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)
 
 find_package(mpfComponentInterface REQUIRED)
 find_package(mpfDetectionComponentApi REQUIRED)
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_core)
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0 COMPONENTS opencv_core)
 
 
 set(AUDIO_ONLY_COMPONENT_SOURCES AudioOnly.cpp AudioOnly.h)
diff --git a/detection/examples/AudioOnlyComponent/README.md b/detection/examples/AudioOnlyComponent/README.md
@@ -1,6 +1,6 @@
 # BUILD
 
-NOTE: To build and run this component, OpenCV 3.4.7
+NOTE: To build and run this component, OpenCV 4.5.0
       must be installed first.
 
 NOTE: You must build the MPF Component API library before
@@ -10,7 +10,7 @@ NOTE: You must build the MPF Component API library before
 
 Before you build, edit the src/CMakeLists.txt file, and change
 the "find_package" command so that the PATHS option specifies
-the root directory of your OpenCV 3.4.7 installation.
+the root directory of your OpenCV 4.5.0 installation.
 
 Run the following commands:
 ```
diff --git a/detection/examples/GenericComponent/CMakeLists.txt b/detection/examples/GenericComponent/CMakeLists.txt
@@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)
 
 find_package(mpfComponentInterface REQUIRED)
 find_package(mpfDetectionComponentApi REQUIRED)
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_core)
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0 COMPONENTS opencv_core)
 
 
 set(GENERIC_COMPONENT_SOURCES GenericComponent.cpp GenericComponent.h)
diff --git a/detection/examples/GenericComponent/README.md b/detection/examples/GenericComponent/README.md
@@ -1,6 +1,6 @@
 # BUILD
 
-NOTE: To build and run this component, OpenCV 3.4.7
+NOTE: To build and run this component, OpenCV 4.5.0
       must be installed first.
 
 NOTE: You must build the MPF Component API library before
@@ -10,7 +10,7 @@ NOTE: You must build the MPF Component API library before
 
 Before you build, edit the src/CMakeLists.txt file, and change
 the "find_package" command so that the PATHS option specifies
-the root directory of your OpenCV 3.4.7 installation.
+the root directory of your OpenCV 4.5.0 installation.
 
 Run the following commands:
 ```
diff --git a/detection/examples/HelloWorldComponent/CMakeLists.txt b/detection/examples/HelloWorldComponent/CMakeLists.txt
@@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)
 
 find_package(mpfComponentInterface REQUIRED)
 find_package(mpfDetectionComponentApi REQUIRED)
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_core)
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0 COMPONENTS opencv_core)
 find_package(PkgConfig)
 pkg_search_module(LOG4CXX REQUIRED liblog4cxx)
 
diff --git a/detection/examples/HelloWorldComponent/README.md b/detection/examples/HelloWorldComponent/README.md
@@ -1,6 +1,6 @@
 # BUILD
 
-NOTE: To build and run this component, OpenCV 3.4.7
+NOTE: To build and run this component, OpenCV 4.5.0
       must be installed first.
 
 NOTE: You must build the MPF Component API library before
@@ -10,7 +10,7 @@ NOTE: You must build the MPF Component API library before
 
 Before you build, edit the src/CMakeLists.txt file, and change
 the "find_package" command so that the PATHS option specifies
-the root directory of your OpenCV 3.4.7 installation.
+the root directory of your OpenCV 4.5.0 installation.
 
 Run the following commands:
 ```
diff --git a/detection/examples/ImageTransformerComponent/CMakeLists.txt b/detection/examples/ImageTransformerComponent/CMakeLists.txt
@@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)
 
 find_package(mpfComponentInterface REQUIRED)
 find_package(mpfDetectionComponentApi REQUIRED)
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_core opencv_highgui)
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0 COMPONENTS opencv_core opencv_highgui)
 
 
 set(IMAGE_TRANSFORMER_COMPONENT_SOURCES ImageTransformerComponent.h ImageTransformerComponent.cpp)
diff --git a/detection/examples/ImageTransformerComponent/ImageTransformerComponent.cpp b/detection/examples/ImageTransformerComponent/ImageTransformerComponent.cpp
@@ -73,7 +73,7 @@ std::vector<MPFImageLocation> ImageTransformerComponent::GetDetections(const MPF
     std::cout << "original image rows = " << original.rows << std::endl;
     std::cout << "original image cols = " << original.cols << std::endl;
     std::cout << std::endl << std::endl;
-    cv::namedWindow("Original", CV_WINDOW_AUTOSIZE);
+    cv::namedWindow("Original", cv::WINDOW_AUTOSIZE);
     cv::imshow("Original", original);
     cv::waitKey(500);
 
@@ -101,7 +101,7 @@ std::vector<MPFImageLocation> ImageTransformerComponent::GetDetections(const MPF
 
     // Again, for illustration purposes only, we display the image after
     // the transformation has been applied.
-    cv::namedWindow("Transformed", CV_WINDOW_AUTOSIZE);
+    cv::namedWindow("Transformed", cv::WINDOW_AUTOSIZE);
     cv::imshow("Transformed", image_data);
     cv::waitKey(0);
 
diff --git a/detection/examples/ImageTransformerComponent/README.md b/detection/examples/ImageTransformerComponent/README.md
@@ -1,6 +1,6 @@
 # BUILD
 
-NOTE: To build and run this component, OpenCV 3.4.7
+NOTE: To build and run this component, OpenCV 4.5.0
       must be installed first.
 
 NOTE: You must build the MPF Component API library before
@@ -10,7 +10,7 @@ NOTE: You must build the MPF Component API library before
 
 Before you build, edit the src/CMakeLists.txt file, and change
 the "find_package" command so that the PATHS option specifies
-the root directory of your OpenCV 3.4.7 installation.
+the root directory of your OpenCV 4.5.0 installation.
 
 Run the following commands:
 ```
diff --git a/detection/examples/VideoCaptureComponent/CMakeLists.txt b/detection/examples/VideoCaptureComponent/CMakeLists.txt
@@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)
 
 find_package(mpfComponentInterface REQUIRED)
 find_package(mpfDetectionComponentApi REQUIRED)
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_core opencv_highgui)
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0 COMPONENTS opencv_core opencv_highgui)
 
 
 set(VIDEO_CAPTURE_COMPONENT_SOURCES VideoCaptureComponent.h VideoCaptureComponent.cpp)
diff --git a/detection/examples/VideoCaptureComponent/README.md b/detection/examples/VideoCaptureComponent/README.md
@@ -1,6 +1,6 @@
 # BUILD
 
-NOTE: To build and run this component, OpenCV 3.4.7 and
+NOTE: To build and run this component, OpenCV 4.5.0 and
       ffmpeg must be installed first.
 
 NOTE: You must build the MPF Component API library before
@@ -10,7 +10,7 @@ NOTE: You must build the MPF Component API library before
 
 Before you build, edit the src/CMakeLists.txt file, and change
 the "find_package" command so that the PATHS option specifies
-the root directory of your OpenCV 3.4.7 installation.
+the root directory of your OpenCV 4.5.0 installation.
 
 Run the following commands:
 ```
diff --git a/detection/testUtils/CMakeLists.txt b/detection/testUtils/CMakeLists.txt
@@ -30,7 +30,7 @@ project(openmpf-cpp-component-test-utils)
 
 set(CMAKE_CXX_STANDARD 11)
 
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0
     COMPONENTS opencv_core opencv_imgcodecs opencv_imgproc opencv_videoio opencv_highgui)
 
 include_directories(include)
@@ -54,4 +54,4 @@ set(SOURCE_FILES
 add_library(mpfComponentTestUtils SHARED ${SOURCE_FILES})
 target_link_libraries(mpfComponentTestUtils ${OpenCV_LIBS})
 
-export_mpf_lib(mpfComponentTestUtils)
+export_mpf_lib(mpfComponentTestUtils)
diff --git a/detection/testUtils/src/ImageGeneration.cpp b/detection/testUtils/src/ImageGeneration.cpp
@@ -84,7 +84,7 @@ namespace MPF { namespace COMPONENT {
 
         Rect new_rect(x_pos, y_pos, rect.width, rect.height);
 
-        cv::rectangle(mask, new_rect, Scalar(255, 255, 255), CV_FILLED);
+        cv::rectangle(mask, new_rect, Scalar(255, 255, 255), cv::FILLED);
 
         if (imshow_on) {
             cv::imshow("random mask", mask);
@@ -98,7 +98,7 @@ namespace MPF { namespace COMPONENT {
     int ImageGeneration::WriteDetectionOutputImage(const string image_in_uri,
                                                    const vector<MPFVideoTrack> &detections,
                                                    const string image_out_filepath) {
-        Mat input_image = cv::imread(image_in_uri.c_str(), CV_LOAD_IMAGE_IGNORE_ORIENTATION + CV_LOAD_IMAGE_COLOR);
+        Mat input_image = cv::imread(image_in_uri.c_str(), cv::IMREAD_IGNORE_ORIENTATION + cv::IMREAD_COLOR);
         if (input_image.empty()) {
             printf("Could not open the input image: %s\n", image_in_uri.c_str());
             return -1;
@@ -120,7 +120,7 @@ namespace MPF { namespace COMPONENT {
     int ImageGeneration::WriteDetectionOutputImage(const string image_in_uri,
                                                    const vector<MPFImageLocation> &detections,
                                                    const string image_out_filepath) {
-        Mat input_image = cv::imread(image_in_uri.c_str(), CV_LOAD_IMAGE_IGNORE_ORIENTATION + CV_LOAD_IMAGE_COLOR);
+        Mat input_image = cv::imread(image_in_uri.c_str(), cv::IMREAD_IGNORE_ORIENTATION + cv::IMREAD_COLOR);
         if (input_image.empty()) {
             printf("Could not open the input image: %s\n", image_in_uri.c_str());
             return -1;
diff --git a/detection/testUtils/src/VideoGeneration.cpp b/detection/testUtils/src/VideoGeneration.cpp
@@ -102,7 +102,7 @@ namespace MPF { namespace COMPONENT {
 
         Rect new_rect(x_pos, y_pos, rect.width, rect.height);
 
-        cv::rectangle(mask, new_rect, Scalar(255, 255, 255), CV_FILLED);
+        cv::rectangle(mask, new_rect, Scalar(255, 255, 255), cv::FILLED);
 
         if (imshow_on) {
             cv::imshow("random mask", mask);
@@ -128,7 +128,7 @@ namespace MPF { namespace COMPONENT {
             return Rect(0, 0, 0, 0);
         }
         else {
-            cv::rectangle(mask, new_rect, Scalar(255, 255, 255), CV_FILLED);
+            cv::rectangle(mask, new_rect, Scalar(255, 255, 255), cv::FILLED);
             if (imshow_on) {
                 cv::imshow("random mask", mask);
                 cv::waitKey(5);
@@ -158,13 +158,13 @@ namespace MPF { namespace COMPONENT {
             return -1;
         }
 
-        Size size = Size(static_cast<int>(input_video.get(CV_CAP_PROP_FRAME_WIDTH)),
-                         static_cast<int>(input_video.get(CV_CAP_PROP_FRAME_HEIGHT)));
+        Size size = Size(static_cast<int>(input_video.get(cv::CAP_PROP_FRAME_WIDTH)),
+                         static_cast<int>(input_video.get(cv::CAP_PROP_FRAME_HEIGHT)));
 
         VideoWriter output_video;
 
-        double fps = input_video.get(CV_CAP_PROP_FPS);
-        output_video.open(video_out_filepath, CV_FOURCC('M', 'J', 'P', 'G'), fps, size, true);
+        double fps = input_video.get(cv::CAP_PROP_FPS);
+        output_video.open(video_out_filepath, cv::VideoWriter::fourcc('M', 'J', 'P', 'G'), fps, size, true);
 
         if (!output_video.isOpened()) {
             std::cout << "Could not open the output video for write: " << video_out_filepath << std::endl;
@@ -227,7 +227,7 @@ namespace MPF { namespace COMPONENT {
         VideoWriter output_video;
         double fps = 30;
 
-        output_video.open(video_out_filepath, CV_FOURCC('M', 'J', 'P', 'G'), fps, video_size, true);
+        output_video.open(video_out_filepath, cv::VideoWriter::fourcc('M', 'J', 'P', 'G'), fps, video_size, true);
         if (!output_video.isOpened()) {
             std::cout << "Could not open the output video for write: " << video_out_filepath << std::endl;
             return -1;
diff --git a/detection/utils/CMakeLists.txt b/detection/utils/CMakeLists.txt
@@ -29,7 +29,7 @@ project(openmpf-cpp-component-utils)
 
 set(CMAKE_CXX_STANDARD 11)
 
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0
     COMPONENTS opencv_core opencv_imgcodecs opencv_imgproc opencv_videoio)
 
 find_package(PkgConfig)
diff --git a/detection/utils/src/Utils.cpp b/detection/utils/src/Utils.cpp
@@ -120,7 +120,7 @@ namespace MPF { namespace COMPONENT { namespace Utils {
     cv::Mat ConvertToGray(const cv::Mat &image) {
         cv::Mat gray;
         if (image.channels() == 3) {
-            cv::cvtColor(image, gray, CV_BGR2GRAY);
+            cv::cvtColor(image, gray, cv::COLOR_BGR2GRAY);
         }
         else if (image.channels() == 1) {
             gray = image.clone();

Original file line number	Diff line number	Diff line change
`@@ -1307,6 +1307,14 @@ TEST(AffineFrameTransformerTest, RotateFullFrame) {`
`1307`	`1307`	`}`
`1308`	`1308`
`1309`	`1309`
	`1310`	`+bool isSameImage(const cv::Mat &im1, const cv::Mat &im2) {`
	`1311`	`+ if (im1.size() != im2.size()) {`
	`1312`	`+ return false;`
	`1313`	`+ }`
	`1314`	`+ return std::equal(im1.begin<Pixel>(), im1.end<Pixel>(), im2.begin<Pixel>());`
	`1315`	`+}`
	`1316`	`+`
	`1317`	`+`
`1310`	`1318`	`TEST(AffineFrameTransformerTest, TestRotationThreshold) {`
`1311`	`1319`	`const auto *test_img_path = "test/test_imgs/rotation/hello-world.png";`
`1312`	`1320`	`auto original_img = cv::imread(test_img_path);`
`@@ -1315,14 +1323,14 @@ TEST(AffineFrameTransformerTest, TestRotationThreshold) {`
`1315`	`1323`	`{ {"ROTATION", "10"}, {"ROTATION_THRESHOLD", "10.001"} }, {});`
`1316`	`1324`
`1317`	`1325`	`auto img = MPFImageReader(job).GetImage();`
`1318`		`- ASSERT_EQ(0, cv::countNonZero(img != original_img));`
	`1326`	`+ ASSERT_TRUE(isSameImage(original_img, img));`
`1319`	`1327`	`}`
`1320`	`1328`	`{`
`1321`	`1329`	`MPFImageJob job("test", test_img_path,`
`1322`	`1330`	`{ {"ROTATION", "10"}, {"ROTATION_THRESHOLD", "9.99"} }, {});`
`1323`	`1331`
`1324`	`1332`	`auto img = MPFImageReader(job).GetImage();`
`1325`		`- ASSERT_NE(original_img.size(), img.size());`
	`1333`	`+ ASSERT_FALSE(isSameImage(original_img, img));`
`1326`	`1334`	`}`
`1327`	`1335`	`}`
`1328`	`1336`
`@@ -1337,13 +1345,13 @@ TEST(AffineFrameTransformerTest, TestRotationThresholdWithFeedForward) {`
`1337`	`1345`	`MPFImageJob job("test", test_img_path, ff_img_loc,`
`1338`	`1346`	`{ {"ROTATION_THRESHOLD", "5.12"}, {"FEED_FORWARD_TYPE", "REGION"} }, {});`
`1339`	`1347`	`auto img = MPFImageReader(job).GetImage();`
`1340`		`- ASSERT_EQ(0, cv::countNonZero(img != original_img));`
	`1348`	`+ ASSERT_TRUE(isSameImage(original_img, img));`
`1341`	`1349`	`}`
`1342`	`1350`	`{`
`1343`	`1351`	`MPFImageJob job("test", test_img_path, ff_img_loc,`
`1344`	`1352`	`{ {"ROTATION_THRESHOLD", "5.00"}, {"FEED_FORWARD_TYPE", "REGION"} }, {});`
`1345`	`1353`	`auto img = MPFImageReader(job).GetImage();`
`1346`		`- ASSERT_NE(0, cv::countNonZero(img != original_img));`
	`1354`	`+ ASSERT_FALSE(isSameImage(original_img, img));`
`1347`	`1355`	`}`
`1348`	`1356`	`}`
`1349`	`1357`