From b13f6d2eecc96244ed819d4113c8c8443d4fc933 Mon Sep 17 00:00:00 2001 From: Bram Biesbrouck Date: Mon, 12 Dec 2016 14:12:19 +0100 Subject: [PATCH 1/2] Added opencv-text preset --- opencv/cppbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencv/cppbuild.sh b/opencv/cppbuild.sh index 61b7f4989aa..c88bc68e1da 100755 --- a/opencv/cppbuild.sh +++ b/opencv/cppbuild.sh @@ -17,7 +17,7 @@ tar -xzvf ../opencv-$OPENCV_VERSION.tar.gz tar -xzvf ../opencv_contrib-$OPENCV_VERSION.tar.gz cd opencv-$OPENCV_VERSION -BUILD_CONTRIB_X="-DBUILD_opencv_stereo=OFF -DBUILD_opencv_plot=OFF -DBUILD_opencv_fuzzy=OFF -DBUILD_opencv_aruco=OFF -DBUILD_opencv_adas=OFF -DBUILD_opencv_bgsegm=OFF -DBUILD_opencv_bioinspired=ON -DBUILD_opencv_ccalib=OFF -DBUILD_opencv_datasets=OFF -DBUILD_opencv_dnn=ON -DBUILD_opencv_dpm=OFF -DBUILD_opencv_face=ON -DBUILD_opencv_latentsvm=OFF -DBUILD_opencv_line_descriptor=OFF -DBUILD_opencv_matlab=OFF -DBUILD_opencv_optflow=ON -DBUILD_opencv_reg=OFF -DBUILD_opencv_rgbd=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_surface_matching=OFF -DBUILD_opencv_text=OFF -DBUILD_opencv_tracking=OFF -DBUILD_opencv_xfeatures2d=ON -DBUILD_opencv_ximgproc=ON -DBUILD_opencv_xobjdetect=OFF -DBUILD_opencv_xphoto=OFF" +BUILD_CONTRIB_X="-DBUILD_opencv_stereo=OFF -DBUILD_opencv_plot=OFF -DBUILD_opencv_fuzzy=OFF -DBUILD_opencv_aruco=OFF -DBUILD_opencv_adas=OFF -DBUILD_opencv_bgsegm=OFF -DBUILD_opencv_bioinspired=ON -DBUILD_opencv_ccalib=OFF -DBUILD_opencv_datasets=OFF -DBUILD_opencv_dnn=ON -DBUILD_opencv_dpm=OFF -DBUILD_opencv_face=ON -DBUILD_opencv_latentsvm=OFF -DBUILD_opencv_line_descriptor=OFF -DBUILD_opencv_matlab=OFF -DBUILD_opencv_optflow=ON -DBUILD_opencv_reg=OFF -DBUILD_opencv_rgbd=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_surface_matching=OFF -DBUILD_opencv_text=ON -DBUILD_opencv_tracking=OFF -DBUILD_opencv_xfeatures2d=ON -DBUILD_opencv_ximgproc=ON -DBUILD_opencv_xobjdetect=OFF -DBUILD_opencv_xphoto=OFF" case $PLATFORM in android-arm) From 63d9d34418673b0d881344f712c2e7812ad5efea Mon Sep 17 00:00:00 2001 From: Bram Biesbrouck Date: Mon, 12 Dec 2016 14:13:52 +0100 Subject: [PATCH 2/2] Added opencv-text preset --- .../bytedeco/javacpp/presets/opencv_text.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_text.java diff --git a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_text.java b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_text.java new file mode 100644 index 00000000000..46a4aaa2ee7 --- /dev/null +++ b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_text.java @@ -0,0 +1,32 @@ +package org.bytedeco.javacpp.presets; + +import org.bytedeco.javacpp.annotation.Platform; +import org.bytedeco.javacpp.annotation.Properties; +import org.bytedeco.javacpp.tools.Info; +import org.bytedeco.javacpp.tools.InfoMap; +import org.bytedeco.javacpp.tools.InfoMapper; + +/** + * Wrapper for OpenCV module text, part of OpenCV_Contrib. + * + * @author Bram Biesbrouck + */ +@Properties(inherit = {opencv_highgui.class, opencv_ml.class}, value = { + @Platform(include = {"", "", "", "opencv_adapters.h"}, + link = "opencv_text@.3.1"), + @Platform(value = "windows", link = "opencv_text310")}, + target = "org.bytedeco.javacpp.opencv_text") +public class opencv_text implements InfoMapper { + public void map(InfoMap infoMap) { + + infoMap.put(new Info("std::deque").pointerTypes("IntDeque").define()); + infoMap.put(new Info("std::vector").pointerTypes("ERStatVector").define()); + infoMap.put(new Info("std::vector >").pointerTypes("ERStatVectorVector").define()); + infoMap.put(new Info("std::vector").pointerTypes("DoubleVector").define()); + infoMap.put(new Info("std::vector").pointerTypes("StdStringVector").define()); + + infoMap.put(new Info("std::vector").pointerTypes("PointVector").cast()); + infoMap.put(new Info("std::vector >").pointerTypes("PointVectorVector").cast()); + + } +}