* Include missing opencv2/mcc/ccm.hpp header file in presets for O…

…penCV (discussion bytedeco/javacpp#568)
bytedeco · May 8, 2022 · f575bf0 · f575bf0
1 parent 5f9f676
commit f575bf0
Show file tree

Hide file tree

Showing 789 changed files with 1,755 additions and 1,086 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Include missing `opencv2/mcc/ccm.hpp` header file in presets for OpenCV ([discussion bytedeco/javacpp#568](https://github.com/bytedeco/javacpp/discussions/568))
  * Fix a few incorrectly mapped instances of `std::unordered_map` for PyTorch ([issue #1164](https://github.com/bytedeco/javacpp-presets/issues/1164))
  * Migrate builds for Leptonica and Tesseract to CMake ([issue #1163](https://github.com/bytedeco/javacpp-presets/issues/1163))
  * Introduce `macosx-arm64` builds for Leptonica and Tesseract ([issue #814](https://github.com/bytedeco/javacpp-presets/issues/814))

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_aruco.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_aruco.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_barcode.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_barcode.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_bgsegm.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_bgsegm.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_bioinspired.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_bioinspired.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_calib3d.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_calib3d.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_core.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_core.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 
@@ -1909,7 +1909,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core {
 @Namespace("cv") public static native @Name("saturate_cast<short>") short shortSaturateCast(@Cast("uchar") byte v);
 @Namespace("cv") public static native @Name("saturate_cast<int>") int intSaturate(@Cast("uchar") byte v);
 @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast<unsigned>") int unsignedSaturateCast(@Cast("uchar") byte v);
-@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") int uint64SaturateCast(@Cast("uchar") byte v);
+@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") long uint64SaturateCast(@Cast("uchar") byte v);
 @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast<int64>") long int64SaturateCast(@Cast("uchar") byte v);
 @Namespace("cv") public static native @ByVal @Name("saturate_cast<cv::float16_t>") float16_t float16SaturateCast(@Cast("uchar") byte v);
 /** \overload */
@@ -1920,7 +1920,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core {
 @Namespace("cv") public static native @Name("saturate_cast<short>") short shortSaturateCast(@Cast("ushort") short v);
 @Namespace("cv") public static native @Name("saturate_cast<int>") int intSaturate(@Cast("ushort") short v);
 @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast<unsigned>") int unsignedSaturateCast(@Cast("ushort") short v);
-@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") int uint64SaturateCast(@Cast("ushort") short v);
+@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") long uint64SaturateCast(@Cast("ushort") short v);
 @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast<int64>") long int64SaturateCast(@Cast("ushort") short v);
 @Namespace("cv") public static native @ByVal @Name("saturate_cast<cv::float16_t>") float16_t float16SaturateCast(@Cast("ushort") short v);
 /** \overload */
@@ -1931,7 +1931,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core {
 @Namespace("cv") public static native @Name("saturate_cast<short>") short shortSaturateCast(@Cast("unsigned") int v);
 @Namespace("cv") public static native @Name("saturate_cast<int>") int intSaturate(@Cast("unsigned") int v);
 @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast<unsigned>") int unsignedSaturateCast(@Cast("unsigned") int v);
-@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") int uint64SaturateCast(@Cast("unsigned") int v);
+@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") long uint64SaturateCast(@Cast("unsigned") int v);
 @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast<int64>") long int64SaturateCast(@Cast("unsigned") int v);
 @Namespace("cv") public static native @ByVal @Name("saturate_cast<cv::float16_t>") float16_t float16SaturateCast(@Cast("unsigned") int v);
 /** \overload */
@@ -1942,7 +1942,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core {
 @Namespace("cv") public static native @Name("saturate_cast<short>") short shortSaturateCast(float v);
 @Namespace("cv") public static native @Name("saturate_cast<int>") int intSaturate(float v);
 @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast<unsigned>") int unsignedSaturateCast(float v);
-@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") int uint64SaturateCast(float v);
+@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") long uint64SaturateCast(float v);
 @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast<int64>") long int64SaturateCast(float v);
 @Namespace("cv") public static native @ByVal @Name("saturate_cast<cv::float16_t>") float16_t float16SaturateCast(float v);
 /** \overload */
@@ -1952,7 +1952,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core {
 @Namespace("cv") public static native @Name("saturate_cast<short>") short shortSaturateCast(double v);
 @Namespace("cv") public static native @Name("saturate_cast<int>") int intSaturate(double v);
 @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast<unsigned>") int unsignedSaturateCast(double v);
-@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") int uint64SaturateCast(double v);
+@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") long uint64SaturateCast(double v);
 @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast<int64>") long int64SaturateCast(double v);
 @Namespace("cv") public static native @ByVal @Name("saturate_cast<cv::float16_t>") float16_t float16SaturateCast(double v);
 /** \overload */
@@ -1962,7 +1962,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core {
 @Namespace("cv") public static native @Name("saturate_cast<short>") short shortSaturateCast(@Cast("int64") long v);
 @Namespace("cv") public static native @Name("saturate_cast<int>") int intSaturate(@Cast("int64") long v);
 @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast<unsigned>") int unsignedSaturateCast(@Cast("int64") long v);
-@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") int uint64SaturateCast(@Cast("int64") long v);
+@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") long uint64SaturateCast(@Cast("int64") long v);
 @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast<int64>") long int64SaturateCast(@Cast("int64") long v);
 @Namespace("cv") public static native @ByVal @Name("saturate_cast<cv::float16_t>") float16_t float16SaturateCast(@Cast("int64") long v);
 /** \overload */
@@ -1975,7 +1975,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core {
 @Namespace("cv") public static native @Name("saturate_cast<short>") short shortSaturateCast(@ByVal float16_t v);
 @Namespace("cv") public static native @Name("saturate_cast<int>") int intSaturate(@ByVal float16_t v);
 @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast<unsigned>") int unsignedSaturateCast(@ByVal float16_t v);
-@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") int uint64SaturateCast(@ByVal float16_t v);
+@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast<uint64>") long uint64SaturateCast(@ByVal float16_t v);
 @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast<int64>") long int64SaturateCast(@ByVal float16_t v);
 @Namespace("cv") public static native @ByVal @Name("saturate_cast<cv::float16_t>") float16_t float16SaturateCast(@ByVal float16_t v);
 
@@ -2603,6 +2603,7 @@ It is possible to alternate error processing by using redirectError().
     @Namespace("cv") public static native @Cast("uchar") byte abs(@Cast("uchar") byte a);
     @Namespace("cv") public static native @Cast("ushort") short abs(@Cast("ushort") short a);
     @Namespace("cv") public static native @Cast("unsigned") int abs(@Cast("unsigned") int a);
+    @Namespace("cv") public static native @Cast("uint64") long abs(@Cast("uint64") long a);
 
 
 // #include "cvstd_wrapper.hpp"

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_dnn.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_dnn.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_dnn_superres.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_dnn_superres.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_face.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_face.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 
@@ -26,6 +26,8 @@
 import static org.bytedeco.opencv.global.opencv_features2d.*;
 import org.bytedeco.opencv.opencv_calib3d.*;
 import static org.bytedeco.opencv.global.opencv_calib3d.*;
+import org.bytedeco.opencv.opencv_dnn.*;
+import static org.bytedeco.opencv.global.opencv_dnn.*;
 import org.bytedeco.opencv.opencv_objdetect.*;
 import static org.bytedeco.opencv.global.opencv_objdetect.*;
 import org.bytedeco.opencv.opencv_photo.*;

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_features2d.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_features2d.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_flann.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_flann.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_highgui.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_highgui.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_img_hash.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_img_hash.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_imgcodecs.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_imgcodecs.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_imgproc.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_imgproc.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;
 

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_intensity_transform.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_intensity_transform.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.opencv.global;