Update libalx

9 files changed, 28 insertions, 55 deletions

diff --git a/inc/vision-artificial/user/iface.hpp b/inc/vision-artificial/user/iface.hpp
index 70a9023..4355c15 100644
--- a/inc/vision-artificial/user/iface.hpp
+++ b/inc/vision-artificial/user/iface.hpp
@@ -17,7 +17,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "libalx/base/compiler/restrict.hpp"
+#include <libalx/base/compiler.hpp>
 
 
 /******************************************************************************
diff --git a/src/ctrl/start.c b/src/ctrl/start.c
index d1d9eb6..697660d 100644
--- a/src/ctrl/start.c
+++ b/src/ctrl/start.c
@@ -15,7 +15,7 @@
 #include <string.h>
 
 #define ALX_NO_PREFIX
-#include <libalx/base/errno/error.h>
+#include <libalx/base/errno.h>
 
 #include "vision-artificial/image/iface.h"
 #include "vision-artificial/save/save.h"
diff --git a/src/image/iface.cpp b/src/image/iface.cpp
index 4238f0f..c8d3051 100644
--- a/src/image/iface.cpp
+++ b/src/image/iface.cpp
@@ -24,30 +24,9 @@
 #include <opencv2/ximgproc.hpp>
 
 #define ALX_NO_PREFIX
-#include <libalx/base/compiler/unused.hpp>
-#include <libalx/base/stdio/printf/sbprintf.hpp>
-#include <libalx/extra/cv/alx/fill.hpp>
-#include <libalx/extra/cv/alx/gray.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/features.hpp>
-#include <libalx/extra/cv/imgproc/filter/filter.hpp>
-#include <libalx/extra/cv/imgproc/geometric/geom.hpp>
-#include <libalx/extra/cv/imgproc/histogram/hist.hpp>
-#include <libalx/extra/cv/imgproc/miscellaneous/misc.hpp>
-#include <libalx/extra/cv/imgproc/shape/contours.hpp>
-#include <libalx/extra/cv/imgproc/shape/rect.hpp>
-#include <libalx/extra/cv/ximgproc/thinning.hpp>
+#include <libalx/base/compiler.hpp>
+#include <libalx/base/stdio.hpp>
+#include <libalx/extra/cv/cv.hpp>
 #include <libalx/extra/ocr/ocr.hpp>
 #include <libalx/extra/zbar/zbar.hpp>
 
@@ -933,15 +912,12 @@ static	void	img_iface_border		(void)
 
 	size	= user_iface_getint(1, 1, INT16_MAX, "Size",NULL);
 
-	if (alx::CV::border(&image_copy_tmp, size))
-		goto err;
+	alx::CV::border_black(&image_copy_tmp, size);
 
 	if (sbprintf(txt, NULL, "Border size = %ti", size) < 0)
 		return;
 	user_iface_log_write(1, txt);
 	return;
-err:
-	user_iface_log_write(1, "! Invalid input (Must be 1 channel)");
 }
 
 /* ----- ------- Geometric image transformations */
