Macro issue in openCvMultiversionHeaders.hpp that makes CV4+ not co…

…mpatible (CMU-Perceptual-Computing-Lab#1491)

In old versions, variables like `CV_IMWRITE_JPEG_QUALITY` are "enum"s not "define"s. Hence, "ifdef"s here are useless here and will make OpenCV4.0+(non-alpha/beta version) not able to compile. This can be fixed by detecting the macro `cvvConvertImage` which is along with CV_LOAD_xxx & CV_IMWRITE_xxx in old versions :)

include/openpose_private/utilities/openCvMultiversionHeaders.hpp

@@ -39,23 +39,12 @@
     #define CV_WINDOW_NORMAL cv::WINDOW_NORMAL
     #define CV_WINDOW_OPENGL cv::WINDOW_OPENGL
     #define CV_WND_PROP_FULLSCREEN cv::WND_PROP_FULLSCREEN
-    // Required for alpha and beta versions, but not for rc version
     #include <opencv2/imgcodecs/imgcodecs.hpp>
-    #ifndef CV_IMWRITE_JPEG_QUALITY
-        #define CV_IMWRITE_JPEG_QUALITY cv::IMWRITE_JPEG_QUALITY
-    #endif
-    #ifndef CV_IMWRITE_PNG_COMPRESSION
-        #define CV_IMWRITE_PNG_COMPRESSION cv::IMWRITE_PNG_COMPRESSION
-    #endif
-    #ifndef CV_LOAD_IMAGE_ANYDEPTH
-        #define CV_LOAD_IMAGE_ANYDEPTH cv::IMREAD_ANYDEPTH
-    #endif
-    #ifndef CV_LOAD_IMAGE_COLOR
-        #define CV_LOAD_IMAGE_COLOR cv::IMREAD_COLOR
-    #endif
-    #ifndef CV_LOAD_IMAGE_GRAYSCALE
-        #define CV_LOAD_IMAGE_GRAYSCALE cv::IMREAD_GRAYSCALE
-    #endif
+    #define CV_IMWRITE_JPEG_QUALITY cv::IMWRITE_JPEG_QUALITY
+    #define CV_IMWRITE_PNG_COMPRESSION cv::IMWRITE_PNG_COMPRESSION
+    #define CV_LOAD_IMAGE_ANYDEPTH cv::IMREAD_ANYDEPTH
+    #define CV_LOAD_IMAGE_COLOR cv::IMREAD_COLOR
+    #define CV_LOAD_IMAGE_GRAYSCALE cv::IMREAD_GRAYSCALE
 #endif
 
 #endif // OPENPOSE_PRIVATE_UTILITIES_OPENCV_MULTIVERSION_HEADERS_HPP