Update libalx

3 files changed, 31 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 1ca6868..a83b028 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ CFLAGS_W       += -Wstrict-prototypes
 CFLAGS_W       += -Werror
 
 CFLAGS_PKG	= `pkg-config --cflags ncurses`
-CFLAGS_PKG     += `pkg-config --cflags opencv`
+#CFLAGS_PKG     += `pkg-config --cflags opencv`
 CFLAGS_PKG     += `pkg-config --cflags opencv4`
 CFLAGS_PKG     += `pkg-config --cflags zbar`
 CFLAGS_PKG     += `pkg-config --cflags tesseract`
@@ -162,7 +162,7 @@ CXXFLAGS_W     += -Wextra
 CXXFLAGS_W     += -Werror
 
 CXXFLAGS_PKG	= `pkg-config --cflags ncurses`
-CXXFLAGS_PKG   += `pkg-config --cflags opencv`
+#CXXFLAGS_PKG   += `pkg-config --cflags opencv`
 CXXFLAGS_PKG   += `pkg-config --cflags opencv4`
 CXXFLAGS_PKG   += `pkg-config --cflags zbar`
 CXXFLAGS_PKG   += `pkg-config --cflags tesseract`
@@ -197,7 +197,7 @@ LIBS_OPT       += -flto
 LIBS_OPT       += -fuse-linker-plugin
 
 LIBS_PKG	= `pkg-config --libs ncurses`
-LIBS_PKG       += `pkg-config --libs opencv`
+#LIBS_PKG       += `pkg-config --libs opencv`
 LIBS_PKG       += `pkg-config --libs opencv4`
 LIBS_PKG       += `pkg-config --libs zbar`
 LIBS_PKG       += `pkg-config --libs tesseract`
diff --git a/src/image/iface.cpp b/src/image/iface.cpp
index f0bb77a..2e419a2 100644
--- a/src/image/iface.cpp
+++ b/src/image/iface.cpp
@@ -24,11 +24,25 @@
 #define ALX_NO_PREFIX
 #include <libalx/base/compiler/unused.hpp>
 #include <libalx/base/stdio/printf/sbprintf.hpp>
-#include <libalx/extra/cv/alx.hpp>
-#include <libalx/extra/cv/core.hpp>
-#include <libalx/extra/cv/features2d.hpp>
-#include <libalx/extra/cv/imgproc.hpp>
-#include <libalx/extra/cv/ximgproc.hpp>
+#include <libalx/extra/cv/alx/lines.hpp>
+#include <libalx/extra/cv/alx/max.hpp>
+#include <libalx/extra/cv/alx/mean.hpp>
+#include <libalx/extra/cv/alx/median.hpp>
+#include <libalx/extra/cv/alx/skeleton.hpp>
+#include <libalx/extra/cv/core/array.hpp>
+#include <libalx/extra/cv/core/contours.hpp>
+#include <libalx/extra/cv/core/img.hpp>
+#include <libalx/extra/cv/core/pixel.hpp>
+#include <libalx/extra/cv/core/rect.hpp>
+#include <libalx/extra/cv/core/roi.hpp>
+#include <libalx/extra/cv/features2d/orb.hpp>
+#include <libalx/extra/cv/imgproc/features.hpp>
+#include <libalx/extra/cv/imgproc/filter.hpp>
+#include <libalx/extra/cv/imgproc/geometric.hpp>
+#include <libalx/extra/cv/imgproc/histogram.hpp>
+#include <libalx/extra/cv/imgproc/miscellaneous.hpp>
+#include <libalx/extra/cv/imgproc/shape.hpp>
+#include <libalx/extra/cv/ximgproc/thinning.hpp>
 #include <libalx/extra/ocr/ocr.hpp>
 #include <libalx/extra/zbar/zbar.hpp>
 
@@ -199,7 +213,7 @@ void	img_iface_load		(const char *fpath, const char *fname)
 	if (!fname)
 		user_iface_fname(fpath, file_name);
 	else
-		UNUSED(sbprintf(file_name, NULL, "%s", fname));
+		ALX_UNUSED(sbprintf(file_name, NULL, "%s", fname));
 
 	errno	= 0;
 	load_image_file(path, file_name);
diff --git a/src/save/save.cpp b/src/save/save.cpp
index 433cce4..ea04863 100644
--- a/src/save/save.cpp
+++ b/src/save/save.cpp
@@ -24,7 +24,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 <libalx/extra/cv/highgui/file.hpp>
 
 #include "vision-artificial/user/iface.hpp"
 
@@ -107,16 +107,16 @@ void	load_image_file	(const char *restrict fpath,
 	if (!fpath) {
 		/* Default path */
 		save_reset_fpath();
-		UNUSED(sbprintf(file_path, NULL, "%s", saved_path));
+		ALX_UNUSED(sbprintf(file_path, NULL, "%s", saved_path));
 	} else {
-		UNUSED(sbprintf(file_path, NULL, "%s", fpath));
+		ALX_UNUSED(sbprintf(file_path, NULL, "%s", fpath));
 	}
 
 	/* Set file_name */
 	if (!fname)
 		user_iface_fname(file_path, saved_name);
 	else
-		UNUSED(sbprintf(saved_name, NULL, "%s", fname));
+		ALX_UNUSED(sbprintf(saved_name, NULL, "%s", fname));
 
 	/* File name */
 	if (sbprintf(file_name, NULL, "%s/%s", file_path, saved_name))
@@ -151,17 +151,17 @@ void	save_image_file	(const char *restrict fpath,
 	if (!fpath) {
 		/* Default path */
 		save_reset_fpath();
-		UNUSED(sbprintf(file_path, NULL, "%s", saved_path));
+		ALX_UNUSED(sbprintf(file_path, NULL, "%s", saved_path));
 	} else {
-		UNUSED(sbprintf(file_path, NULL, "%s", fpath));
+		ALX_UNUSED(sbprintf(file_path, NULL, "%s", fpath));
 	}
 
 	/* Set file_name */
 	if (!save_as) {
-		UNUSED(sbprintf(saved_name,NULL, "%s", SAVED_NAME_DEFAULT));
+		ALX_UNUSED(sbprintf(saved_name,NULL, "%s", SAVED_NAME_DEFAULT));
 		user_iface_fname(saved_path, saved_name);
 	} else {
-		UNUSED(sbprintf(saved_name, NULL, "%s", save_as));
+		ALX_UNUSED(sbprintf(saved_name, NULL, "%s", save_as));
 	}
 
 	/* Prepend the path */