Merge 'make it compilable with OpenCV 2.x and 3.x'

faxocr · Oct 27, 2020 · be78263 · be78263
2 parents 9815fd7 + 3dc7207
commit be78263
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/kocr_cnn.cpp b/src/kocr_cnn.cpp
@@ -1,8 +1,13 @@
 #include <vector>
 #include <string>
 #include <string.h>
-#include <opencv/cv.h>
-#include <opencv/highgui.h>
+#include <opencv/cv.hpp>
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION == 2
+#include <opencv2/highgui/highgui.hpp>
+#elif CV_MAJOR_VERSION == 3
+#include <opencv2/highgui.hpp>
+#endif
 
 #include "forward_cnn.h"
 #include "cropnums.h"