Adapt to opencv4

7 files changed, 13 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index ca4a4a3..1ca6868 100644
--- a/Makefile
+++ b/Makefile
@@ -125,6 +125,7 @@ CFLAGS_W       += -Werror
 
 CFLAGS_PKG	= `pkg-config --cflags ncurses`
 CFLAGS_PKG     += `pkg-config --cflags opencv`
+CFLAGS_PKG     += `pkg-config --cflags opencv4`
 CFLAGS_PKG     += `pkg-config --cflags zbar`
 CFLAGS_PKG     += `pkg-config --cflags tesseract`
 CFLAGS_PKG     += `pkg-config --cflags libalx-base`
@@ -162,6 +163,7 @@ CXXFLAGS_W     += -Werror
 
 CXXFLAGS_PKG	= `pkg-config --cflags ncurses`
 CXXFLAGS_PKG   += `pkg-config --cflags opencv`
+CXXFLAGS_PKG   += `pkg-config --cflags opencv4`
 CXXFLAGS_PKG   += `pkg-config --cflags zbar`
 CXXFLAGS_PKG   += `pkg-config --cflags tesseract`
 CXXFLAGS_PKG   += `pkg-config --cflags libalx-base`
@@ -196,6 +198,7 @@ LIBS_OPT       += -fuse-linker-plugin
 
 LIBS_PKG	= `pkg-config --libs ncurses`
 LIBS_PKG       += `pkg-config --libs opencv`
+LIBS_PKG       += `pkg-config --libs opencv4`
 LIBS_PKG       += `pkg-config --libs zbar`
 LIBS_PKG       += `pkg-config --libs tesseract`
 LIBS_PKG       += `pkg-config --libs libalx-base`
diff --git a/inc/vision-artificial/image/calib3d.hpp b/inc/vision-artificial/image/calib3d.hpp
index 1e48652..b68564e 100644
--- a/inc/vision-artificial/image/calib3d.hpp
+++ b/inc/vision-artificial/image/calib3d.hpp
@@ -14,7 +14,7 @@
 /******************************************************************************
  ******* headers **************************************************************
  ******************************************************************************/
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
 
 
 /******************************************************************************
diff --git a/inc/vision-artificial/image/cv.hpp b/inc/vision-artificial/image/cv.hpp
index 02e43c6..c37cf6c 100644
--- a/inc/vision-artificial/image/cv.hpp
+++ b/inc/vision-artificial/image/cv.hpp
@@ -14,7 +14,7 @@
 /******************************************************************************
  ******* headers **************************************************************
  ******************************************************************************/
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
 
 
 /******************************************************************************
diff --git a/inc/vision-artificial/image/iface.hpp b/inc/vision-artificial/image/iface.hpp
index a835460..cbda107 100644
--- a/inc/vision-artificial/image/iface.hpp
+++ b/inc/vision-artificial/image/iface.hpp
@@ -18,7 +18,7 @@
 
 #include <vector>
 
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
 
 
 /******************************************************************************
diff --git a/src/image/calib3d.cpp b/src/image/calib3d.cpp
index 1650d99..8fc518d 100644
--- a/src/image/calib3d.cpp
+++ b/src/image/calib3d.cpp
@@ -87,13 +87,13 @@ static	void	img_calib3d_calibrate(class cv::Mat *imgptr, const void *data)
 	}
 
 	found	= cv::findChessboardCorners(*imgptr, pattern_size, corners,
-					CV_CALIB_CB_ADAPTIVE_THRESH |
-					CV_CALIB_CB_FILTER_QUADS);
+					cv::CALIB_CB_ADAPTIVE_THRESH |
+					cv::CALIB_CB_FILTER_QUADS);
 
 	cv::cornerSubPix(*imgptr, corners, cv::Size(11, 11),
 			cv::Size(-1, -1),
-			cv::TermCriteria(CV_TERMCRIT_EPS |
-					CV_TERMCRIT_ITER, 30, 0.1));
+			cv::TermCriteria(cv::TermCriteria::EPS |
+					cv::TermCriteria::MAX_ITER, 30, 0.1));
 	cv::drawChessboardCorners(*imgptr, pattern_size, corners, found);
 
 	image_points.push_back(corners);
diff --git a/src/image/cv.cpp b/src/image/cv.cpp
index 7037270..f651c36 100644
--- a/src/image/cv.cpp
+++ b/src/image/cv.cpp
@@ -91,7 +91,7 @@ static	void	img_cv_hough_circles	(class cv::Mat *imgptr, const void *data)
 	radius_max	= data_cast->radius_max;
 
 	/* Get circles */
-	cv::HoughCircles(*imgptr, *circles, CV_HOUGH_GRADIENT, 1, dist_min,
+	cv::HoughCircles(*imgptr, *circles, cv::HOUGH_GRADIENT, 1, dist_min,
 				param_1, param_2, radius_min, radius_max);
 
 	/* Set image to black */
diff --git a/src/save/save.cpp b/src/save/save.cpp
index 9073195..55b8dd2 100644
--- a/src/save/save.cpp
+++ b/src/save/save.cpp
@@ -23,6 +23,7 @@
 #include "libalx/base/compiler/unused.hpp"
 #include "libalx/base/errno/error.hpp"
 #include "libalx/base/stdio/printf/sbprintf.hpp"
+#include "libalx/extra/cv/highgui.hpp"
 
 #include "vision-artificial/user/iface.hpp"
 
@@ -120,7 +121,7 @@ void	load_image_file	(const char *restrict fpath,
 	if (alx_sbprintf(file_name, NULL, "%s/%s", file_path, saved_name))
 		goto err_path;
 
-	image	= cv::imread(file_name, CV_LOAD_IMAGE_COLOR);
+	alx::CV::imread(&image, file_name);
 	if (image.empty())
 		goto err_img;