Fix build with later versions of OpenCV 3

This first regressed in 2b17a38. Support for OpenCV 3.2 was re-added in 2e0c6d4. This fixes the build with OpenCV 3.3 and newer. Signed-off-by: Scott K Logan <[email protected]>
ros-perception · May 3, 2021 · 0b8af13 · 0b8af13
1 parent ad431c2
commit 0b8af13
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/image_proc/src/crop_decimate.cpp b/image_proc/src/crop_decimate.cpp
@@ -46,10 +46,9 @@ void debayer2x2toBGR(
   int R, int G1, int G2, int B)
 {
   typedef cv::Vec<T, 3> DstPixel;  // 8- or 16-bit BGR
-#if CV_VERSION_MAJOR >= 4
+#if CV_VERSION_MAJOR >= 4 || (CV_MAJOR_VERSION == 3 && CV_MINOR_VERSION > 2)
   dst.create(src.rows / 2, src.cols / 2, cv::traits::Type<DstPixel>::value);
 #else
-  // Assume OpenCV 3 API
   dst.create(src.rows / 2, src.cols / 2, cv::DataType<DstPixel>::type);
 #endif