@@ -1006,7 +982,7 @@ err:
 static	void	img_iface_rotate_2rect		(void)
 {
 
-	if (alx::CV::rotate_2rect(&image_copy_tmp, &rectangle_rot))
+	if (alx::CV::rotate_2rect(&image_copy_tmp, &rectangle_rot, NULL))
 		goto err;
 
 	user_iface_log_write(1, "Rotate to rectangle");
@@ -1018,7 +994,7 @@ err:
 /* ----- ------- Miscellaneous image transformations */
 static	void	img_iface_adaptive_thr		(void)
 {
-	int		method, thr_typ;
+	int		method, thr_typ, c;
 	ptrdiff_t	ksize;
 	char		txt[LOG_LINE_LEN];
 
@@ -1026,12 +1002,13 @@ static	void	img_iface_adaptive_thr		(void)
 	thr_typ = user_iface_getint(0, 0, 1, "Type: BIN=0, BIN_INV=1", NULL);
 	ksize	= user_iface_getint(3, 3, INFINITY,
 					"Kernel size: 3, 5, 7, ...", NULL);
+	c	= user_iface_getint(-INFINITY, 1, INFINITY, "c:", NULL);
 
-	if (alx::CV::adaptive_thr(&image_copy_tmp, method, thr_typ, ksize))
+	if (alx::CV::adaptive_thr(&image_copy_tmp, method, thr_typ, ksize, c))
 		goto err;
 
-	if (sbprintf(txt, NULL, "Threshold mth=%i, typ=%i, ks=%ti",
-						method, thr_typ, ksize) < 0)
+	if (sbprintf(txt, NULL, "Threshold mth=%i, typ=%i, ks=%ti, c=%i",
+						method, thr_typ, ksize, c) < 0)
 		return;
 	user_iface_log_write(1, txt);
 	return;
@@ -1097,7 +1074,7 @@ err:
 static	void	img_iface_histogram1D		(void)
 {
 
-	if (alx::CV::histogram1D(&hist_img_c1, &image_copy_tmp))
+	if (alx::CV::draw_hist1D(&hist_img_c1, &image_copy_tmp))
 		goto err;
 
 	user_iface_log_write(1, "Histogram");
@@ -1109,7 +1086,7 @@ err:
 static	void	img_iface_histogram3D		(void)
 {
 
-	if (alx::CV::histogram1D(&hist_img_c3, &image_copy_tmp))
+	if (alx::CV::draw_hist3D(&hist_img_c3, &image_copy_tmp))
 		goto err;
 
 	user_iface_log_write(1, "Histogram (3 channels)");
diff --git a/src/main.c b/src/main.c
index d8c2fcd..9b6932e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,8 +9,8 @@
  ******************************************************************************/
 #include <stdio.h>
 
-#include <libalx/base/stdio/seekc.h>
-#include <libalx/extra/ncurses/common.h>
+#include <libalx/base/stdio.h>
+#include <libalx/extra/ncurses/ncurses.h>
 
 #include "vision-artificial/image/iface.h"
 #include "vision-artificial/menu/iface.h"
diff --git a/src/menu/tui.c b/src/menu/tui.c
index a386643..f01cb8e 100644
--- a/src/menu/tui.c
+++ b/src/menu/tui.c
@@ -15,11 +15,9 @@
 
 #include <ncurses.h>
 
-#include <libalx/base/compiler/size.h>
-#include <libalx/base/stdio/seekc.h>
-#include <libalx/extra/ncurses/common.h>
-#include <libalx/extra/ncurses/get.h>
-#include <libalx/extra/ncurses/menu.h>
+#include <libalx/base/compiler.h>
+#include <libalx/base/stdio.h>
+#include <libalx/extra/ncurses/ncurses.h>
 
 #include "vision-artificial/ctrl/start.h"
 #include "vision-artificial/save/save.h"
diff --git a/src/save/save.cpp b/src/save/save.cpp
index ea04863..4dd0a24 100644
--- a/src/save/save.cpp
+++ b/src/save/save.cpp
@@ -20,11 +20,10 @@
 #include <opencv2/highgui/highgui.hpp>
 
 #define ALX_NO_PREFIX
-#include <libalx/base/compiler/restrict.hpp>
-#include <libalx/base/compiler/unused.hpp>
-#include <libalx/base/errno/error.hpp>
-#include <libalx/base/stdio/printf/sbprintf.hpp>
-#include <libalx/extra/cv/highgui/file.hpp>
+#include <libalx/base/compiler.hpp>
+#include <libalx/base/errno.hpp>
+#include <libalx/base/stdio.hpp>
+#include <libalx/extra/cv/cv.hpp>
 
 #include "vision-artificial/user/iface.hpp"
 
diff --git a/src/share/share.c b/src/share/share.c
index 9388dbd..1a86dc2 100644
--- a/src/share/share.c
+++ b/src/share/share.c
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 
 #define ALX_NO_PREFIX
-#include <libalx/base/errno/error.h>
-#include <libalx/base/stdio/printf/sbprintf.h>
+#include <libalx/base/errno.h>
+#include <libalx/base/stdio.h>
 
 
 /******************************************************************************
diff --git a/src/user/iface.c b/src/user/iface.c
index 5fa20b9..c78c548 100644
--- a/src/user/iface.c
+++ b/src/user/iface.c
@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include <libalx/base/stdio/get.h>
+#include <libalx/base/stdio.h>
 
 #include "vision-artificial/image/iface.h"
 #include "vision-artificial/user/tui.h"
diff --git a/src/user/tui.c b/src/user/tui.c
index 3cd543a..f48a4f2 100644
--- a/src/user/tui.c
+++ b/src/user/tui.c
@@ -12,9 +12,8 @@
 #include <inttypes.h>
 #include <ncurses.h>
 
-#include <libalx/base/stdio/seekc.h>
-#include <libalx/extra/ncurses/common.h>
-#include <libalx/extra/ncurses/get.h>
+#include <libalx/base/stdio.h>
+#include <libalx/extra/ncurses/ncurses.h>
 
 #include "vision-artificial/image/iface.h"
 #include "vision-artificial/user/iface.h"