diff --git a/.github/workflows/cpython.yml b/.github/workflows/cpython.yml index 6aa3448eace..dbe117e98e0 100644 --- a/.github/workflows/cpython.yml +++ b/.github/workflows/cpython.yml @@ -21,10 +21,10 @@ jobs: # runs-on: ubuntu-20.04 # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-arm64: - runs-on: ubuntu-20.04 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-arm64: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # linux-ppc64le: # runs-on: ubuntu-20.04 # steps: @@ -54,7 +54,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-arm64, linux-x86_64, macosx-x86_64, macosx-arm64, windows-x86_64] + needs: [linux-x86_64, macosx-x86_64, macosx-arm64, windows-x86_64] # needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/numpy.yml b/.github/workflows/numpy.yml index 38ebf4c138f..1e4be0cc30e 100644 --- a/.github/workflows/numpy.yml +++ b/.github/workflows/numpy.yml @@ -22,10 +22,10 @@ jobs: # runs-on: ubuntu-20.04 # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-arm64: - runs-on: ubuntu-20.04 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-arm64: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # linux-ppc64le: # runs-on: ubuntu-20.04 # steps: @@ -51,7 +51,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64] + needs: [linux-x86_64, macosx-x86_64, windows-x86_64] # needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] runs-on: ubuntu-20.04 steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index be1f22d8437..656148ef97b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ + * Update and fix the sample code of the presets for LLVM ([pull #1501](https://github.com/bytedeco/javacpp-presets/pull/1501)) * Fix Vulkan GPU acceleration for FFmpeg ([pull #1497](https://github.com/bytedeco/javacpp-presets/pull/1497)) * Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481)) * Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472)) * Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475)) - * Upgrade presets for FFmpeg 7.0, DNNL 3.4.1, OpenBLAS 0.3.27, CPython 3.12.3, NumPy 1.26.4, SciPy 1.13.0, LLVM 18.1.4, libffi 3.4.6, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.0, ONNX Runtime 1.17.3, TVM 0.16.0, and their dependencies + * Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0, DNNL 3.4.1, OpenBLAS 0.3.27, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.4, NumPy 2.0.0, SciPy 1.14.0, LLVM 18.1.4, Tesseract 5.4.1, libffi 3.4.6, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.1, ONNX Runtime 1.18.0, TVM 0.16.0, and their dependencies ### January 29, 2024 version 1.5.10 * Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463)) diff --git a/README.md b/README.md index 8f4658ee04c..9a5a5621c98 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ The JavaCPP Presets depend on Maven, a powerful build system for Java, so before Each child module in turn relies by default on the included [`cppbuild.sh` scripts](#the-cppbuildsh-scripts), explained below, to install its corresponding native libraries in the `cppbuild` subdirectory. To use native libraries already installed somewhere else on the system, other installation directories than `cppbuild` can also be specified either in the `pom.xml` files or in the `.java` configuration files. The following versions are supported: - * OpenCV 4.9.x https://opencv.org/releases/ + * OpenCV 4.10.x https://opencv.org/releases/ * FFmpeg 7.0.x http://ffmpeg.org/download.html * FlyCapture 2.13.x https://www.flir.com/products/flycapture-sdk * Spinnaker 3.0.x https://www.flir.com/products/spinnaker-sdk @@ -201,19 +201,19 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * DNNL 3.4.x https://github.com/oneapi-src/oneDNN * OpenBLAS 0.3.27 http://www.openblas.net/ * ARPACK-NG 3.9.x https://github.com/opencollab/arpack-ng - * CMINPACK 1.3.8 https://github.com/devernay/cminpack + * CMINPACK 1.3.9 https://github.com/devernay/cminpack * FFTW 3.3.10 http://www.fftw.org/download.html - * GSL 2.7 http://www.gnu.org/software/gsl/#downloading + * GSL 2.8 http://www.gnu.org/software/gsl/#downloading * CPython 3.12.x https://www.python.org/downloads/ - * NumPy 1.26.x https://github.com/numpy/numpy - * SciPy 1.13.x https://github.com/scipy/scipy + * NumPy 2.0.x https://github.com/numpy/numpy + * SciPy 1.14.x https://github.com/scipy/scipy * Gym 0.26.x https://github.com/openai/gym * LLVM 18.1.x http://llvm.org/releases/download.html * libffi 3.4.x https://github.com/libffi/libffi * libpostal 1.1 https://github.com/openvenues/libpostal * LibRaw 0.21.x https://www.libraw.org/download * Leptonica 1.84.x http://www.leptonica.org/download.html - * Tesseract 5.3.x https://github.com/tesseract-ocr/tesseract + * Tesseract 5.4.x https://github.com/tesseract-ocr/tesseract * Caffe 1.0 https://github.com/BVLC/caffe * OpenPose 1.7.0 https://github.com/CMU-Perceptual-Computing-Lab/openpose * CUDA 12.3.x https://developer.nvidia.com/cuda-downloads @@ -223,7 +223,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * NVIDIA Video Codec SDK 12.1.x https://developer.nvidia.com/nvidia-video-codec-sdk * OpenCL 3.0.x https://github.com/KhronosGroup/OpenCL-ICD-Loader * MXNet 1.9.x https://github.com/apache/incubator-mxnet - * PyTorch 2.2.x https://github.com/pytorch/pytorch + * PyTorch 2.3.x https://github.com/pytorch/pytorch * SentencePiece 0.2.0 https://github.com/google/sentencepiece * TensorFlow 1.15.x https://github.com/tensorflow/tensorflow * TensorFlow Lite 2.16.x https://github.com/tensorflow/tensorflow @@ -233,7 +233,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * DepthAI 2.24.x https://github.com/luxonis/depthai-core * ONNX 1.16.x https://github.com/onnx/onnx * nGraph 0.26.0 https://github.com/NervanaSystems/ngraph - * ONNX Runtime 1.17.x https://github.com/microsoft/onnxruntime + * ONNX Runtime 1.18.x https://github.com/microsoft/onnxruntime * TVM 0.16.x https://github.com/apache/tvm * Bullet Physics SDK 3.25 https://pybullet.org * LiquidFun http://google.github.io/liquidfun/ diff --git a/cminpack/README.md b/cminpack/README.md index 88d448a3e7e..9bf05d53abb 100644 --- a/cminpack/README.md +++ b/cminpack/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * CMINPACK 1.3.8 http://devernay.free.fr/hacks/cminpack/ + * CMINPACK 1.3.9 http://devernay.free.fr/hacks/cminpack/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -38,7 +38,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.cminpack tlmdif1c - 1.5.10 + 1.5.11-SNAPSHOT Tlmdif1c @@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cminpack-platform - 1.3.8-1.5.10 + 1.3.9-1.5.11-SNAPSHOT diff --git a/cminpack/cminpack.patch b/cminpack/cminpack.patch index b25b32ce0f9..2966bbdb8f2 100644 --- a/cminpack/cminpack.patch +++ b/cminpack/cminpack.patch @@ -1,6 +1,6 @@ -diff -ruN cminpack-1.3.7/cminpack.h cminpack-1.3.7-patch/cminpack.h ---- cminpack-1.3.7/cminpack.h 2020-12-10 12:46:30.000000000 +0900 -+++ cminpack-1.3.7-patch/cminpack.h 2020-12-14 09:56:21.103983672 +0900 +diff -ruN cminpack-1.3.9/cminpack.h cminpack-1.3.9-patch/cminpack.h +--- cminpack-1.3.9/cminpack.h 2024-05-29 06:09:16.000000000 +0900 ++++ cminpack-1.3.9-patch/cminpack.h 2024-06-16 11:16:11.274115743 +0900 @@ -36,38 +36,7 @@ extern "C" { #endif /* __cplusplus */ @@ -28,8 +28,8 @@ diff -ruN cminpack-1.3.7/cminpack.h cminpack-1.3.7-patch/cminpack.h -#define CMINPACK_DECLSPEC_IMPORT _Import -#endif - --#if !defined(CMINPACK_NO_DLL) && (defined(__WIN32__) || defined(WIN32) || defined (_WIN32)) --#if defined(cminpack_EXPORTS) || defined(CMINPACK_EXPORTS) || defined(CMINPACK_DLL_EXPORTS) +-#if !defined(CMINPACK_NO_DLL) && defined(_WIN32) +- #if defined(CMINPACK_DLL_EXPORTS) - #define CMINPACK_EXPORT CMINPACK_DECLSPEC_EXPORT - #else - #define CMINPACK_EXPORT CMINPACK_DECLSPEC_IMPORT @@ -40,25 +40,10 @@ diff -ruN cminpack-1.3.7/cminpack.h cminpack-1.3.7-patch/cminpack.h #if defined(__CUDA_ARCH__) || defined(__CUDACC__) #define __cminpack_attr__ __device__ -diff -ruN cminpack-1.3.7/cminpackP.h cminpack-1.3.7-patch/cminpackP.h ---- cminpack-1.3.7/cminpackP.h 2020-12-10 12:46:30.000000000 +0900 -+++ cminpack-1.3.7-patch/cminpackP.h 2020-12-14 09:56:01.382967467 +0900 -@@ -11,20 +11,20 @@ - #endif - - #ifdef USE_CBLAS --#ifdef __APPLE__ --#include --#else -+//#ifdef __APPLE__ -+//#include -+//#else - #include --#endif -+//#endif - #define __cminpack_enorm__(n,x) __cminpack_cblas__(nrm2)(n,x,1) - #else - #define __cminpack_enorm__(n,x) __cminpack_func__(enorm)(n,x) +diff -ruN cminpack-1.3.9/cminpackP.h cminpack-1.3.9-patch/cminpackP.h +--- cminpack-1.3.9/cminpackP.h 2024-05-29 06:09:16.000000000 +0900 ++++ cminpack-1.3.9-patch/cminpackP.h 2024-06-16 11:17:44.793475898 +0900 +@@ -33,9 +33,9 @@ #endif #ifdef USE_LAPACK @@ -71,7 +56,7 @@ diff -ruN cminpack-1.3.7/cminpackP.h cminpack-1.3.7-patch/cminpackP.h #if defined(__LP64__) /* In LP64 match sizes with the 32 bit ABI */ typedef int __CLPK_integer; typedef int __CLPK_logical; -@@ -47,7 +47,7 @@ +@@ -58,7 +58,7 @@ __CLPK_integer *m, __CLPK_integer *n, __cminpack_real__ *a, __CLPK_integer * lda, __cminpack_real__ *tau, __cminpack_real__ *work, __CLPK_integer *lwork, __CLPK_integer *info); #endif @@ -80,13 +65,13 @@ diff -ruN cminpack-1.3.7/cminpackP.h cminpack-1.3.7-patch/cminpackP.h #include "minpackP.h" -diff -ruN cminpack-1.3.7/Makefile cminpack-1.3.7-patch/Makefile ---- cminpack-1.3.7/Makefile 2020-12-10 12:46:30.000000000 +0900 -+++ cminpack-1.3.7-patch/Makefile 2020-12-14 09:55:58.464965069 +0900 +diff -ruN cminpack-1.3.9/Makefile cminpack-1.3.9-patch/Makefile +--- cminpack-1.3.9/Makefile 2024-05-29 06:09:16.000000000 +0900 ++++ cminpack-1.3.9-patch/Makefile 2024-06-16 11:15:38.626990012 +0900 @@ -11,7 +11,7 @@ #LIBSUFFIX=s - #CFLAGS="-O3 -g -Wall -Wextra -DUSE_CBLAS -DUSE_LAPACK" - CFLAGS_L=$(CFLAGS) -DUSE_CBLAS -DUSE_LAPACK + #CFLAGS="-O3 -g -Wall -Wextra -DUSE_BLAS -DUSE_LAPACK" + CFLAGS_L=$(CFLAGS) -DUSE_BLAS -DUSE_LAPACK -LDADD_L=-framework Accelerate +#LDADD_L=-framework Accelerate diff --git a/cminpack/cppbuild.sh b/cminpack/cppbuild.sh index b1834eaf5f9..1ec501fa480 100755 --- a/cminpack/cppbuild.sh +++ b/cminpack/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -CMINPACK_VERSION=1.3.8 +CMINPACK_VERSION=1.3.9 download https://github.com/devernay/cminpack/archive/v$CMINPACK_VERSION.tar.gz cminpack-$CMINPACK_VERSION.tar.gz mkdir -p $PLATFORM diff --git a/cminpack/platform/pom.xml b/cminpack/platform/pom.xml index 0a112562c4c..79067d04e93 100644 --- a/cminpack/platform/pom.xml +++ b/cminpack/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cminpack-platform - 1.3.8-${project.parent.version} + 1.3.9-${project.parent.version} JavaCPP Presets Platform for CMINPACK diff --git a/cminpack/pom.xml b/cminpack/pom.xml index 6248ac79d5b..a00f4e7e2e3 100644 --- a/cminpack/pom.xml +++ b/cminpack/pom.xml @@ -11,7 +11,7 @@ org.bytedeco cminpack - 1.3.8-${project.parent.version} + 1.3.9-${project.parent.version} JavaCPP Presets for CMINPACK diff --git a/cminpack/samples/pom.xml b/cminpack/samples/pom.xml index 4597620bfc9..3ae178e85b6 100644 --- a/cminpack/samples/pom.xml +++ b/cminpack/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cminpack-platform - 1.3.8-1.5.11-SNAPSHOT + 1.3.9-1.5.11-SNAPSHOT diff --git a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.java b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.java index 1fd7e2bb6db..0770ba31dbd 100644 --- a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.java +++ b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.cminpack.global; @@ -74,7 +74,7 @@ __cminpack_half__ for half from the OpenEXR library (in this case, you must // #ifdef __cminpack_double__ // #define __cminpack_func__(func) func -// #define __cminpack_cblas__(func) cblas_d ## func +// #define __cminpack_blas__(func) d ## func ## _ // #define __cminpack_lapack__(func) d ## func // #endif diff --git a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.java b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.java index 47a219d5510..4339ea93e9b 100644 --- a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.java +++ b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.cminpack.global; @@ -74,7 +74,7 @@ __cminpack_half__ for half from the OpenEXR library (in this case, you must // #ifdef __cminpack_double__ // #define __cminpack_func__(func) func -// #define __cminpack_cblas__(func) cblas_d ## func +// #define __cminpack_blas__(func) d ## func ## _ // #define __cminpack_lapack__(func) d ## func // #endif diff --git a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.java b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.java index d1b9002a746..c6046a2f4eb 100644 --- a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.java +++ b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.cminpack.global; @@ -80,7 +80,7 @@ __cminpack_half__ for half from the OpenEXR library (in this case, you must // #ifdef __cminpack_float__ // #define __cminpack_func__(func) s ## func -// #define __cminpack_cblas__(func) cblas_s ## func +// #define __cminpack_blas__(func) s ## func ## _ // #define __cminpack_lapack__(func) s ## func // #endif diff --git a/cpython/README.md b/cpython/README.md index 4fbebc8a725..a9d475eeb6f 100644 --- a/cpython/README.md +++ b/cpython/README.md @@ -14,7 +14,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * CPython 3.12.3 https://www.python.org/ + * CPython 3.12.4 https://www.python.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cpython-platform - 3.12.3-1.5.11-SNAPSHOT + 3.12.4-1.5.11-SNAPSHOT diff --git a/cpython/cppbuild.sh b/cpython/cppbuild.sh index 0a2ae3a6403..a9d7144e823 100755 --- a/cpython/cppbuild.sh +++ b/cpython/cppbuild.sh @@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then fi OPENSSL=openssl-3.3.0 -CPYTHON_VERSION=3.12.3 +CPYTHON_VERSION=3.12.4 download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz diff --git a/cpython/platform/pom.xml b/cpython/platform/pom.xml index 4cb35250100..fc53fd3f1f7 100644 --- a/cpython/platform/pom.xml +++ b/cpython/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cpython-platform - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} JavaCPP Presets Platform for CPython @@ -36,12 +36,12 @@ - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-arm64} - + + + + + + @@ -136,7 +136,7 @@ module org.bytedeco.${javacpp.moduleId}.platform { // requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; - requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; +// requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; // requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; // requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; diff --git a/cpython/pom.xml b/cpython/pom.xml index 986803666aa..199ffe8e179 100644 --- a/cpython/pom.xml +++ b/cpython/pom.xml @@ -11,7 +11,7 @@ org.bytedeco cpython - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} JavaCPP Presets for CPython diff --git a/cpython/samples/pom.xml b/cpython/samples/pom.xml index cf2151c3c7b..66f3dbb4f81 100644 --- a/cpython/samples/pom.xml +++ b/cpython/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cpython-platform - 3.12.3-1.5.11-SNAPSHOT + 3.12.4-1.5.11-SNAPSHOT diff --git a/cpython/src/gen/java/org/bytedeco/cpython/global/python.java b/cpython/src/gen/java/org/bytedeco/cpython/global/python.java index 2cff2e28f06..6aaa75ced7c 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/global/python.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/global/python.java @@ -144,12 +144,12 @@ There is also (independent) API version information in modsupport.h. /*--start constants--*/ public static final int PY_MAJOR_VERSION = 3; public static final int PY_MINOR_VERSION = 12; -public static final int PY_MICRO_VERSION = 3; +public static final int PY_MICRO_VERSION = 4; public static final int PY_RELEASE_LEVEL = PY_RELEASE_LEVEL_FINAL; public static final int PY_RELEASE_SERIAL = 0; /* Version as a string */ -public static final String PY_VERSION = "3.12.3"; +public static final String PY_VERSION = "3.12.4"; /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. @@ -2889,6 +2889,9 @@ linkage handling and it uses __declspec(). // # if defined(__SANITIZE_ADDRESS__) // # define _Py_ADDRESS_SANITIZER // # endif +// # if defined(__SANITIZE_THREAD__) +// # define _Py_THREAD_SANITIZER +// # endif // #endif @@ -9234,7 +9237,7 @@ of a key wins, else the first. The Python dict constructor dict(seq2) // #endif -// #define COMMON_FIELDS(PREFIX) +// #define _Py_COMMON_FIELDS(PREFIX) // PyObject *PREFIX ## globals; // PyObject *PREFIX ## builtins; // PyObject *PREFIX ## name; @@ -9250,6 +9253,8 @@ of a key wins, else the first. The Python dict constructor dict(seq2) +// #undef _Py_COMMON_FIELDS + public static native @ByRef PyTypeObject PyFunction_Type(); public static native void PyFunction_Type(PyTypeObject setter); // #define PyFunction_Check(op) Py_IS_TYPE((op), &PyFunction_Type) @@ -13707,7 +13712,7 @@ or PyObject_FastCallDict() (both forms are supported), */ // #define PY_PARSER_REQUIRES_FUTURE_KEYWORD -public static final int CO_MAXBLOCKS = 20; /* Max static block nesting within a function */ +public static final int CO_MAXBLOCKS = 21; /* Max static block nesting within a function */ public static native @ByRef PyTypeObject PyCode_Type(); public static native void PyCode_Type(PyTypeObject setter); diff --git a/gsl/README.md b/gsl/README.md index 061b4a56283..933cdcef7bd 100644 --- a/gsl/README.md +++ b/gsl/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * GSL 2.7 http://www.gnu.org/software/gsl/ + * GSL 2.8 http://www.gnu.org/software/gsl/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -38,7 +38,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.gsl demo - 1.5.10 + 1.5.11-SNAPSHOT Demo @@ -46,14 +46,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco gsl-platform - 2.7-1.5.10 + 2.8-1.5.11-SNAPSHOT org.bytedeco mkl-platform-redist - 2024.0-1.5.10 + 2024.0-1.5.11-SNAPSHOT diff --git a/gsl/cppbuild.sh b/gsl/cppbuild.sh index 04a13587ead..64971b2133c 100755 --- a/gsl/cppbuild.sh +++ b/gsl/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -GSL_VERSION=2.7 +GSL_VERSION=2.8 download http://ftp.gnu.org/gnu/gsl/gsl-$GSL_VERSION.tar.gz gsl-$GSL_VERSION.tar.gz mkdir -p $PLATFORM diff --git a/gsl/platform/pom.xml b/gsl/platform/pom.xml index 0e66ecb1afc..36be8313b18 100644 --- a/gsl/platform/pom.xml +++ b/gsl/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco gsl-platform - 2.7-${project.parent.version} + 2.8-${project.parent.version} JavaCPP Presets Platform for GSL diff --git a/gsl/pom.xml b/gsl/pom.xml index 471b523f502..657535e2128 100644 --- a/gsl/pom.xml +++ b/gsl/pom.xml @@ -11,7 +11,7 @@ org.bytedeco gsl - 2.7-${project.parent.version} + 2.8-${project.parent.version} JavaCPP Presets for GSL diff --git a/gsl/samples/pom.xml b/gsl/samples/pom.xml index 175558f68a0..28fe9795a4d 100644 --- a/gsl/samples/pom.xml +++ b/gsl/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco gsl-platform - 2.7-1.5.11-SNAPSHOT + 2.8-1.5.11-SNAPSHOT diff --git a/gsl/src/gen/java/org/bytedeco/gsl/Ainvx_int_gsl_vector_Pointer.java b/gsl/src/gen/java/org/bytedeco/gsl/Ainvx_int_gsl_vector_Pointer.java index 4de2da63700..8c97597b1ac 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/Ainvx_int_gsl_vector_Pointer.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/Ainvx_int_gsl_vector_Pointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_const_view.java index 4b346ed70d5..ea246449772 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_view.java index 2cad6480f0c..f7161cb851b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_const_view.java index aed6fc05fea..8232e440ef3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_const_view.java index 2b7c8d16eed..66f8c8234cc 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_view.java index 245a7fa5635..668bafe727b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_view.java index 7dac829cedd..8061950a164 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_const_view.java index c2b5f97a8c9..3ddff4d1434 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_const_view.java index 775a592b5b2..8bb9c1133db 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_view.java index b076e1cd4a3..c74e3eb407c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_const_view.java index c436f6aebf0..a6c65af200d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_view.java index 823ddb826d0..db37fee1646 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_const_view.java index e97abe2bac4..5d01481366a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_view.java index a311aa6f0fe..7b185d79ba4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_const_view.java index 81a92ebc6b0..d46079f852e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_view.java index b4c6b175d80..21ab15c705e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_const_view.java index c05b7228828..eed6687b9d5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_view.java index 31061148531..97436e02fe5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_const_view.java index 4089426ade8..348027023a4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_view.java index 808df88c341..8505e4fc74b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_const_view.java index 9520dde0983..e475689ddba 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_view.java index e74b7b72fa1..10c16e752f1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_const_view.java index 8b14a667e81..0c8a4cd2492 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_view.java index 1c97cbfcc4a..7ea763d2c08 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_view.java index 5c4412effe7..00d5a712cc6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_const_view.java index 8fbb70e7104..ee57cd75419 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_view.java index 3bc5b711040..1d05c8b496c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_const_view.java index ba830c8e9af..fd1abf7a185 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_const_view.java index 238e2cd7e64..54467074c74 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_view.java index d2eff541e4c..a44bc8c3a13 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_view.java index 9d675395bab..b55cdf36aab 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_const_view.java index 9534c6045c1..647c4d4d1f3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_const_view.java index e67659877be..aac5fe64b5d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_view.java index 40592acf3dc..806d0ea9cea 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_const_view.java index 66ad06169d9..0482530522e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_view.java index 71333f79789..fd49ac63bae 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_const_view.java index 03c26f81047..ab42a4633cc 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_view.java index 946cbbd0fbb..0bd1f270e6b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_const_view.java index 1c98567ebd4..0c5ce4dd777 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_view.java index 52d1d587fe2..7b5a3f8385c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_const_view.java index 4a8886e7e3c..34b81c654c2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_view.java index 0626ea28907..24e082a34aa 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_const_view.java index 6ca5d9e1d8a..7b1b298b339 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_view.java index 6a79a69473c..649e753666f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_const_view.java index d9c0cf7cfb9..367ecae4397 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_view.java index cca9d02c5ed..9c114a67817 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_const_view.java index a474478f144..c9a03c5ad86 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_const_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_view.java index be6c5e36765..5b962cc6d22 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_view.java index 1039c433bd3..dce95fe24e1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_view.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/global/gsl.java b/gsl/src/gen/java/org/bytedeco/gsl/global/gsl.java index 400532b2c9a..cbb860f473b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/global/gsl.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/global/gsl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl.global; @@ -1557,9 +1557,9 @@ public static native void gsl_test_str(String result, String expected, // #endif -public static final String GSL_VERSION = "2.7"; +public static final String GSL_VERSION = "2.8"; public static final int GSL_MAJOR_VERSION = 2; -public static final int GSL_MINOR_VERSION = 7; +public static final int GSL_MINOR_VERSION = 8; public static native @Cast("const char*") BytePointer gsl_version(); public static native void gsl_version(BytePointer setter); @@ -2585,6 +2585,7 @@ public static native int gsl_vector_complex_fprintf(FILE stream, String format); public static native int gsl_vector_complex_memcpy(gsl_vector_complex dest, @Const gsl_vector_complex src); +public static native int gsl_vector_complex_conj_memcpy(gsl_vector_complex dest, @Const gsl_vector_complex src); public static native int gsl_vector_complex_reverse(gsl_vector_complex v); @@ -2607,6 +2608,8 @@ public static native int gsl_vector_complex_equal(@Const gsl_vector_complex u, public static native int gsl_vector_complex_add_constant(gsl_vector_complex a, @Const @ByVal gsl_complex x); public static native int gsl_vector_complex_axpby(@Const @ByVal gsl_complex alpha, @Const gsl_vector_complex x, @Const @ByVal gsl_complex beta, gsl_vector_complex y); +public static native int gsl_vector_complex_div_real(gsl_vector_complex a, @Const gsl_vector b); + /* */ public static native @ByVal gsl_complex gsl_vector_complex_get(@Const gsl_vector_complex v, @Cast("const size_t") long i); /* */ public static native void gsl_vector_complex_set(gsl_vector_complex v, @Cast("const size_t") long i, @ByVal gsl_complex z); /* */ public static native gsl_complex gsl_vector_complex_ptr(gsl_vector_complex v, @Cast("const size_t") long i); @@ -2771,6 +2774,7 @@ public static native int gsl_vector_complex_float_fprintf(FILE stream, String format); public static native int gsl_vector_complex_float_memcpy(gsl_vector_complex_float dest, @Const gsl_vector_complex_float src); +public static native int gsl_vector_complex_float_conj_memcpy(gsl_vector_complex_float dest, @Const gsl_vector_complex_float src); public static native int gsl_vector_complex_float_reverse(gsl_vector_complex_float v); @@ -2793,6 +2797,8 @@ public static native int gsl_vector_complex_float_equal(@Const gsl_vector_comple public static native int gsl_vector_complex_float_add_constant(gsl_vector_complex_float a, @Const @ByVal gsl_complex_float x); public static native int gsl_vector_complex_float_axpby(@Const @ByVal gsl_complex_float alpha, @Const gsl_vector_complex_float x, @Const @ByVal gsl_complex_float beta, gsl_vector_complex_float y); +public static native int gsl_vector_complex_float_div_real(gsl_vector_complex_float a, @Const gsl_vector_float b); + /* */ public static native @ByVal gsl_complex_float gsl_vector_complex_float_get(@Const gsl_vector_complex_float v, @Cast("const size_t") long i); /* */ public static native void gsl_vector_complex_float_set(gsl_vector_complex_float v, @Cast("const size_t") long i, @ByVal gsl_complex_float z); /* */ public static native gsl_complex_float gsl_vector_complex_float_ptr(gsl_vector_complex_float v, @Cast("const size_t") long i); @@ -4797,6 +4803,7 @@ public static native gsl_vector_complex gsl_vector_complex_alloc_col_from_matrix public static native int gsl_matrix_complex_scale_columns(gsl_matrix_complex a, @Const gsl_vector_complex x); public static native int gsl_matrix_complex_add_constant(gsl_matrix_complex a, @Const @ByVal gsl_complex x); public static native int gsl_matrix_complex_add_diagonal(gsl_matrix_complex a, @Const @ByVal gsl_complex x); +public static native int gsl_matrix_complex_conjugate(gsl_matrix_complex a); /***********************************************************************/ /* The functions below are obsolete */ @@ -5049,6 +5056,7 @@ public static native gsl_vector_complex_float gsl_vector_complex_float_alloc_col public static native int gsl_matrix_complex_float_scale_columns(gsl_matrix_complex_float a, @Const gsl_vector_complex_float x); public static native int gsl_matrix_complex_float_add_constant(gsl_matrix_complex_float a, @Const @ByVal gsl_complex_float x); public static native int gsl_matrix_complex_float_add_diagonal(gsl_matrix_complex_float a, @Const @ByVal gsl_complex_float x); +public static native int gsl_matrix_complex_float_conjugate(gsl_matrix_complex_float a); /***********************************************************************/ /* The functions below are obsolete */ @@ -8266,8 +8274,7 @@ public static native int gsl_blas_zher2k(@Cast("CBLAS_UPLO_t") int Uplo, /* bspline/gsl_bspline.h * - * Copyright (C) 2006 Patrick Alken - * Copyright (C) 2008 Rhys Ulerich + * Copyright (C) 2018, 2019, 2020, 2021 Patrick Alken * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8289,6 +8296,7 @@ public static native int gsl_blas_zher2k(@Cast("CBLAS_UPLO_t") int Uplo, // #include // #include +// #include // #include // #include @@ -8301,51 +8309,224 @@ public static native int gsl_blas_zher2k(@Cast("CBLAS_UPLO_t") int Uplo, +/* bspline.c */ + public static native gsl_bspline_workspace gsl_bspline_alloc(@Cast("const size_t") long k, @Cast("const size_t") long nbreak); +public static native gsl_bspline_workspace gsl_bspline_alloc_ncontrol(@Cast("const size_t") long spline_order, @Cast("const size_t") long ncontrol); + public static native void gsl_bspline_free(gsl_bspline_workspace w); -public static native @Cast("size_t") long gsl_bspline_ncoeffs(gsl_bspline_workspace w); -public static native @Cast("size_t") long gsl_bspline_order(gsl_bspline_workspace w); -public static native @Cast("size_t") long gsl_bspline_nbreak(gsl_bspline_workspace w); -public static native double gsl_bspline_breakpoint(@Cast("size_t") long i, gsl_bspline_workspace w); -public static native double gsl_bspline_greville_abscissa(@Cast("size_t") long i, gsl_bspline_workspace w); +public static native @Cast("size_t") long gsl_bspline_ncontrol(@Const gsl_bspline_workspace w); +public static native @Cast("size_t") long gsl_bspline_order(@Const gsl_bspline_workspace w); +public static native @Cast("size_t") long gsl_bspline_nbreak(@Const gsl_bspline_workspace w); +public static native double gsl_bspline_breakpoint(@Cast("const size_t") long i, @Const gsl_bspline_workspace w); +public static native double gsl_bspline_greville_abscissa(@Cast("const size_t") long i, @Const gsl_bspline_workspace w); -public static native int gsl_bspline_knots(@Const gsl_vector breakpts, gsl_bspline_workspace w); +public static native int gsl_bspline_init_augment(@Const gsl_vector breakpts, gsl_bspline_workspace w); + +public static native int gsl_bspline_init_uniform(double a, double b, gsl_bspline_workspace w); + +public static native int gsl_bspline_init_periodic(double a, double b, gsl_bspline_workspace w); + +public static native int gsl_bspline_init(@Const gsl_vector t, gsl_bspline_workspace w); + +public static native int gsl_bspline_proj_rhs(@Const gsl_function F, gsl_vector y, gsl_bspline_workspace w); + +/* */ public static native @Cast("size_t") long gsl_bspline_find_interval(double x, IntPointer flag, gsl_bspline_workspace w); +public static native @Cast("size_t") long gsl_bspline_find_interval(double x, IntBuffer flag, gsl_bspline_workspace w); +public static native @Cast("size_t") long gsl_bspline_find_interval(double x, int[] flag, gsl_bspline_workspace w); + +/* eval.c */ + +public static native int gsl_bspline_calc(double x, @Const gsl_vector c, + DoublePointer result, gsl_bspline_workspace w); +public static native int gsl_bspline_calc(double x, @Const gsl_vector c, + DoubleBuffer result, gsl_bspline_workspace w); +public static native int gsl_bspline_calc(double x, @Const gsl_vector c, + double[] result, gsl_bspline_workspace w); + +public static native int gsl_bspline_calc_deriv(double x, @Const gsl_vector c, @Cast("const size_t") long nderiv, + DoublePointer result, gsl_bspline_workspace w); +public static native int gsl_bspline_calc_deriv(double x, @Const gsl_vector c, @Cast("const size_t") long nderiv, + DoubleBuffer result, gsl_bspline_workspace w); +public static native int gsl_bspline_calc_deriv(double x, @Const gsl_vector c, @Cast("const size_t") long nderiv, + double[] result, gsl_bspline_workspace w); + +public static native int gsl_bspline_vector_calc(double x, @Const gsl_matrix c, gsl_vector result, + gsl_bspline_workspace w); + +public static native int gsl_bspline_vector_calc_deriv(double x, @Const gsl_matrix c, @Cast("const size_t") long nderiv, + gsl_vector result, gsl_bspline_workspace w); + +public static native int gsl_bspline_eval_basis(double x, gsl_vector B, gsl_bspline_workspace w); + +public static native int gsl_bspline_basis(double x, gsl_vector Bk, @Cast("size_t*") SizeTPointer istart, + gsl_bspline_workspace w); + +public static native int gsl_bspline_eval_deriv_basis(double x, @Cast("const size_t") long nderiv, + gsl_matrix dB, gsl_bspline_workspace w); + +public static native int gsl_bspline_basis_deriv(double x, @Cast("const size_t") long nderiv, + gsl_matrix dB, @Cast("size_t*") SizeTPointer istart, + gsl_bspline_workspace w); + +public static native int gsl_bspline_init_greville(@Const gsl_vector abscissae, + gsl_bspline_workspace w, + DoublePointer abserr); +public static native int gsl_bspline_init_greville(@Const gsl_vector abscissae, + gsl_bspline_workspace w, + DoubleBuffer abserr); +public static native int gsl_bspline_init_greville(@Const gsl_vector abscissae, + gsl_bspline_workspace w, + double[] abserr); + +/* gram.c */ + +public static native int gsl_bspline_gram(@Cast("const size_t") long nderiv, gsl_matrix G, gsl_bspline_workspace w); + +public static native int gsl_bspline_gram_interval(double a, double b, @Cast("const size_t") long nderiv, + gsl_matrix G, gsl_bspline_workspace w); + +public static native int gsl_bspline_oprod(@Cast("const size_t") long nderiv, double x, gsl_matrix A, gsl_bspline_workspace w); + +/* integ.c */ + +public static native int gsl_bspline_calc_integ(double a, double b, + @Const gsl_vector c, DoublePointer result, + gsl_bspline_workspace w); +public static native int gsl_bspline_calc_integ(double a, double b, + @Const gsl_vector c, DoubleBuffer result, + gsl_bspline_workspace w); +public static native int gsl_bspline_calc_integ(double a, double b, + @Const gsl_vector c, double[] result, + gsl_bspline_workspace w); + +public static native int gsl_bspline_basis_integ(double a, double b, + gsl_vector bint, gsl_bspline_workspace w); + +/* interp.c */ + +public static native int gsl_bspline_init_interp(@Const gsl_vector x, gsl_bspline_workspace w); + +public static native int gsl_bspline_init_hermite(@Cast("const size_t") long nderiv, @Const gsl_vector x, gsl_bspline_workspace w); + +public static native int gsl_bspline_col_interp(@Const gsl_vector tau, gsl_matrix XB, gsl_bspline_workspace w); + +public static native int gsl_bspline_interp_chermite(@Const gsl_vector x, @Const gsl_vector y, + @Const gsl_vector dy, gsl_vector c, + @Const gsl_bspline_workspace w); + +/* ls.c */ + +public static native int gsl_bspline_lssolve(@Const gsl_vector x, @Const gsl_vector y, gsl_vector c, + DoublePointer chisq, gsl_bspline_workspace w); +public static native int gsl_bspline_lssolve(@Const gsl_vector x, @Const gsl_vector y, gsl_vector c, + DoubleBuffer chisq, gsl_bspline_workspace w); +public static native int gsl_bspline_lssolve(@Const gsl_vector x, @Const gsl_vector y, gsl_vector c, + double[] chisq, gsl_bspline_workspace w); + +public static native int gsl_bspline_wlssolve(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_vector c, DoublePointer chisq, gsl_bspline_workspace w); +public static native int gsl_bspline_wlssolve(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_vector c, DoubleBuffer chisq, gsl_bspline_workspace w); +public static native int gsl_bspline_wlssolve(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_vector c, double[] chisq, gsl_bspline_workspace w); + +public static native int gsl_bspline_lsnormal(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_vector XTy, gsl_matrix XTX, gsl_bspline_workspace w); + +public static native int gsl_bspline_lsnormalm(@Const gsl_vector x, @Const gsl_matrix Y, @Const gsl_vector wts, + gsl_matrix XTY, gsl_matrix XTX, gsl_bspline_workspace w); + +public static native int gsl_bspline_plssolve(@Const gsl_vector x, @Const gsl_vector y, + gsl_vector c, DoublePointer chisq, gsl_bspline_workspace w); +public static native int gsl_bspline_plssolve(@Const gsl_vector x, @Const gsl_vector y, + gsl_vector c, DoubleBuffer chisq, gsl_bspline_workspace w); +public static native int gsl_bspline_plssolve(@Const gsl_vector x, @Const gsl_vector y, + gsl_vector c, double[] chisq, gsl_bspline_workspace w); + +public static native int gsl_bspline_pwlssolve(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_vector c, DoublePointer chisq, gsl_bspline_workspace w); +public static native int gsl_bspline_pwlssolve(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_vector c, DoubleBuffer chisq, gsl_bspline_workspace w); +public static native int gsl_bspline_pwlssolve(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_vector c, double[] chisq, gsl_bspline_workspace w); + +public static native int gsl_bspline_plsqr(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_matrix R, gsl_vector QTy, DoublePointer rnorm, + gsl_bspline_workspace w); +public static native int gsl_bspline_plsqr(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_matrix R, gsl_vector QTy, DoubleBuffer rnorm, + gsl_bspline_workspace w); +public static native int gsl_bspline_plsqr(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector wts, + gsl_matrix R, gsl_vector QTy, double[] rnorm, + gsl_bspline_workspace w); + +public static native int gsl_bspline_residuals(@Const gsl_vector x, @Const gsl_vector y, @Const gsl_vector c, + gsl_vector r, gsl_bspline_workspace w); + +public static native int gsl_bspline_covariance(@Const gsl_matrix XTX, gsl_matrix cov, gsl_bspline_workspace w); + +public static native int gsl_bspline_rcond(@Const gsl_matrix XTX, DoublePointer rcond, gsl_bspline_workspace w); +public static native int gsl_bspline_rcond(@Const gsl_matrix XTX, DoubleBuffer rcond, gsl_bspline_workspace w); +public static native int gsl_bspline_rcond(@Const gsl_matrix XTX, double[] rcond, gsl_bspline_workspace w); + +public static native int gsl_bspline_err(double x, @Cast("const size_t") long nderiv, + @Const gsl_matrix cov, DoublePointer err, + gsl_bspline_workspace w); +public static native int gsl_bspline_err(double x, @Cast("const size_t") long nderiv, + @Const gsl_matrix cov, DoubleBuffer err, + gsl_bspline_workspace w); +public static native int gsl_bspline_err(double x, @Cast("const size_t") long nderiv, + @Const gsl_matrix cov, double[] err, + gsl_bspline_workspace w); -public static native int gsl_bspline_knots_uniform(double a, double b, - gsl_bspline_workspace w); +/* future to be deprecated functions */ +public static native @Cast("size_t") long gsl_bspline_ncoeffs(gsl_bspline_workspace w); +public static native int gsl_bspline_knots(@Const gsl_vector breakpts, gsl_bspline_workspace w); +public static native int gsl_bspline_knots_uniform(double a, double b, gsl_bspline_workspace w); +public static native int gsl_bspline_eval(double x, gsl_vector B, gsl_bspline_workspace w); +public static native int gsl_bspline_deriv_eval(double x, @Cast("const size_t") long nderiv, + gsl_matrix dB, gsl_bspline_workspace w); public static native int gsl_bspline_knots_greville(@Const gsl_vector abscissae, - gsl_bspline_workspace w, - DoublePointer abserr); + gsl_bspline_workspace w, + DoublePointer abserr); public static native int gsl_bspline_knots_greville(@Const gsl_vector abscissae, - gsl_bspline_workspace w, - DoubleBuffer abserr); + gsl_bspline_workspace w, + DoubleBuffer abserr); public static native int gsl_bspline_knots_greville(@Const gsl_vector abscissae, - gsl_bspline_workspace w, - double[] abserr); - -public static native int gsl_bspline_eval(double x, gsl_vector B, - gsl_bspline_workspace w); - -public static native int gsl_bspline_eval_nonzero(double x, - gsl_vector Bk, - @Cast("size_t*") SizeTPointer istart, - @Cast("size_t*") SizeTPointer iend, - gsl_bspline_workspace w); - -public static native int gsl_bspline_deriv_eval(double x, - @Cast("const size_t") long nderiv, - gsl_matrix dB, - gsl_bspline_workspace w); - -public static native int gsl_bspline_deriv_eval_nonzero(double x, - @Cast("const size_t") long nderiv, - gsl_matrix dB, - @Cast("size_t*") SizeTPointer istart, - @Cast("size_t*") SizeTPointer iend, - gsl_bspline_workspace w); + gsl_bspline_workspace w, + double[] abserr); + +/* end of future to be deprecated functions */ + +// #ifdef HAVE_INLINE + +/* +gsl_bspline_find_interval() + Find knot interval such that t_i <= x < t_{i + 1} +where the t_i are knot values. The algorithm uses binary search +since the knot array is sorted ascending. + +Inputs: x - x value + flag - (output) error flag + w - bspline workspace + +Return: i (index in w->knots corresponding to left limit of interval) + +Notes: The error conditions are reported as follows: + + Condition Return value Flag + --------- ------------ ---- + x < t_0 0 -1 + t_i <= x < t_{i+1} i 0 + t_i < x = t_{i+1} = t_{n+k-1} i 0 + t_i < t_{i+1} = t_{n+k-1} < x i +1 +*/ + +// #endif /* HAVE_INLINE */ // #endif /* __GSL_BSPLINE_H__ */ @@ -10237,6 +10418,15 @@ public static native int gsl_integration_fixed(@Const gsl_function func, DoubleB @Const gsl_integration_fixed_workspace w); public static native int gsl_integration_fixed(@Const gsl_function func, double[] result, @Const gsl_integration_fixed_workspace w); +// Targeting ../gsl_integration_lebedev_workspace.java + + + +public static native gsl_integration_lebedev_workspace gsl_integration_lebedev_alloc(@Cast("const size_t") long n); + +public static native void gsl_integration_lebedev_free(gsl_integration_lebedev_workspace w); + +public static native @Cast("size_t") long gsl_integration_lebedev_n(@Const gsl_integration_lebedev_workspace w); // #endif /* __GSL_INTEGRATION_H__ */ @@ -10632,6 +10822,39 @@ public static native int gsl_linalg_SV_solve(@Const gsl_matrix U, @Const gsl_vector b, gsl_vector x); +public static native int gsl_linalg_SV_solve2(double tol, + @Const gsl_matrix U, + @Const gsl_matrix V, + @Const gsl_vector S, + @Const gsl_vector b, + gsl_vector x, + gsl_vector work); + +public static native int gsl_linalg_SV_lssolve(double lambda, + @Const gsl_matrix U, + @Const gsl_matrix V, + @Const gsl_vector S, + @Const gsl_vector b, + gsl_vector x, + DoublePointer rnorm, + gsl_vector work); +public static native int gsl_linalg_SV_lssolve(double lambda, + @Const gsl_matrix U, + @Const gsl_matrix V, + @Const gsl_vector S, + @Const gsl_vector b, + gsl_vector x, + DoubleBuffer rnorm, + gsl_vector work); +public static native int gsl_linalg_SV_lssolve(double lambda, + @Const gsl_matrix U, + @Const gsl_matrix V, + @Const gsl_vector S, + @Const gsl_vector b, + gsl_vector x, + double[] rnorm, + gsl_vector work); + public static native int gsl_linalg_SV_leverage(@Const gsl_matrix U, gsl_vector h); @@ -10741,6 +10964,9 @@ public static native int gsl_linalg_QR_lssolve(@Const gsl_matrix QR, @Const gsl_ public static native int gsl_linalg_QR_lssolve_r(@Const gsl_matrix QR, @Const gsl_matrix T, @Const gsl_vector b, gsl_vector x, gsl_vector work); +public static native int gsl_linalg_QR_lssolvem_r(@Const gsl_matrix QR, @Const gsl_matrix T, + @Const gsl_matrix B, gsl_matrix X, gsl_matrix work); + public static native int gsl_linalg_QR_QRsolve(gsl_matrix Q, gsl_matrix R, @Const gsl_vector b, gsl_vector x); public static native int gsl_linalg_QR_Rsolve(@Const gsl_matrix QR, @Const gsl_vector b, gsl_vector x); @@ -10794,11 +11020,17 @@ public static native int gsl_linalg_complex_QR_lssolve(@Const gsl_matrix_complex public static native int gsl_linalg_complex_QR_lssolve_r(@Const gsl_matrix_complex QR, @Const gsl_matrix_complex T, @Const gsl_vector_complex b, gsl_vector_complex x, gsl_vector_complex work); +public static native int gsl_linalg_complex_QR_lssolvem_r(@Const gsl_matrix_complex QR, @Const gsl_matrix_complex T, + @Const gsl_matrix_complex B, gsl_matrix_complex X, gsl_matrix_complex work); + public static native int gsl_linalg_complex_QR_QHvec(@Const gsl_matrix_complex QR, @Const gsl_vector_complex tau, gsl_vector_complex v); public static native int gsl_linalg_complex_QR_QHvec_r(@Const gsl_matrix_complex QR, @Const gsl_matrix_complex T, gsl_vector_complex b, gsl_vector_complex work); +public static native int gsl_linalg_complex_QR_QHmat_r(@Const gsl_matrix_complex QR, @Const gsl_matrix_complex T, + gsl_matrix_complex B, gsl_matrix_complex work); + public static native int gsl_linalg_complex_QR_Qvec(@Const gsl_matrix_complex QR, @Const gsl_vector_complex tau, gsl_vector_complex v); public static native int gsl_linalg_complex_QR_unpack(@Const gsl_matrix_complex QR, @Const gsl_vector_complex tau, @@ -10912,10 +11144,23 @@ public static native int gsl_linalg_QRPT_update(gsl_matrix Q, public static native int gsl_linalg_QR_UD_lssolve(@Const gsl_matrix R, @Const gsl_matrix Y, @Const gsl_matrix T, @Const gsl_vector b, gsl_vector x, gsl_vector work); +public static native int gsl_linalg_QR_UD_lssvx(@Const gsl_matrix R, @Const gsl_matrix Y, @Const gsl_matrix T, + gsl_vector x, gsl_vector work); + +public static native int gsl_linalg_QR_UD_QTvec(@Const gsl_matrix Y, @Const gsl_matrix T, gsl_vector b, gsl_vector work); + /* triangle on top of rectangle QR decomposition */ public static native int gsl_linalg_QR_UR_decomp(gsl_matrix S, gsl_matrix A, gsl_matrix T); +public static native int gsl_linalg_QR_UR_lssolve(@Const gsl_matrix R, @Const gsl_matrix Y, @Const gsl_matrix T, + @Const gsl_vector b, gsl_vector x, gsl_vector work); + +public static native int gsl_linalg_QR_UR_lssvx(@Const gsl_matrix R, @Const gsl_matrix Y, @Const gsl_matrix T, + gsl_vector x, gsl_vector work); + +public static native int gsl_linalg_QR_UR_QTvec(@Const gsl_matrix Y, @Const gsl_matrix T, gsl_vector b, gsl_vector work); + /* triangle on top of triangle QR decomposition */ public static native int gsl_linalg_QR_UU_decomp(gsl_matrix U, gsl_matrix S, gsl_matrix T); @@ -10923,6 +11168,9 @@ public static native int gsl_linalg_QR_UD_lssolve(@Const gsl_matrix R, @Const gs public static native int gsl_linalg_QR_UU_lssolve(@Const gsl_matrix R, @Const gsl_matrix Y, @Const gsl_matrix T, @Const gsl_vector b, gsl_vector x, gsl_vector work); +public static native int gsl_linalg_QR_UU_lssvx(@Const gsl_matrix R, @Const gsl_matrix Y, @Const gsl_matrix T, + gsl_vector x, gsl_vector work); + public static native int gsl_linalg_QR_UU_QTvec(@Const gsl_matrix Y, @Const gsl_matrix T, gsl_vector b, gsl_vector work); /* triangle on top of trapezoidal QR decomposition */ @@ -11115,6 +11363,17 @@ public static native int gsl_linalg_complex_cholesky_svx(@Const gsl_matrix_compl public static native int gsl_linalg_complex_cholesky_invert(gsl_matrix_complex cholesky); +public static native int gsl_linalg_complex_cholesky_scale(@Const gsl_matrix_complex A, gsl_vector S); + +public static native int gsl_linalg_complex_cholesky_scale_apply(gsl_matrix_complex A, @Const gsl_vector S); + +public static native int gsl_linalg_complex_cholesky_decomp2(gsl_matrix_complex A, gsl_vector S); + +public static native int gsl_linalg_complex_cholesky_svx2(@Const gsl_matrix_complex LLT, @Const gsl_vector S, gsl_vector_complex x); + +public static native int gsl_linalg_complex_cholesky_solve2(@Const gsl_matrix_complex LLT, @Const gsl_vector S, + @Const gsl_vector_complex b, gsl_vector_complex x); + /* Pivoted Cholesky LDLT decomposition */ public static native int gsl_linalg_pcholesky_decomp(gsl_matrix A, gsl_permutation p); @@ -12375,7 +12634,7 @@ public static native double gsl_spline_eval_integ(@Const gsl_spline spline, public static native void gsl_spline_free(gsl_spline spline); -// #endif /* __GSL_INTERP_H__ */ +// #endif /* __GSL_SPLINE_H__ */ // Parsed from gsl/gsl_sum.h @@ -12994,6 +13253,7 @@ public static native int gsl_multilarge_linear_genform2(@Const gsl_matrix LQR, public static native double gsl_rstat_variance(@Const gsl_rstat_workspace w); public static native double gsl_rstat_sd(@Const gsl_rstat_workspace w); public static native double gsl_rstat_rms(@Const gsl_rstat_workspace w); +public static native double gsl_rstat_norm(@Const gsl_rstat_workspace w); public static native double gsl_rstat_sd_mean(@Const gsl_rstat_workspace w); public static native double gsl_rstat_median(gsl_rstat_workspace w); public static native double gsl_rstat_skew(@Const gsl_rstat_workspace w); @@ -17387,6 +17647,10 @@ public static native int gsl_multifit_linear_lcurvature(@Const gsl_vector y, gsl_vector kappa, gsl_multifit_linear_workspace work); +public static native int gsl_multifit_linear_lcurvature_menger(@Const gsl_vector rho, + @Const gsl_vector eta, + gsl_vector kappa); + public static native int gsl_multifit_linear_lcorner(@Const gsl_vector rho, @Const gsl_vector eta, @Cast("size_t*") SizeTPointer idx); @@ -19841,6 +20105,7 @@ public static native int gsl_odeiv2_driver_apply_fixed_step(gsl_odeiv2_driver d, // #include // #include +// #include // #include // #include // #include diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block.java index 5af5d4921a1..1937a69159f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_char.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_char.java index 53a2503175b..6f934843c30 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_char.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_char.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex.java index a6c9495bb61..02a93dc12b7 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex_float.java index 2580608489d..dab119c3ef3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_float.java index e8cf0f9432d..671fc06e532 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_int.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_int.java index 9fa3dcf895b..3f35a3e1291 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_int.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_long.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_long.java index be46c795a98..5583a650a6e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_long.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_long.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_short.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_short.java index 87a6cd3022a..b7e772848f0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_short.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_short.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uchar.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uchar.java index 014e712b5a8..63655d0235b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uchar.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uchar.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uint.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uint.java index 9d0307b75f4..b14ffbf1b76 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uint.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uint.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ulong.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ulong.java index 09ccc3ac368..7f4d28fcdd6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ulong.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ulong.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ushort.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ushort.java index d5b7108cb66..96be1925f1c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ushort.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ushort.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bspline_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bspline_workspace.java index d2d689df7ee..f2c1eb1e5f0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bspline_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bspline_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; @@ -33,18 +33,21 @@ public class gsl_bspline_workspace extends Pointer { return new gsl_bspline_workspace((Pointer)this).offsetAddress(i); } - public native @Cast("size_t") long k(); public native gsl_bspline_workspace k(long setter); /* spline order */ - public native @Cast("size_t") long km1(); public native gsl_bspline_workspace km1(long setter); /* k - 1 (polynomial order) */ - public native @Cast("size_t") long l(); public native gsl_bspline_workspace l(long setter); /* number of polynomial pieces on interval */ - public native @Cast("size_t") long nbreak(); public native gsl_bspline_workspace nbreak(long setter); /* number of breakpoints (l + 1) */ - public native @Cast("size_t") long n(); public native gsl_bspline_workspace n(long setter); /* number of bspline basis functions (l + k - 1) */ + public native @Cast("size_t") long spline_order(); public native gsl_bspline_workspace spline_order(long setter); /* spline order */ + public native @Cast("size_t") long nbreak(); public native gsl_bspline_workspace nbreak(long setter); /* number of breakpoints */ + public native @Cast("size_t") long ncontrol(); public native gsl_bspline_workspace ncontrol(long setter); /* number of bspline control points (nbreak + spline_order - 2) */ - public native gsl_vector knots(); public native gsl_bspline_workspace knots(gsl_vector setter); /* knots vector */ - public native gsl_vector deltal(); public native gsl_bspline_workspace deltal(gsl_vector setter); /* left delta */ - public native gsl_vector deltar(); public native gsl_bspline_workspace deltar(gsl_vector setter); /* right delta */ - public native gsl_vector B(); public native gsl_bspline_workspace B(gsl_vector setter); /* temporary spline results */ + public native gsl_vector knots(); public native gsl_bspline_workspace knots(gsl_vector setter); /* knots vector, length ncontrol + spline_order */ + public native gsl_vector deltal(); public native gsl_bspline_workspace deltal(gsl_vector setter); /* left delta, length spline_order */ + public native gsl_vector deltar(); public native gsl_bspline_workspace deltar(gsl_vector setter); /* right delta, length spline_order */ + public native gsl_vector B(); public native gsl_bspline_workspace B(gsl_vector setter); /* temporary spline results, length spline_order */ + public native gsl_matrix XTX(); public native gsl_bspline_workspace XTX(gsl_matrix setter); /* stores diagonals of banded normal equations matrix, ncontrol-by-spline_order */ + public native gsl_matrix R(); public native gsl_bspline_workspace R(gsl_matrix setter); /* R factor for periodic least squares fitting, ncontrol-by-ncontrol */ + public native gsl_vector work(); public native gsl_bspline_workspace work(gsl_vector setter); /* workspace, length 3*ncontrol */ /* bspline derivative parameters */ - public native gsl_matrix A(); public native gsl_bspline_workspace A(gsl_matrix setter); /* work matrix */ - public native gsl_matrix dB(); public native gsl_bspline_workspace dB(gsl_matrix setter); /* temporary derivative results */ + public native gsl_matrix A(); public native gsl_bspline_workspace A(gsl_matrix setter); /* work matrix, spline_order-by-spline_order */ + public native gsl_matrix dB(); public native gsl_bspline_workspace dB(gsl_matrix setter); /* temporary derivative results, spline_order-by-[2*(spline_order+1)] */ + + public native @Cast("size_t") long icache(); public native gsl_bspline_workspace icache(long setter); /* cached index of current interval, in [0,n+k-2] */ } diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_allocator.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_allocator.java index 99cbe7e2a4b..9eadc8d8f5d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_allocator.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_allocator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_node.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_node.java index e4a4a5f9ce5..ea460efd267 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_node.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_node.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_table.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_table.java index 0f112af17e8..fe3ff3d0db0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_table.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_table.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_traverser.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_traverser.java index 6de54406245..bf2315f3177 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_traverser.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_avl_traverser.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_cmp_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_cmp_function.java index 6d9bb5d6cdc..52995e9256d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_cmp_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_cmp_function.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_node.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_node.java index 84b4af95ef1..76859f04768 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_node.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_node.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_table.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_table.java index 84ab0aa8a75..f351412cc15 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_table.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_table.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_traverser.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_traverser.java index fb4cbbfe093..0dabb8657a9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_traverser.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_rb_traverser.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_trav.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_trav.java index 5f22fbea2d6..87c49045dd7 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_trav.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_trav.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_type.java index 4c6ae7732ed..bd9c62dda49 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_workspace.java index 2af1b30e095..8a227651fb0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bst_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_cheb_series.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_cheb_series.java index 0aa33c87c77..69b2d5c360d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_cheb_series.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_cheb_series.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_combination.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_combination.java index 5bfbcfea751..82e52dc41f8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_combination.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_combination.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_comparison_fn_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_comparison_fn_t.java index f9c17149148..c41ed4adfdc 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_comparison_fn_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_comparison_fn_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex.java index e474a6cb785..8ca2b4f01cc 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_float.java index da2e6f8aef8..6d6c1805bee 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_long_double.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_long_double.java index cd647cb0072..abe09edc127 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_long_double.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_long_double.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_dht.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_dht.java index 8b558416d8f..2a5d2f9c7d0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_dht.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_dht.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_francis_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_francis_workspace.java index 3298af03e52..9f4260aa9d2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_francis_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_francis_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gen_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gen_workspace.java index 1cbdac15bd9..7158cbd29a3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gen_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gen_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genherm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genherm_workspace.java index a3817d01d47..ceb903ff968 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genherm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genherm_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genhermv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genhermv_workspace.java index 2f6b94eb51c..f5ea515144d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genhermv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genhermv_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymm_workspace.java index 64ab9351844..06213be33e9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymm_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymmv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymmv_workspace.java index f77a54cb20e..068f2800091 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymmv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymmv_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genv_workspace.java index e8467e46d4c..ce84a5647c1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genv_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_herm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_herm_workspace.java index fc817894212..a4db83aa80f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_herm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_herm_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_hermv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_hermv_workspace.java index 146524501eb..c789e47fd34 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_hermv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_hermv_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymm_workspace.java index 1903a26a949..50ae759d62a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymm_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymmv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymmv_workspace.java index 31c617a0d60..f444d692f9a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymmv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymmv_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symm_workspace.java index 635399fa1f9..4080f2b2aaa 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symm_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symmv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symmv_workspace.java index aa6c7427de7..5abbdaa0a6a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symmv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symmv_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_error_handler_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_error_handler_t.java index 0a7cb279056..fe19716b112 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_error_handler_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_error_handler_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable.java index 1bdca3fe9a7..76b0cb76ab7 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable_float.java index ba3558e9894..52631c06b5a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace.java index 2b4ed6f4aee..363f2a0e146 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace_float.java index f1f61510fdc..4d014e11fa0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable.java index 52254f59dc9..cbc88b9915c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable_float.java index 0edb00e43ae..721410243a5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable.java index b2f130331a1..c3bb5ab2472 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable_float.java index 38fbf2a01cb..aded1f83057 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace.java index 16a9b457722..82f83b366e8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace_float.java index 41f199a0e69..ca6ca776d3e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function.java index a1d4da19be3..ec029c995fb 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_fdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_fdf.java index 92032996ec8..c7301dadb5f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_fdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_fdf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_vec.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_vec.java index ef70b359b07..82598575c95 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_vec.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_vec.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram.java index f4ee8f1cad0..1e26ed12623 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d.java index 7cb9ecf14f9..44376ee58b3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d_pdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d_pdf.java index e9e7caf9ac5..ac09bd0acf8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d_pdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d_pdf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram_pdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram_pdf.java index a1f36026d1d..68c6eae56f9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram_pdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram_pdf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_double_rep.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_double_rep.java index b1f9e753a71..ce621692b8b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_double_rep.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_double_rep.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_float_rep.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_float_rep.java index ba011734dc8..c3c989b5ecf 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_float_rep.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_float_rep.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_ival.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_ival.java index b36bba5230e..995b968b45c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_ival.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_ival.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_workspace.java index 1713ed4ba4d..bb34914aac2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_params.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_params.java index cdddf53d5ef..495dd29f6ae 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_params.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_params.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_type.java index 369c986302e..b0260c47048 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_workspace.java index 9cb3fb26fc8..e690c8c193f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_glfixed_table.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_glfixed_table.java index 855632d14aa..1e19019d1af 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_glfixed_table.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_glfixed_table.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_lebedev_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_lebedev_workspace.java new file mode 100644 index 00000000000..51897c1a2a5 --- /dev/null +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_lebedev_workspace.java @@ -0,0 +1,43 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.gsl; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; + +import static org.bytedeco.gsl.global.gsl.*; + + +/* Lebedev quadrature */ + +@Properties(inherit = org.bytedeco.gsl.presets.gsl.class) +public class gsl_integration_lebedev_workspace extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public gsl_integration_lebedev_workspace() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public gsl_integration_lebedev_workspace(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public gsl_integration_lebedev_workspace(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public gsl_integration_lebedev_workspace position(long position) { + return (gsl_integration_lebedev_workspace)super.position(position); + } + @Override public gsl_integration_lebedev_workspace getPointer(long i) { + return new gsl_integration_lebedev_workspace((Pointer)this).offsetAddress(i); + } + + public native @Cast("size_t") long n(); public native gsl_integration_lebedev_workspace n(long setter); /* number of nodes/weights */ + public native DoublePointer weights(); public native gsl_integration_lebedev_workspace weights(DoublePointer setter); /* quadrature weights */ + public native DoublePointer x(); public native gsl_integration_lebedev_workspace x(DoublePointer setter); /* x quadrature nodes */ + public native DoublePointer y(); public native gsl_integration_lebedev_workspace y(DoublePointer setter); /* y quadrature nodes */ + public native DoublePointer z(); public native gsl_integration_lebedev_workspace z(DoublePointer setter); /* z quadrature nodes */ + public native DoublePointer theta(); public native gsl_integration_lebedev_workspace theta(DoublePointer setter); /* theta quadrature nodes */ + public native DoublePointer phi(); public native gsl_integration_lebedev_workspace phi(DoublePointer setter); /* phi quadrature nodes */ +} diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qawo_table.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qawo_table.java index b3421dfd5f3..14a4e97855e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qawo_table.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qawo_table.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qaws_table.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qaws_table.java index fb2d5298645..17cbfd0fc9e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qaws_table.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qaws_table.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_romberg_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_romberg_workspace.java index fea7d4b9f84..caf42c4719b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_romberg_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_romberg_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_rule.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_rule.java index 6c6c988299f..c4628d85876 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_rule.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_rule.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_workspace.java index 15ae2d82df7..c4da8cec899 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp.java index 2948092072e..650766f7145 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d.java index 790e62d01c9..203f8ceadb9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d_type.java index b7c62988433..72564507e31 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_accel.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_accel.java index 4ea9359c35e..e1442901f44 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_accel.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_accel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_type.java index dd3b23274a0..38f53c3c2b5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix.java index 1bd6ba253fa..550984c3bb7 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_char.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_char.java index c6b69da7eaf..a1bff7ae05d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_char.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_char.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex.java index 7e60663c897..6e6da04fdea 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex_float.java index e42a6598e48..8cca9f9eea7 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_float.java index c1c2785eece..aacfdb62728 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_int.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_int.java index faa246f46d1..f5e21346c93 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_int.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_long.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_long.java index 4ca4e90beec..25c348d56f8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_long.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_long.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_short.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_short.java index 7807e790889..41290d0055b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_short.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_short.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uchar.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uchar.java index 6611dda2810..638901f924c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uchar.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uchar.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uint.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uint.java index 7060d0e03a6..c0f0c502076 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uint.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uint.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ulong.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ulong.java index 6d111ef05c2..e7652d2f692 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ulong.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ulong.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ushort.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ushort.java index 071bf1c2143..4d4407537ce 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ushort.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ushort.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_bracketing_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_bracketing_function.java index 62c94f21652..95bbbcf0b98 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_bracketing_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_bracketing_function.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer.java index 8be7a244e03..633cb3fcf31 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer_type.java index 8b2db9c4bb6..fd340973477 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_function.java index 00f52ca0e23..7e57fc1b27b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_function.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_params.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_params.java index a4b71fe845e..59a8e83024e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_params.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_params.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_state.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_state.java index 0b9383fbe69..9d04ef27d1a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_state.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_state.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_plain_state.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_plain_state.java index f3fda695cc6..838edba125e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_plain_state.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_plain_state.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_params.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_params.java index 4c0aaa5c67e..5aed41a627a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_params.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_params.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_state.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_state.java index 908ddbacf0b..164d2faffef 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_state.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_state.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfridge.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfridge.java index 1d843349bee..4d4e7fc81c8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfridge.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfridge.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver.java index 94848afbf2a..003d1c9b3e8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver_type.java index 5ecc06e8a0f..945d5e087d2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver.java index 27f9134e721..ceab3114f67 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver_type.java index c25356c27f0..2323f1fc003 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function.java index 7f6135d0376..6851ece5297 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function_fdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function_fdf.java index 9c52502c6cc..fe185fd8df4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function_fdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function_fdf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_linear_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_linear_workspace.java index 3cb23d7bd01..ae1bfff4060 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_linear_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_linear_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_stats.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_stats.java index 379f973352e..0bfc4dba124 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_stats.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_stats.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_type.java index 9da93b8860f..ba9f71615e3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_workspace.java index 0ddbb5591c6..80402dea5c3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_type.java index f007c7829ce..80c74bb4ed2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_workspace.java index b02c03de476..ecc9ccc3039 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer.java index b7ac91f76f0..15afb0b4258 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer_type.java index b2bf3a4e92e..33813b1c770 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer.java index 6356099e3b2..143dfa89d54 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer_type.java index cadc3c18b4a..0bbe9d9eb9c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function.java index cb0ba2acfa6..031f651ccc6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function_fdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function_fdf.java index 87e9fa83d28..4be92d01e72 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function_fdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function_fdf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver.java index a9851c279a7..fd277e612c4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver_type.java index 11ea2e54e22..ac0ee85986d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver.java index 79bfa2c19ae..f5bb64e7a12 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver_type.java index 4a7bb85c714..0375eb8457a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function.java index 30472fd0cc6..6395186d63d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function_fdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function_fdf.java index c2a17fa0223..6fdd230f6f7 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function_fdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function_fdf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiset.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiset.java index 2d29069d61b..7ca1ec9d742 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiset.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiset.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple.java index 11bc84e4220..864fb6a8254 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_select_fn.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_select_fn.java index ebe28bf7f13..4badee265b1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_select_fn.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_select_fn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_value_fn.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_value_fn.java index b8c772f10a1..1cfddc26ab5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_value_fn.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_value_fn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control.java index 18827da1eec..616a3b38902 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control_type.java index 35866ec18ef..b9dcfd981e4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_driver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_driver.java index fdb000e3fe5..8d5c61bfed5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_driver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_driver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_evolve.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_evolve.java index af466d73a47..9e2b2362ff9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_evolve.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_evolve.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step.java index 37216719635..07494a3f69c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step_type.java index 53082d52cfd..d12a617b718 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_system.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_system.java index f7a11200bc7..7568b47543b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_system.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_system.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control.java index bb966d2c987..d95775ba8c5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control_type.java index 17fae1ef832..63eca906cfd 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_evolve.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_evolve.java index 4a0fb2470e6..a6dfe77c57e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_evolve.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_evolve.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step.java index f228649d1c5..eeca2f9b81c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step_type.java index 1954f351291..860d7f731d2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_system.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_system.java index a1900448abf..c93342eda2a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_system.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_system.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_permutation.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_permutation.java index f09061ebb49..b9fa7332af6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_permutation.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_permutation.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_poly_complex_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_poly_complex_workspace.java index febb877f280..1b594958627 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_poly_complex_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_poly_complex_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng.java index 0bc849c2599..d80892ad529 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng_type.java index 93ecaf120be..e2f9c30c17a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ran_discrete_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ran_discrete_t.java index c227a03f7e1..9af445dd257 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ran_discrete_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ran_discrete_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng.java index 047a337e89f..12dd3dbb3a8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng_type.java index 9617d1debf8..4a8c71d606c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver.java index 87cd21b09e1..cd8719004f9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver_type.java index fbbd5fc3213..d1a9c767174 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver.java index d670f3def76..d7b01ac1317 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver_type.java index 6f6de4f899a..5b4fff88332 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_quantile_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_quantile_workspace.java index 6fb45ac07b3..3ca426a9fa1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_quantile_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_quantile_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_workspace.java index af1035ee4f1..638a0710de6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_mathieu_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_mathieu_workspace.java index c1464cd9791..a35d1554311 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_mathieu_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_mathieu_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result.java index 3b9019d63e2..f89eeccf4a0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result_e10.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result_e10.java index bc0aab3d6bf..0b5ae7fea63 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result_e10.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result_e10.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_Efunc_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_Efunc_t.java index 02b104a3e64..b0d0df2d912 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_Efunc_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_Efunc_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_construct_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_construct_t.java index b870be22da6..ee95fcd120a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_construct_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_construct_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_t.java index 72a119fc768..3291fb190e8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_destroy_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_destroy_t.java index 2ef7089e75d..c11bdc64982 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_destroy_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_destroy_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_metric_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_metric_t.java index 4b98b38f785..4b2b7439b34 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_metric_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_metric_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_params_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_params_t.java index c9f5c533acf..be752094fe3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_params_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_params_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_print_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_print_t.java index b9daec424fe..01a65dc0786 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_print_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_print_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_step_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_step_t.java index fe23ddc0894..a348ccd41ae 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_step_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_step_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve.java index 73c43cef31c..fb270adf59a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve_type.java index fe872b7e7f4..63f87847d24 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline.java index c9dcb35332b..1722b40bd01 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline2d.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline2d.java index fdf6a73277b..1deeb1a4443 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline2d.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix.java index 826e2f34d3f..48712a97ed2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_char.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_char.java index d611b69c7af..c7001b71960 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_char.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_char.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_complex.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_complex.java index d3d68b8082c..431b2603580 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_complex.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_complex.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_complex_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_complex_float.java index 35f7b597411..c615abac162 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_complex_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_complex_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_float.java index 0697b15d81a..62e469adc4c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_int.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_int.java index 8df54098e17..37b3dc27d1e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_int.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_long.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_long.java index 7560912b6c0..221bd8a68db 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_long.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_long.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_pool.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_pool.java index c428a5fa3eb..4aae487ca63 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_pool.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_pool.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_pool_node.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_pool_node.java index 82196ae22e9..a13c0a526d6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_pool_node.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_pool_node.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_short.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_short.java index 024878f8af2..c8946163337 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_short.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_short.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_uchar.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_uchar.java index 1760c555898..4bf0fe17481 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_uchar.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_uchar.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_uint.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_uint.java index 2c308076da4..ad8e27bf9b1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_uint.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_uint.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_ulong.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_ulong.java index 233b0b3393b..9d0fb8289bb 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_ulong.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_ulong.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_ushort.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_ushort.java index d401fb45156..abb557194ca 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_ushort.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_ushort.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_stream_handler_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_stream_handler_t.java index 0b62af7fd58..fa9538c7dda 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_stream_handler_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_stream_handler_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_u_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_u_workspace.java index d31dabae604..96f3a199111 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_u_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_u_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_utrunc_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_utrunc_workspace.java index a62fbe30913..52100e7b722 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_utrunc_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_utrunc_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector.java index cdb30d5407e..880b5bd7c71 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_char.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_char.java index 02a5bcf5489..7d62b913e2d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_char.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_char.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex.java index e57c76ecb8e..e8bcd07f782 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex_float.java index 862a3228fa8..d1821be3ba8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_float.java index 8f7e9e6e2c3..beb60c225dd 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_float.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_int.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_int.java index e2e01eade86..7ee84825230 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_int.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_long.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_long.java index 3bfbb335760..5f0e2ef20bb 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_long.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_long.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_short.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_short.java index ba28b0e301f..3e4c9493373 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_short.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_short.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uchar.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uchar.java index b44ef08068c..e5edc2fe6d0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uchar.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uchar.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uint.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uint.java index 0e7d17f67a1..3f9f391f71e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uint.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uint.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ulong.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ulong.java index 369a13bea2c..05acb6d9879 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ulong.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ulong.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ushort.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ushort.java index 47710450706..00e571a1e1d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ushort.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ushort.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet.java index 4e9cf5cfae8..d2f07826ca4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_type.java index f69a295e3ad..021403cbf3d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_type.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_workspace.java index 83d39eeb402..3481299d74a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_workspace.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.gsl; diff --git a/llvm/README.md b/llvm/README.md index 748bfbd62d2..e3a23b8694c 100644 --- a/llvm/README.md +++ b/llvm/README.md @@ -61,6 +61,8 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic ### The `Factorial.java` source file +This example is based on MCJIT. There is a newer alternative called ORC. You can find an example using ORC [here](samples/llvm/OrcJit.java). + ```java import org.bytedeco.javacpp.*; import org.bytedeco.llvm.LLVM.*; @@ -73,11 +75,8 @@ public class Factorial { public static void main(String[] args) { // Stage 1: Initialize LLVM components - LLVMInitializeCore(LLVMGetGlobalPassRegistry()); - LLVMLinkInMCJIT(); - LLVMInitializeNativeAsmPrinter(); - LLVMInitializeNativeAsmParser(); LLVMInitializeNativeTarget(); + LLVMInitializeNativeAsmPrinter(); // Stage 2: Build the factorial function. LLVMContextRef context = LLVMContextCreate(); @@ -119,6 +118,9 @@ public class Factorial { LLVMAddIncoming(phi, phiValues, phiBlocks, /* pairCount */ 2); LLVMBuildRet(builder, phi); + // Print generated LLVM-IR to console (optional) + LLVMDumpModule(module); + // Stage 3: Verify the module using LLVMVerifier if (LLVMVerifyModule(module, LLVMPrintMessageAction, error) != 0) { LLVMDisposeMessage(error); @@ -127,11 +129,7 @@ public class Factorial { // Stage 4: Create a pass pipeline using the legacy pass manager LLVMPassManagerRef pm = LLVMCreatePassManager(); - LLVMAddAggressiveInstCombinerPass(pm); - LLVMAddNewGVNPass(pm); - LLVMAddCFGSimplificationPass(pm); LLVMRunPassManager(pm, module); - LLVMDumpModule(module); // Stage 5: Execute the code using MCJIT LLVMExecutionEngineRef engine = new LLVMExecutionEngineRef(); @@ -145,8 +143,8 @@ public class Factorial { LLVMGenericValueRef argument = LLVMCreateGenericValueOfInt(i32Type, 10, /* signExtend */ 0); LLVMGenericValueRef result = LLVMRunFunction(engine, factorial, /* argumentCount */ 1, argument); System.out.println(); - System.out.println("; Running factorial(10) with MCJIT..."); - System.out.println("; Result: " + LLVMGenericValueToInt(result, /* signExtend */ 0)); + System.out.println("Running factorial(10) with MCJIT..."); + System.out.println("Result: " + LLVMGenericValueToInt(result, /* signExtend */ 0)); // Stage 6: Dispose of the allocated resources LLVMDisposeExecutionEngine(engine); diff --git a/llvm/samples/llvm/EmitBitcode.java b/llvm/samples/llvm/EmitBitcode.java index b308e8d4260..0386e0017de 100644 --- a/llvm/samples/llvm/EmitBitcode.java +++ b/llvm/samples/llvm/EmitBitcode.java @@ -45,7 +45,7 @@ *

* The EvaluateBitcode sample depends on EmitBitcodeAndRelocatableObject *

- * The samples should be ran in declaration order, meaning EmitBitcodeAndRelocatableObject + * The samples should be called in declaration order, meaning EmitBitcodeAndRelocatableObject * should run before EvaluateBitcode. */ public class EmitBitcode { @@ -54,7 +54,7 @@ public class EmitBitcode { /** * Sample for generating both LLVM bitcode and relocatable object file from an LLVM module *

- * The generated module (and objec file) will have a single sum function, which returns + * The generated module (and object file) will have a single 'sum' function, which returns * the sum of two integers. *

* declare i32 @sum(i32 %lhs, i32 %rhs) @@ -69,11 +69,8 @@ public class EmitBitcode { */ public static void EmitBitcodeAndRelocatableObject() { // Stage 1: Initialize LLVM components -// LLVMInitializeCore(LLVMGetGlobalPassRegistry()); - LLVMInitializeNativeAsmPrinter(); - LLVMInitializeNativeAsmParser(); - LLVMInitializeNativeDisassembler(); LLVMInitializeNativeTarget(); + LLVMInitializeNativeAsmPrinter(); // Stage 2: Build the sum function LLVMContextRef context = LLVMContextCreate(); @@ -143,10 +140,10 @@ public static void EmitBitcodeAndRelocatableObject() { /** * Sample code for importing a LLVM bitcode file and running a function - * inside of the imported module + * from the imported module *

- * This sample depends on EmitBitcode to produce the bitcode file. Make sure - * you've ran the EmitBitcode sample and have the 'sum.bc' bitcode file. + * This sample depends on EmitBitcodeAndRelocatableObject to produce the bitcode file. + * Make sure you ran the EmitBitcodeAndRelocatableObject sample and have the 'sum.bc' bitcode file. *

* This sample contains code for the following steps: *

@@ -157,9 +154,6 @@ public static void EmitBitcodeAndRelocatableObject() { */ public static void EvaluateBitcode() { // Stage 1: Initialize LLVM components -// LLVMInitializeCore(LLVMGetGlobalPassRegistry()); - LLVMInitializeNativeAsmPrinter(); - LLVMInitializeNativeAsmParser(); LLVMInitializeNativeTarget(); // Stage 2: Load and parse bitcode @@ -210,8 +204,6 @@ public static void main(String[] args) { case "-evaluate": EvaluateBitcode(); System.exit(0); - default: - // Display help } System.err.println("Pass `-emit` or `-evaluate`."); System.exit(1); diff --git a/llvm/samples/llvm/Factorial.java b/llvm/samples/llvm/MCJIT.java similarity index 91% rename from llvm/samples/llvm/Factorial.java rename to llvm/samples/llvm/MCJIT.java index f0a9e62c0db..c4f315c2700 100644 --- a/llvm/samples/llvm/Factorial.java +++ b/llvm/samples/llvm/MCJIT.java @@ -54,17 +54,14 @@ *

* TODO(supergrecko): Replace with new Pass Manager for LLVM 13 */ -public class Factorial { - // a 'char *' used to retrieve error messages from LLVM +public class MCJIT { + // A 'char *' used to retrieve error messages from LLVM private static final BytePointer error = new BytePointer(); public static void main(String[] args) { // Stage 1: Initialize LLVM components -// LLVMInitializeCore(LLVMGetGlobalPassRegistry()); - LLVMLinkInMCJIT(); - LLVMInitializeNativeAsmPrinter(); - LLVMInitializeNativeAsmParser(); LLVMInitializeNativeTarget(); + LLVMInitializeNativeAsmPrinter(); // Stage 2: Build the factorial function. LLVMContextRef context = LLVMContextCreate(); @@ -106,7 +103,10 @@ public static void main(String[] args) { LLVMAddIncoming(phi, phiValues, phiBlocks, /* pairCount */ 2); LLVMBuildRet(builder, phi); - // Stage 3: Verify the module using LLVMVerifier + // Print generated LLVM-IR to console (optional) + LLVMDumpModule(module); + + // Stage 3: Verify the module (optional; recommended) if (LLVMVerifyModule(module, LLVMPrintMessageAction, error) != 0) { LLVMDisposeMessage(error); return; @@ -114,11 +114,7 @@ public static void main(String[] args) { // Stage 4: Create a pass pipeline using the legacy pass manager LLVMPassManagerRef pm = LLVMCreatePassManager(); -// LLVMAddAggressiveInstCombinerPass(pm); -// LLVMAddNewGVNPass(pm); -// LLVMAddCFGSimplificationPass(pm); LLVMRunPassManager(pm, module); - LLVMDumpModule(module); // Stage 5: Execute the code using MCJIT LLVMExecutionEngineRef engine = new LLVMExecutionEngineRef(); @@ -132,8 +128,8 @@ public static void main(String[] args) { LLVMGenericValueRef argument = LLVMCreateGenericValueOfInt(i32Type, 10, /* signExtend */ 0); LLVMGenericValueRef result = LLVMRunFunction(engine, factorial, /* argumentCount */ 1, argument); System.out.println(); - System.out.println("; Running factorial(10) with MCJIT..."); - System.out.println("; Result: " + LLVMGenericValueToInt(result, /* signExtend */ 0)); + System.out.println("Running factorial(10) with MCJIT..."); + System.out.println("Result: " + LLVMGenericValueToInt(result, /* signExtend */ 0)); // Stage 6: Dispose of the allocated resources LLVMDisposeExecutionEngine(engine); diff --git a/llvm/samples/llvm/OrcJit.java b/llvm/samples/llvm/OrcJit.java index bb64d360444..c79da1bee6f 100644 --- a/llvm/samples/llvm/OrcJit.java +++ b/llvm/samples/llvm/OrcJit.java @@ -21,12 +21,11 @@ */ import org.bytedeco.javacpp.IntPointer; -import org.bytedeco.javacpp.Loader; +import org.bytedeco.javacpp.BytePointer; import org.bytedeco.javacpp.LongPointer; import org.bytedeco.javacpp.Pointer; import org.bytedeco.javacpp.PointerPointer; import org.bytedeco.libffi.ffi_cif; -import org.bytedeco.llvm.global.LLVM; import org.bytedeco.llvm.LLVM.LLVMBasicBlockRef; import org.bytedeco.llvm.LLVM.LLVMBuilderRef; import org.bytedeco.llvm.LLVM.LLVMContextRef; @@ -50,16 +49,15 @@ *

* 1. Initializing required LLVM components * 2. Generating LLVM IR for a sum function - * 3. Load the module into OrcJIT and get the address of "sum" - * 4. Call the sum function with libffi - * 5. Dispose of the allocated resources + * 3. Verify the module + * 4. Load the module into OrcJIT and get the address of "sum" + * 5. Call the sum function with libffi + * 6. Dispose of the allocated resources */ public class OrcJit { - public static LLVMErrorRef err = null; public static void main(String[] args) { // Stage 1: Initialize LLVM components -// LLVMInitializeCore(LLVMGetGlobalPassRegistry()); LLVMInitializeNativeTarget(); LLVMInitializeNativeAsmPrinter(); @@ -86,54 +84,65 @@ public static void main(String[] args) { LLVMValueRef result = LLVMBuildAdd(builder, lhs, rhs, "result = lhs + rhs"); LLVMBuildRet(builder, result); + // Print generated LLVM-IR to console (optional) LLVMDumpModule(module); - LLVMOrcThreadSafeModuleRef threadModule = LLVMOrcCreateNewThreadSafeModule(module, threadContext); - // Stage 3: Execute using OrcJIT + // Stage 3: Verify the module (optional; recommended) + BytePointer errorMessageVariable = new BytePointer(); + if (LLVMVerifyModule(module, LLVMPrintMessageAction, errorMessageVariable) != 0) { + LLVMDisposeMessage(errorMessageVariable); + return; + } + + // Stage 4: Execute using OrcJIT LLVMOrcLLJITRef jit = new LLVMOrcLLJITRef(); LLVMOrcLLJITBuilderRef jitBuilder = LLVMOrcCreateLLJITBuilder(); - Loader.loadGlobal(Loader.load(LLVM.class)); - if ((err = LLVMOrcCreateLLJIT(jit, jitBuilder)) != null) { - System.err.println("Failed to create LLJIT: " + LLVMGetErrorMessage(err).getString()); - LLVMConsumeError(err); + LLVMErrorRef error; + if ((error = LLVMOrcCreateLLJIT(jit, jitBuilder)) != null) { + BytePointer errorMessage = LLVMGetErrorMessage(error); + System.err.println("Failed to create LLJIT: " + errorMessage.getString()); + LLVMDisposeErrorMessage(errorMessage); return; } LLVMOrcJITDylibRef mainDylib = LLVMOrcLLJITGetMainJITDylib(jit); - if ((err = LLVMOrcLLJITAddLLVMIRModule(jit, mainDylib, threadModule)) != null) { - System.err.println("Failed to add LLVM IR module: " + LLVMGetErrorMessage(err).getString()); - LLVMConsumeError(err); + LLVMOrcThreadSafeModuleRef threadModule = LLVMOrcCreateNewThreadSafeModule(module, threadContext); + if ((error = LLVMOrcLLJITAddLLVMIRModule(jit, mainDylib, threadModule)) != null) { + BytePointer errorMessage = LLVMGetErrorMessage(error); + System.err.println("Failed to add LLVM IR module: " + errorMessage.getString()); + LLVMDisposeErrorMessage(errorMessage); return; } final LongPointer res = new LongPointer(1); - if ((err = LLVMOrcLLJITLookup(jit, res, "sum")) != null) { - System.err.println("Failed to look up 'sum' symbol: " + LLVMGetErrorMessage(err).getString()); - LLVMConsumeError(err); + if ((error = LLVMOrcLLJITLookup(jit, res, "sum")) != null) { + BytePointer errorMessage = LLVMGetErrorMessage(error); + System.err.println("Failed to look up 'sum' symbol: " + errorMessage.getString()); + LLVMDisposeErrorMessage(errorMessage); return; } - // Stage 4: Call the function with libffi - ffi_cif cif = new ffi_cif(); + // Stage 5: Call the function with libffi + ffi_cif callInterface = new ffi_cif(); PointerPointer arguments = new PointerPointer<>(2) .put(0, ffi_type_sint()) .put(1, ffi_type_sint()); PointerPointer values = new PointerPointer<>(2) .put(0, new IntPointer(1).put(42)) .put(1, new IntPointer(1).put(30)); - IntPointer returns = new IntPointer(1); + IntPointer resultVariable = new IntPointer(1); - if (ffi_prep_cif(cif, FFI_DEFAULT_ABI(), 2, ffi_type_sint(), arguments) != FFI_OK) { - System.err.println("Failed to prepare the libffi cif"); + if (ffi_prep_cif(callInterface, FFI_DEFAULT_ABI(), 2, ffi_type_sint(), arguments) != FFI_OK) { + System.err.println("Failed to prepare the libffi call interface"); return; } Pointer function = new Pointer() {{ address = res.get(); }}; - ffi_call(cif, function, returns, values); - System.out.println("Evaluating sum(42, 30) through OrcJIT results in: " + returns.get()); + ffi_call(callInterface, function, resultVariable, values); + System.out.println("Evaluating sum(42, 30) through OrcJIT results in: " + resultVariable.get()); - // Stage 5: Dispose of the allocated resources + // Stage 6: Dispose of the allocated resources LLVMOrcDisposeLLJIT(jit); LLVMShutdown(); } diff --git a/llvm/samples/llvm/pom.xml b/llvm/samples/llvm/pom.xml index f6855de73ad..d465c9d2e0a 100644 --- a/llvm/samples/llvm/pom.xml +++ b/llvm/samples/llvm/pom.xml @@ -4,7 +4,7 @@ samples 1.5.11-SNAPSHOT - Factorial + MCJIT 1.7 1.7 @@ -47,7 +47,7 @@ factorial - Factorial + MCJIT diff --git a/numpy/README.md b/numpy/README.md index e8ea6a752fd..6b990c7753a 100644 --- a/numpy/README.md +++ b/numpy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * NumPy 1.26.4 http://www.numpy.org/ + * NumPy 2.0.0 http://www.numpy.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.26.4-1.5.11-SNAPSHOT + 2.0.0-1.5.11-SNAPSHOT diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh index 67cbc742194..1b3080f843b 100755 --- a/numpy/cppbuild.sh +++ b/numpy/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -NUMPY_VERSION=1.26.4 +NUMPY_VERSION=2.0.0 download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz mkdir -p $PLATFORM @@ -57,18 +57,6 @@ sedinplace "/lapack_dep = dependency(.*)/c\\ lapack_dep = blas\\ " numpy/meson.build -sedinplace '/_distributor_init_local/d' numpy/meson.build - -# https://github.com/scipy/scipy/issues/13072 -sedinplace 's/for lib in libraries:/for lib in libraries[:]:/g' ./numpy/distutils/command/build_ext.py - -# https://github.com/numpy/numpy/pull/20354 -sedinplace 's/auto x/double x/g' numpy/core/setup.py - -sedinplace '/import numpy.distutils.command.sdist/i\ -import setuptools\ -' setup.py - echo "[openblas]" > site.cfg echo "libraries = openblas" >> site.cfg echo "library_dirs = $OPENBLAS_PATH/lib/" >> site.cfg diff --git a/numpy/platform/pom.xml b/numpy/platform/pom.xml index 2bbeb23a56e..be9433fb78e 100644 --- a/numpy/platform/pom.xml +++ b/numpy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 1.26.4-${project.parent.version} + 2.0.0-${project.parent.version} JavaCPP Presets Platform for NumPy @@ -28,7 +28,7 @@ org.bytedeco cpython-platform - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} ${project.groupId} @@ -41,12 +41,12 @@ - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-arm64} - + + + + + + @@ -141,7 +141,7 @@ module org.bytedeco.${javacpp.moduleId}.platform { // requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; - requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; +// requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; // requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; // requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; diff --git a/numpy/pom.xml b/numpy/pom.xml index 9ccbfb9fb92..a83dc3a79f8 100644 --- a/numpy/pom.xml +++ b/numpy/pom.xml @@ -11,7 +11,7 @@ org.bytedeco numpy - 1.26.4-${project.parent.version} + 2.0.0-${project.parent.version} JavaCPP Presets for NumPy @@ -23,7 +23,7 @@ org.bytedeco cpython - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} org.bytedeco @@ -51,7 +51,7 @@ org.bytedeco cpython - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} org.bytedeco @@ -62,7 +62,7 @@ org.bytedeco cpython - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} ${javacpp.platform} @@ -81,14 +81,14 @@ ${basedir}/../cpython/target/classes/org/bytedeco/cpython/include/ ${basedir}/../cpython/cppbuild/${javacpp.platform}/include/ ${basedir}/../cpython/cppbuild/${javacpp.platform}/include/python3.12/ - ${basedir}/cppbuild/${javacpp.platform}/python/numpy/core/include/ - ${basedir}/cppbuild/${javacpp.platform}/python/numpy/core/include/numpy/ + ${basedir}/cppbuild/${javacpp.platform}/python/numpy/_core/include/ + ${basedir}/cppbuild/${javacpp.platform}/python/numpy/_core/include/numpy/ ${basedir}/../openblas/cppbuild/${javacpp.platform}/lib/ ${basedir}/../cpython/cppbuild/${javacpp.platform}/lib/ ${basedir}/../cpython/cppbuild/${javacpp.platform}/libs/ - ${basedir}/cppbuild/${javacpp.platform}/python/numpy/core/lib/ + ${basedir}/cppbuild/${javacpp.platform}/python/numpy/_core/lib/ ${basedir}/../openblas/cppbuild/${javacpp.platform}/bin/ @@ -171,7 +171,7 @@ org.bytedeco cpython - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} ${os.name}-${os.arch} diff --git a/numpy/samples/pom.xml b/numpy/samples/pom.xml index ad26beafbc0..cfeb40f12d0 100644 --- a/numpy/samples/pom.xml +++ b/numpy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 1.26.4-1.5.11-SNAPSHOT + 2.0.0-1.5.11-SNAPSHOT diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastPutmaskFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_CommonDType.java similarity index 67% rename from numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastPutmaskFunc.java rename to numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_CommonDType.java index 40a945007ad..684ae218296 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastPutmaskFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_CommonDType.java @@ -15,12 +15,12 @@ import static org.bytedeco.numpy.global.numpy.*; @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) -public class PyArray_FastPutmaskFunc extends FunctionPointer { +public class PyArrayDTypeMeta_CommonDType extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PyArray_FastPutmaskFunc(Pointer p) { super(p); } - protected PyArray_FastPutmaskFunc() { allocate(); } + public PyArrayDTypeMeta_CommonDType(Pointer p) { super(p); } + protected PyArrayDTypeMeta_CommonDType() { allocate(); } private native void allocate(); - public native void call(Pointer in, Pointer mask, @Cast("npy_intp") long n_in, - Pointer values, @Cast("npy_intp") long nv); + public native PyArray_DTypeMeta call( + PyArray_DTypeMeta dtype1, PyArray_DTypeMeta dtype2); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastClipFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_CommonInstance.java similarity index 69% rename from numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastClipFunc.java rename to numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_CommonInstance.java index b90a4d32f08..e75d0e00e3d 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastClipFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_CommonInstance.java @@ -15,13 +15,14 @@ import static org.bytedeco.numpy.global.numpy.*; + @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) -public class PyArray_FastClipFunc extends FunctionPointer { +public class PyArrayDTypeMeta_CommonInstance extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PyArray_FastClipFunc(Pointer p) { super(p); } - protected PyArray_FastClipFunc() { allocate(); } + public PyArrayDTypeMeta_CommonInstance(Pointer p) { super(p); } + protected PyArrayDTypeMeta_CommonInstance() { allocate(); } private native void allocate(); - public native void call(Pointer in, @Cast("npy_intp") long n_in, Pointer min, - Pointer max, Pointer out); + public native PyArray_Descr call( + PyArray_Descr dtype1, PyArray_Descr dtype2); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_PartitionFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_DefaultDescriptor.java similarity index 61% rename from numpy/src/gen/java/org/bytedeco/numpy/PyArray_PartitionFunc.java rename to numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_DefaultDescriptor.java index 8d816e45510..ed81577f45d 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_PartitionFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_DefaultDescriptor.java @@ -14,14 +14,13 @@ import static org.bytedeco.numpy.global.numpy.*; + @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) -public class PyArray_PartitionFunc extends FunctionPointer { +public class PyArrayDTypeMeta_DefaultDescriptor extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PyArray_PartitionFunc(Pointer p) { super(p); } - protected PyArray_PartitionFunc() { allocate(); } + public PyArrayDTypeMeta_DefaultDescriptor(Pointer p) { super(p); } + protected PyArrayDTypeMeta_DefaultDescriptor() { allocate(); } private native void allocate(); - public native int call(Pointer arg0, @Cast("npy_intp") long arg1, @Cast("npy_intp") long arg2, - @Cast("npy_intp*") SizeTPointer arg3, @Cast("npy_intp*") SizeTPointer arg4, - Pointer arg5); + public native PyArray_Descr call(PyArray_DTypeMeta cls); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyDataMem_EventHookFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_DiscoverDescrFromPyobject.java similarity index 60% rename from numpy/src/gen/java/org/bytedeco/numpy/PyDataMem_EventHookFunc.java rename to numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_DiscoverDescrFromPyobject.java index f27d0e87e04..1a0e155a1a5 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyDataMem_EventHookFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_DiscoverDescrFromPyobject.java @@ -15,17 +15,14 @@ import static org.bytedeco.numpy.global.numpy.*; -/* - * This is a function for hooking into the PyDataMem_NEW/FREE/RENEW functions. - * See the documentation for PyDataMem_SetEventHook. - */ + @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) -public class PyDataMem_EventHookFunc extends FunctionPointer { +public class PyArrayDTypeMeta_DiscoverDescrFromPyobject extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PyDataMem_EventHookFunc(Pointer p) { super(p); } - protected PyDataMem_EventHookFunc() { allocate(); } + public PyArrayDTypeMeta_DiscoverDescrFromPyobject(Pointer p) { super(p); } + protected PyArrayDTypeMeta_DiscoverDescrFromPyobject() { allocate(); } private native void allocate(); - public native void call(Pointer inp, Pointer outp, @Cast("size_t") long size, - Pointer user_data); + public native PyArray_Descr call( + PyArray_DTypeMeta cls, PyObject obj); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_EnsureCanonical.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_EnsureCanonical.java new file mode 100644 index 00000000000..6f8a808d93e --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_EnsureCanonical.java @@ -0,0 +1,25 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayDTypeMeta_EnsureCanonical extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayDTypeMeta_EnsureCanonical(Pointer p) { super(p); } + protected PyArrayDTypeMeta_EnsureCanonical() { allocate(); } + private native void allocate(); + public native PyArray_Descr call(PyArray_Descr dtype); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastTakeFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_FinalizeDescriptor.java similarity index 51% rename from numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastTakeFunc.java rename to numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_FinalizeDescriptor.java index 5461e6769cc..059ab4693be 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastTakeFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_FinalizeDescriptor.java @@ -14,15 +14,19 @@ import static org.bytedeco.numpy.global.numpy.*; +/* + * Returns either a new reference to *dtype* or a new descriptor instance + * initialized with the same parameters as *dtype*. The caller cannot know + * which choice a dtype will make. This function is called just before the + * array buffer is created for a newly created array, it is not called for + * views and the descriptor returned by this function is attached to the array. + */ @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) -public class PyArray_FastTakeFunc extends FunctionPointer { +public class PyArrayDTypeMeta_FinalizeDescriptor extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PyArray_FastTakeFunc(Pointer p) { super(p); } - protected PyArray_FastTakeFunc() { allocate(); } + public PyArrayDTypeMeta_FinalizeDescriptor(Pointer p) { super(p); } + protected PyArrayDTypeMeta_FinalizeDescriptor() { allocate(); } private native void allocate(); - public native int call(Pointer dest, Pointer src, @Cast("npy_intp*") SizeTPointer indarray, - @Cast("npy_intp") long nindarray, @Cast("npy_intp") long n_outer, - @Cast("npy_intp") long m_middle, @Cast("npy_intp") long nelem, - @Cast("NPY_CLIPMODE") int clipmode); + public native PyArray_Descr call(PyArray_Descr dtype); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_GetItem.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_GetItem.java new file mode 100644 index 00000000000..138711fefa0 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_GetItem.java @@ -0,0 +1,25 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayDTypeMeta_GetItem extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayDTypeMeta_GetItem(Pointer p) { super(p); } + protected PyArrayDTypeMeta_GetItem() { allocate(); } + private native void allocate(); + public native PyObject call(PyArray_Descr arg0, @Cast("char*") BytePointer arg1); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_IsKnownScalarType.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_IsKnownScalarType.java new file mode 100644 index 00000000000..4e369738d5b --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_IsKnownScalarType.java @@ -0,0 +1,33 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +/* + * Before making this public, we should decide whether it should pass + * the type, or allow looking at the object. A possible use-case: + * `np.array(np.array([0]), dtype=np.ndarray)` + * Could consider arrays that are not `dtype=ndarray` "scalars". + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayDTypeMeta_IsKnownScalarType extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayDTypeMeta_IsKnownScalarType(Pointer p) { super(p); } + protected PyArrayDTypeMeta_IsKnownScalarType() { allocate(); } + private native void allocate(); + public native int call( + PyArray_DTypeMeta cls, PyTypeObject obj); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_SetItem.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_SetItem.java new file mode 100644 index 00000000000..b4651b21576 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_SetItem.java @@ -0,0 +1,33 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +/* + * TODO: These two functions are currently only used for experimental DType + * API support. Their relation should be "reversed": NumPy should + * always use them internally. + * There are open points about "casting safety" though, e.g. setting + * elements is currently always unsafe. + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayDTypeMeta_SetItem extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayDTypeMeta_SetItem(Pointer p) { super(p); } + protected PyArrayDTypeMeta_SetItem() { allocate(); } + private native void allocate(); + public native int call(PyArray_Descr arg0, PyObject arg1, @Cast("char*") BytePointer arg2); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_Spec.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_Spec.java new file mode 100644 index 00000000000..6f6bb269a46 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayDTypeMeta_Spec.java @@ -0,0 +1,46 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + +// TODO: These slots probably still need some thought, and/or a way to "grow"? +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayDTypeMeta_Spec extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public PyArrayDTypeMeta_Spec() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public PyArrayDTypeMeta_Spec(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayDTypeMeta_Spec(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public PyArrayDTypeMeta_Spec position(long position) { + return (PyArrayDTypeMeta_Spec)super.position(position); + } + @Override public PyArrayDTypeMeta_Spec getPointer(long i) { + return new PyArrayDTypeMeta_Spec((Pointer)this).offsetAddress(i); + } + + public native PyTypeObject typeobj(); public native PyArrayDTypeMeta_Spec typeobj(PyTypeObject setter); /* type of python scalar or NULL */ + public native int flags(); public native PyArrayDTypeMeta_Spec flags(int setter); /* flags, including parametric and abstract */ + /* NULL terminated cast definitions. Use NULL for the newly created DType */ + public native PyArrayMethod_Spec casts(int i); public native PyArrayDTypeMeta_Spec casts(int i, PyArrayMethod_Spec setter); + public native @Cast("PyArrayMethod_Spec**") PointerPointer casts(); public native PyArrayDTypeMeta_Spec casts(PointerPointer setter); + public native PyType_Slot slots(); public native PyArrayDTypeMeta_Spec slots(PyType_Slot setter); + /* Baseclass or NULL (will always subclass `np.dtype`) */ + public native PyTypeObject baseclass(); public native PyArrayDTypeMeta_Spec baseclass(PyTypeObject setter); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayFlagsObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayFlagsObject.java deleted file mode 100644 index 8d6d67c5bee..00000000000 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayFlagsObject.java +++ /dev/null @@ -1,54 +0,0 @@ -// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.numpy; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; -import org.bytedeco.cpython.*; -import static org.bytedeco.cpython.global.python.*; - -import static org.bytedeco.numpy.global.numpy.*; - -// #endif - -/* - * Removed 2020-Nov-25, NumPy 1.20 - * #define NPY_SIZEOF_PYARRAYOBJECT (sizeof(PyArrayObject_fields)) - * - * The above macro was removed as it gave a false sense of a stable ABI - * with respect to the structures size. If you require a runtime constant, - * you can use `PyArray_Type.tp_basicsize` instead. Otherwise, please - * see the PyArrayObject documentation or ask the NumPy developers for - * information on how to correctly replace the macro in a way that is - * compatible with multiple NumPy versions. - */ - - -/* Array Flags Object */ -@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) -public class PyArrayFlagsObject extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public PyArrayFlagsObject() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public PyArrayFlagsObject(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PyArrayFlagsObject(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public PyArrayFlagsObject position(long position) { - return (PyArrayFlagsObject)super.position(position); - } - @Override public PyArrayFlagsObject getPointer(long i) { - return new PyArrayFlagsObject((Pointer)this).offsetAddress(i); - } - - public native @ByRef PyObject ob_base(); public native PyArrayFlagsObject ob_base(PyObject setter); - public native PyObject arr(); public native PyArrayFlagsObject arr(PyObject setter); - public native int flags(); public native PyArrayFlagsObject flags(int setter); -} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMapIterObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMapIterObject.java deleted file mode 100644 index 903be57f0cd..00000000000 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMapIterObject.java +++ /dev/null @@ -1,130 +0,0 @@ -// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.numpy; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; -import org.bytedeco.cpython.*; -import static org.bytedeco.cpython.global.python.*; - -import static org.bytedeco.numpy.global.numpy.*; - - -/* - * Store the information needed for fancy-indexing over an array. The - * fields are slightly unordered to keep consec, dataptr and subspace - * where they were originally. - */ -@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) -public class PyArrayMapIterObject extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public PyArrayMapIterObject() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public PyArrayMapIterObject(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PyArrayMapIterObject(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public PyArrayMapIterObject position(long position) { - return (PyArrayMapIterObject)super.position(position); - } - @Override public PyArrayMapIterObject getPointer(long i) { - return new PyArrayMapIterObject((Pointer)this).offsetAddress(i); - } - - public native @ByRef PyObject ob_base(); public native PyArrayMapIterObject ob_base(PyObject setter); - /* - * Multi-iterator portion --- needs to be present in this - * order to work with PyArray_Broadcast - */ - - public native int numiter(); public native PyArrayMapIterObject numiter(int setter); /* number of index-array - iterators */ - public native @Cast("npy_intp") long size(); public native PyArrayMapIterObject size(long setter); /* size of broadcasted - result */ - public native @Cast("npy_intp") long index(); public native PyArrayMapIterObject index(long setter); /* current index */ - public native int nd(); public native PyArrayMapIterObject nd(int setter); /* number of dims */ - public native @Cast("npy_intp") long dimensions(int i); public native PyArrayMapIterObject dimensions(int i, long setter); - @MemberGetter public native @Cast("npy_intp*") SizeTPointer dimensions(); /* dimensions */ - public native NpyIter outer(); public native PyArrayMapIterObject outer(NpyIter setter); /* index objects - iterator */ - public native Pointer unused(int i); public native PyArrayMapIterObject unused(int i, Pointer setter); - @MemberGetter public native @Cast("void**") PointerPointer unused(); - public native PyArrayObject array(); public native PyArrayMapIterObject array(PyArrayObject setter); - /* Flat iterator for the indexed array. For compatibility solely. */ - public native PyArrayIterObject ait(); public native PyArrayMapIterObject ait(PyArrayIterObject setter); - - /* - * Subspace array. For binary compatibility (was an iterator, - * but only the check for NULL should be used). - */ - public native PyArrayObject subspace(); public native PyArrayMapIterObject subspace(PyArrayObject setter); - - /* - * if subspace iteration, then this is the array of axes in - * the underlying array represented by the index objects - */ - public native int iteraxes(int i); public native PyArrayMapIterObject iteraxes(int i, int setter); - @MemberGetter public native IntPointer iteraxes(); - public native @Cast("npy_intp") long fancy_strides(int i); public native PyArrayMapIterObject fancy_strides(int i, long setter); - @MemberGetter public native @Cast("npy_intp*") SizeTPointer fancy_strides(); - - /* pointer when all fancy indices are 0 */ - public native @Cast("char*") BytePointer baseoffset(); public native PyArrayMapIterObject baseoffset(BytePointer setter); - - /* - * after binding consec denotes at which axis the fancy axes - * are inserted. - */ - public native int consec(); public native PyArrayMapIterObject consec(int setter); - public native @Cast("char*") BytePointer dataptr(); public native PyArrayMapIterObject dataptr(BytePointer setter); - - public native int nd_fancy(); public native PyArrayMapIterObject nd_fancy(int setter); - public native @Cast("npy_intp") long fancy_dims(int i); public native PyArrayMapIterObject fancy_dims(int i, long setter); - @MemberGetter public native @Cast("npy_intp*") SizeTPointer fancy_dims(); - - /* - * Whether the iterator (any of the iterators) requires API. This is - * unused by NumPy itself; ArrayMethod flags are more precise. - */ - public native int needs_api(); public native PyArrayMapIterObject needs_api(int setter); - - /* - * Extra op information. - */ - public native PyArrayObject extra_op(); public native PyArrayMapIterObject extra_op(PyArrayObject setter); - public native PyArray_Descr extra_op_dtype(); public native PyArrayMapIterObject extra_op_dtype(PyArray_Descr setter); /* desired dtype */ - public native @Cast("npy_uint32*") IntPointer extra_op_flags(); public native PyArrayMapIterObject extra_op_flags(IntPointer setter); /* Iterator flags */ - - public native NpyIter extra_op_iter(); public native PyArrayMapIterObject extra_op_iter(NpyIter setter); - public native NpyIter_IterNextFunc extra_op_next(); public native PyArrayMapIterObject extra_op_next(NpyIter_IterNextFunc setter); - public native @Cast("char*") BytePointer extra_op_ptrs(int i); public native PyArrayMapIterObject extra_op_ptrs(int i, BytePointer setter); - public native @Cast("char**") PointerPointer extra_op_ptrs(); public native PyArrayMapIterObject extra_op_ptrs(PointerPointer setter); - - /* - * Information about the iteration state. - */ - public native NpyIter_IterNextFunc outer_next(); public native PyArrayMapIterObject outer_next(NpyIter_IterNextFunc setter); - public native @Cast("char*") BytePointer outer_ptrs(int i); public native PyArrayMapIterObject outer_ptrs(int i, BytePointer setter); - public native @Cast("char**") PointerPointer outer_ptrs(); public native PyArrayMapIterObject outer_ptrs(PointerPointer setter); - public native @Cast("npy_intp*") SizeTPointer outer_strides(); public native PyArrayMapIterObject outer_strides(SizeTPointer setter); - - /* - * Information about the subspace iterator. - */ - public native NpyIter subspace_iter(); public native PyArrayMapIterObject subspace_iter(NpyIter setter); - public native NpyIter_IterNextFunc subspace_next(); public native PyArrayMapIterObject subspace_next(NpyIter_IterNextFunc setter); - public native @Cast("char*") BytePointer subspace_ptrs(int i); public native PyArrayMapIterObject subspace_ptrs(int i, BytePointer setter); - public native @Cast("char**") PointerPointer subspace_ptrs(); public native PyArrayMapIterObject subspace_ptrs(PointerPointer setter); - public native @Cast("npy_intp*") SizeTPointer subspace_strides(); public native PyArrayMapIterObject subspace_strides(SizeTPointer setter); - - /* Count for the external loop (which ever it is) for API iteration */ - public native @Cast("npy_intp") long iter_count(); public native PyArrayMapIterObject iter_count(long setter); - -} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethodObject_tag.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethodObject_tag.java new file mode 100644 index 00000000000..ae4c2e93622 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethodObject_tag.java @@ -0,0 +1,24 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +@Opaque @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethodObject_tag extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public PyArrayMethodObject_tag() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethodObject_tag(Pointer p) { super(p); } +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_Context.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_Context.java new file mode 100644 index 00000000000..5deae5c9187 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_Context.java @@ -0,0 +1,46 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_Context extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public PyArrayMethod_Context() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public PyArrayMethod_Context(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_Context(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public PyArrayMethod_Context position(long position) { + return (PyArrayMethod_Context)super.position(position); + } + @Override public PyArrayMethod_Context getPointer(long i) { + return new PyArrayMethod_Context((Pointer)this).offsetAddress(i); + } + + /* The caller, which is typically the original ufunc. May be NULL */ + public native PyObject caller(); public native PyArrayMethod_Context caller(PyObject setter); + /* The method "self". Currently an opaque object. */ + public native PyArrayMethodObject_tag method(); public native PyArrayMethod_Context method(PyArrayMethodObject_tag setter); + + /* Operand descriptors, filled in by resolve_descriptors */ + @MemberGetter public native PyArray_Descr descriptors(int i); + @MemberGetter public native @Cast("PyArray_Descr*const*") PointerPointer descriptors(); + /* Structure may grow (this is harmless for DType authors) */ +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgPartitionFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_GetLoop.java similarity index 57% rename from numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgPartitionFunc.java rename to numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_GetLoop.java index 81cdce63372..30016409c9b 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgPartitionFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_GetLoop.java @@ -14,14 +14,20 @@ import static org.bytedeco.numpy.global.numpy.*; + + @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) -public class PyArray_ArgPartitionFunc extends FunctionPointer { +public class PyArrayMethod_GetLoop extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PyArray_ArgPartitionFunc(Pointer p) { super(p); } - protected PyArray_ArgPartitionFunc() { allocate(); } + public PyArrayMethod_GetLoop(Pointer p) { super(p); } + protected PyArrayMethod_GetLoop() { allocate(); } private native void allocate(); - public native int call(Pointer arg0, @Cast("npy_intp*") SizeTPointer arg1, @Cast("npy_intp") long arg2, @Cast("npy_intp") long arg3, - @Cast("npy_intp*") SizeTPointer arg4, @Cast("npy_intp*") SizeTPointer arg5, - Pointer arg6); + public native int call( + PyArrayMethod_Context context, + int aligned, int move_references, + @Cast("const npy_intp*") SizeTPointer strides, + @Cast("PyArrayMethod_StridedLoop**") PointerPointer out_loop, + @Cast("NpyAuxData**") PointerPointer out_transferdata, + @Cast("NPY_ARRAYMETHOD_FLAGS*") IntPointer flags); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_GetReductionInitial.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_GetReductionInitial.java new file mode 100644 index 00000000000..fb559408fe4 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_GetReductionInitial.java @@ -0,0 +1,48 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +/** + * Query an ArrayMethod for the initial value for use in reduction. + * + * @param context The arraymethod context, mainly to access the descriptors. + * @param reduction_is_empty Whether the reduction is empty. When it is, the + * value returned may differ. In this case it is a "default" value that + * may differ from the "identity" value normally used. For example: + * - {@code 0.0} is the default for {@code sum([])}. But {@code -0.0} is the correct + * identity otherwise as it preserves the sign for {@code sum([-0.0])}. + * - We use no identity for object, but return the default of {@code 0} and {@code 1} + * for the empty {@code sum([], dtype=object)} and {@code prod([], dtype=object)}. + * This allows {@code np.sum(np.array(["a", "b"], dtype=object))} to work. + * - {@code -inf} or {@code INT_MIN} for {@code max} is an identity, but at least {@code INT_MIN} + * not a good *default* when there are no items. + * @param initial Pointer to initial data to be filled (if possible) + * + * @return -1, 0, or 1 indicating error, no initial value, and initial being + * successfully filled. Errors must not be given where 0 is correct, NumPy + * may call this even when not strictly necessary. + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_GetReductionInitial extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_GetReductionInitial(Pointer p) { super(p); } + protected PyArrayMethod_GetReductionInitial() { allocate(); } + private native void allocate(); + public native int call( + PyArrayMethod_Context context, @Cast("npy_bool") byte reduction_is_empty, + Pointer initial); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_GetTraverseLoop.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_GetTraverseLoop.java new file mode 100644 index 00000000000..08da4d2aef1 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_GetTraverseLoop.java @@ -0,0 +1,40 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + +/* + * Simplified get_loop function specific to dtype traversal + * + * It should set the flags needed for the traversal loop and set out_loop to the + * loop function, which must be a valid PyArrayMethod_TraverseLoop + * pointer. Currently this is used for zero-filling and clearing arrays storing + * embedded references. + * + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_GetTraverseLoop extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_GetTraverseLoop(Pointer p) { super(p); } + protected PyArrayMethod_GetTraverseLoop() { allocate(); } + private native void allocate(); + public native int call( + Pointer traverse_context, @Const PyArray_Descr descr, + int aligned, @Cast("npy_intp") long fixed_stride, + @Cast("PyArrayMethod_TraverseLoop**") PointerPointer out_loop, @Cast("NpyAuxData**") PointerPointer out_auxdata, + @Cast("NPY_ARRAYMETHOD_FLAGS*") IntPointer flags); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_PromoterFunction.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_PromoterFunction.java new file mode 100644 index 00000000000..f555a3cdec0 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_PromoterFunction.java @@ -0,0 +1,39 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + +/* + * Type of the C promoter function, which must be wrapped into a + * PyCapsule with name "numpy._ufunc_promoter". + * + * Note that currently the output dtypes are always NULL unless they are + * also part of the signature. This is an implementation detail and could + * change in the future. However, in general promoters should not have a + * need for output dtypes. + * (There are potential use-cases, these are currently unsupported.) + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_PromoterFunction extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_PromoterFunction(Pointer p) { super(p); } + protected PyArrayMethod_PromoterFunction() { allocate(); } + private native void allocate(); + public native int call(PyObject ufunc, + @Cast("PyArray_DTypeMeta*const*") PointerPointer op_dtypes, @Cast("PyArray_DTypeMeta*const*") PointerPointer signature, + @Cast("PyArray_DTypeMeta**") PointerPointer new_op_dtypes); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_ResolveDescriptors.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_ResolveDescriptors.java new file mode 100644 index 00000000000..97bdaba4285 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_ResolveDescriptors.java @@ -0,0 +1,42 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + +/* + * The resolve descriptors function, must be able to handle NULL values for + * all output (but not input) `given_descrs` and fill `loop_descrs`. + * Return -1 on error or 0 if the operation is not possible without an error + * set. (This may still be in flux.) + * Otherwise must return the "casting safety", for normal functions, this is + * almost always "safe" (or even "equivalent"?). + * + * `resolve_descriptors` is optional if all output DTypes are non-parametric. + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_ResolveDescriptors extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_ResolveDescriptors(Pointer p) { super(p); } + protected PyArrayMethod_ResolveDescriptors() { allocate(); } + private native void allocate(); + public native @Cast("NPY_CASTING") int call( + PyArrayMethodObject_tag method, + @Cast("PyArray_DTypeMeta*const*") PointerPointer dtypes, + @Cast("PyArray_Descr*const*") PointerPointer given_descrs, + @Cast("PyArray_Descr**") PointerPointer loop_descrs, + @Cast("npy_intp*") SizeTPointer view_offset); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_ResolveDescriptorsWithScalar.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_ResolveDescriptorsWithScalar.java new file mode 100644 index 00000000000..3f939c76311 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_ResolveDescriptorsWithScalar.java @@ -0,0 +1,41 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + +/* + * Rarely needed, slightly more powerful version of `resolve_descriptors`. + * See also `PyArrayMethod_ResolveDescriptors` for details on shared arguments. + * + * NOTE: This function is private now as it is unclear how and what to pass + * exactly as additional information to allow dealing with the scalars. + * See also gh-24915. + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_ResolveDescriptorsWithScalar extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_ResolveDescriptorsWithScalar(Pointer p) { super(p); } + protected PyArrayMethod_ResolveDescriptorsWithScalar() { allocate(); } + private native void allocate(); + public native @Cast("NPY_CASTING") int call( + PyArrayMethodObject_tag method, + @Cast("PyArray_DTypeMeta*const*") PointerPointer dtypes, + @Cast("PyArray_Descr*const*") PointerPointer given_descrs, + @Cast("PyObject*const*") PointerPointer input_scalars, + @Cast("PyArray_Descr**") PointerPointer loop_descrs, + @Cast("npy_intp*") SizeTPointer view_offset); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_Spec.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_Spec.java new file mode 100644 index 00000000000..302a2e89842 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_Spec.java @@ -0,0 +1,49 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + +/* + * The main object for creating a new ArrayMethod. We use the typical `slots` + * mechanism used by the Python limited API (see below for the slot defs). + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_Spec extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public PyArrayMethod_Spec() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public PyArrayMethod_Spec(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_Spec(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public PyArrayMethod_Spec position(long position) { + return (PyArrayMethod_Spec)super.position(position); + } + @Override public PyArrayMethod_Spec getPointer(long i) { + return new PyArrayMethod_Spec((Pointer)this).offsetAddress(i); + } + + public native @Cast("const char*") BytePointer name(); public native PyArrayMethod_Spec name(BytePointer setter); + public native int nin(); public native PyArrayMethod_Spec nin(int setter); + public native int nout(); public native PyArrayMethod_Spec nout(int setter); + public native @Cast("NPY_CASTING") int casting(); public native PyArrayMethod_Spec casting(int setter); + public native @Cast("NPY_ARRAYMETHOD_FLAGS") int flags(); public native PyArrayMethod_Spec flags(int setter); + public native PyArray_DTypeMeta dtypes(int i); public native PyArrayMethod_Spec dtypes(int i, PyArray_DTypeMeta setter); + public native @Cast("PyArray_DTypeMeta**") PointerPointer dtypes(); public native PyArrayMethod_Spec dtypes(PointerPointer setter); + public native PyType_Slot slots(); public native PyArrayMethod_Spec slots(PyType_Slot setter); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_StridedLoop.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_StridedLoop.java new file mode 100644 index 00000000000..b3441224f22 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_StridedLoop.java @@ -0,0 +1,30 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + + +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_StridedLoop extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_StridedLoop(Pointer p) { super(p); } + protected PyArrayMethod_StridedLoop() { allocate(); } + private native void allocate(); + public native int call(PyArrayMethod_Context context, + @Cast("char*const*") PointerPointer data, @Cast("const npy_intp*") SizeTPointer dimensions, @Cast("const npy_intp*") SizeTPointer strides, + NpyAuxData transferdata); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_TranslateGivenDescriptors.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_TranslateGivenDescriptors.java new file mode 100644 index 00000000000..a998ba7a2fa --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_TranslateGivenDescriptors.java @@ -0,0 +1,54 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +/* + * The following functions are only used by the wrapping array method defined + * in umath/wrapping_array_method.c + */ + + +/* + * The function to convert the given descriptors (passed in to + * `resolve_descriptors`) and translates them for the wrapped loop. + * The new descriptors MUST be viewable with the old ones, `NULL` must be + * supported (for outputs) and should normally be forwarded. + * + * The function must clean up on error. + * + * NOTE: We currently assume that this translation gives "viewable" results. + * I.e. there is no additional casting related to the wrapping process. + * In principle that could be supported, but not sure it is useful. + * This currently also means that e.g. alignment must apply identically + * to the new dtypes. + * + * TODO: Due to the fact that `resolve_descriptors` is also used for `can_cast` + * there is no way to "pass out" the result of this function. This means + * it will be called twice for every ufunc call. + * (I am considering including `auxdata` as an "optional" parameter to + * `resolve_descriptors`, so that it can be filled there if not NULL.) + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_TranslateGivenDescriptors extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_TranslateGivenDescriptors(Pointer p) { super(p); } + protected PyArrayMethod_TranslateGivenDescriptors() { allocate(); } + private native void allocate(); + public native int call(int nin, int nout, + @Cast("PyArray_DTypeMeta*const*") PointerPointer wrapped_dtypes, + @Cast("PyArray_Descr*const*") PointerPointer given_descrs, @Cast("PyArray_Descr**") PointerPointer new_descrs); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_TranslateLoopDescriptors.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_TranslateLoopDescriptors.java new file mode 100644 index 00000000000..3e2e1c38187 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_TranslateLoopDescriptors.java @@ -0,0 +1,46 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +/** + * The function to convert the actual loop descriptors (as returned by the + * original {@code resolve_descriptors} function) to the ones the output array + * should use. + * This function must return "viewable" types, it must not mutate them in any + * form that would break the inner-loop logic. Does not need to support NULL. + * + * The function must clean up on error. + * + * @param nargs Number of arguments + * @param new_dtypes The DTypes of the output (usually probably not needed) + * @param given_descrs Original given_descrs to the resolver, necessary to + * fetch any information related to the new dtypes from the original. + * @param original_descrs The {@code loop_descrs} returned by the wrapped loop. + * @param loop_descrs The output descriptors, compatible to {@code original_descrs}. + * + * @return 0 on success, -1 on failure. + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_TranslateLoopDescriptors extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_TranslateLoopDescriptors(Pointer p) { super(p); } + protected PyArrayMethod_TranslateLoopDescriptors() { allocate(); } + private native void allocate(); + public native int call(int nin, int nout, + @Cast("PyArray_DTypeMeta*const*") PointerPointer new_dtypes, @Cast("PyArray_Descr*const*") PointerPointer given_descrs, + @Cast("PyArray_Descr**") PointerPointer original_descrs, @Cast("PyArray_Descr**") PointerPointer loop_descrs); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_TraverseLoop.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_TraverseLoop.java new file mode 100644 index 00000000000..73f81c4eda1 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMethod_TraverseLoop.java @@ -0,0 +1,49 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + + +/* + * A traverse loop working on a single array. This is similar to the general + * strided-loop function. This is designed for loops that need to visit every + * element of a single array. + * + * Currently this is used for array clearing, via the NPY_DT_get_clear_loop + * API hook, and zero-filling, via the NPY_DT_get_fill_zero_loop API hook. + * These are most useful for handling arrays storing embedded references to + * python objects or heap-allocated data. + * + * The `void *traverse_context` is passed in because we may need to pass in + * Interpreter state or similar in the future, but we don't want to pass in + * a full context (with pointers to dtypes, method, caller which all make + * no sense for a traverse function). + * + * We assume for now that this context can be just passed through in the + * the future (for structured dtypes). + * + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArrayMethod_TraverseLoop extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArrayMethod_TraverseLoop(Pointer p) { super(p); } + protected PyArrayMethod_TraverseLoop() { allocate(); } + private native void allocate(); + public native int call( + Pointer traverse_context, @Const PyArray_Descr descr, @Cast("char*") BytePointer data, + @Cast("npy_intp") long size, @Cast("npy_intp") long stride, NpyAuxData auxdata); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java index 58bc7e13973..d3b0355b100 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java @@ -46,6 +46,22 @@ public class PyArrayMultiIterObject extends Pointer { public native int nd(); public native PyArrayMultiIterObject nd(int setter); /* number of dims */ public native @Cast("npy_intp") long dimensions(int i); public native PyArrayMultiIterObject dimensions(int i, long setter); @MemberGetter public native @Cast("npy_intp*") SizeTPointer dimensions(); /* dimensions */ + /* + * Space for the individual iterators, do not specify size publicly + * to allow changing it more easily. + * One reason is that Cython uses this for checks and only allows + * growing structs (as of Cython 3.0.6). It also allows NPY_MAXARGS + * to be runtime dependent. + */ +// #if (defined(NPY_INTERNAL_BUILD) && NPY_INTERNAL_BUILD) public native PyArrayIterObject iters(int i); public native PyArrayMultiIterObject iters(int i, PyArrayIterObject setter); - @MemberGetter public native @Cast("PyArrayIterObject**") PointerPointer iters(); /* iterators */ + @MemberGetter public native @Cast("PyArrayIterObject**") PointerPointer iters(); +// #elif defined(__cplusplus) + /* + * C++ doesn't stricly support flexible members and gives compilers + * warnings (pedantic only), so we lie. We can't make it 64 because + * then Cython is unhappy (larger struct at runtime is OK smaller not). + */ +// #else +// #endif } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayObject.java index 824d9b07699..5acd32af98c 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayObject.java @@ -83,10 +83,12 @@ public class PyArrayObject extends PyObject { /* For weak references */ public native PyObject weakreflist(); public native PyArrayObject weakreflist(PyObject setter); // #if NPY_FEATURE_VERSION >= NPY_1_20_API_VERSION + public native Pointer _buffer_info(); public native PyArrayObject _buffer_info(Pointer setter); /* private buffer info, tagged to allow warning */ // #endif /* * For malloc/calloc/realloc/free per object */ // #if NPY_FEATURE_VERSION >= NPY_1_22_API_VERSION + public native PyObject mem_handler(); public native PyArrayObject mem_handler(PyObject setter); // #endif } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrFuncs.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrFuncs.java index c1829d8eae1..541064e6409 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrFuncs.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrFuncs.java @@ -136,9 +136,9 @@ public class PyArray_ArrFuncs extends Pointer { public native @Cast("int**") PointerPointer cancastscalarkindto(); public native PyArray_ArrFuncs cancastscalarkindto(PointerPointer setter); public native IntPointer cancastto(); public native PyArray_ArrFuncs cancastto(IntPointer setter); - public native PyArray_FastClipFunc fastclip(); public native PyArray_ArrFuncs fastclip(PyArray_FastClipFunc setter); - public native PyArray_FastPutmaskFunc fastputmask(); public native PyArray_ArrFuncs fastputmask(PyArray_FastPutmaskFunc setter); - public native PyArray_FastTakeFunc fasttake(); public native PyArray_ArrFuncs fasttake(PyArray_FastTakeFunc setter); + public native Pointer _unused1(); public native PyArray_ArrFuncs _unused1(Pointer setter); + public native Pointer _unused2(); public native PyArray_ArrFuncs _unused2(Pointer setter); + public native Pointer _unused3(); public native PyArray_ArrFuncs _unused3(Pointer setter); /* * Function to select smallest diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrayDescr.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrayDescr.java index 534bbb8e511..17b2494ad02 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrayDescr.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrayDescr.java @@ -15,6 +15,7 @@ import static org.bytedeco.numpy.global.numpy.*; + @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) public class PyArray_ArrayDescr extends Pointer { static { Loader.load(); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Chunk.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Chunk.java index 529cc999352..bad0e480f20 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Chunk.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Chunk.java @@ -14,6 +14,19 @@ import static org.bytedeco.numpy.global.numpy.*; +// #endif + +/* + * Removed 2020-Nov-25, NumPy 1.20 + * #define NPY_SIZEOF_PYARRAYOBJECT (sizeof(PyArrayObject_fields)) + * + * The above macro was removed as it gave a false sense of a stable ABI + * with respect to the structures size. If you require a runtime constant, + * you can use `PyArray_Type.tp_basicsize` instead. Otherwise, please + * see the PyArrayObject documentation or ask the NumPy developers for + * information on how to correctly replace the macro in a way that is + * compatible with multiple NumPy versions. + */ /* Mirrors buffer object to ptr */ diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DTypeMeta.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DTypeMeta.java new file mode 100644 index 00000000000..dcbfcbdef4b --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DTypeMeta.java @@ -0,0 +1,75 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +/* + * Largely opaque struct for DType classes (i.e. metaclass instances). + * The internal definition is currently in `ndarraytypes.h` (export is a bit + * more complex because `PyArray_Descr` is a DTypeMeta internally but not + * externally). + */ +// #if !(defined(NPY_INTERNAL_BUILD) && NPY_INTERNAL_BUILD) + +// #ifndef Py_LIMITED_API + + @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArray_DTypeMeta extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public PyArray_DTypeMeta() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public PyArray_DTypeMeta(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArray_DTypeMeta(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public PyArray_DTypeMeta position(long position) { + return (PyArray_DTypeMeta)super.position(position); + } + @Override public PyArray_DTypeMeta getPointer(long i) { + return new PyArray_DTypeMeta((Pointer)this).offsetAddress(i); + } + + public native @ByRef @Name("super") PyHeapTypeObject _super(); public native PyArray_DTypeMeta _super(PyHeapTypeObject setter); + + /* + * Most DTypes will have a singleton default instance, for the + * parametric legacy DTypes (bytes, string, void, datetime) this + * may be a pointer to the *prototype* instance? + */ + public native PyArray_Descr singleton(); public native PyArray_DTypeMeta singleton(PyArray_Descr setter); + /* Copy of the legacy DTypes type number, usually invalid. */ + public native int type_num(); public native PyArray_DTypeMeta type_num(int setter); + + /* The type object of the scalar instances (may be NULL?) */ + public native PyTypeObject scalar_type(); public native PyArray_DTypeMeta scalar_type(PyTypeObject setter); + /* + * DType flags to signal legacy, parametric, or + * abstract. But plenty of space for additional information/flags. + */ + public native @Cast("npy_uint64") long flags(); public native PyArray_DTypeMeta flags(long setter); + + /* + * Use indirection in order to allow a fixed size for this struct. + * A stable ABI size makes creating a static DType less painful + * while also ensuring flexibility for all opaque API (with one + * indirection due the pointer lookup). + */ + public native Pointer dt_slots(); public native PyArray_DTypeMeta dt_slots(Pointer setter); + /* Allow growing (at the moment also beyond this) */ + public native Pointer reserved(int i); public native PyArray_DTypeMeta reserved(int i, Pointer setter); + @MemberGetter public native @Cast("void**") PointerPointer reserved(); + } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Descr.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Descr.java index cc5235ab61a..cfb7f85feda 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Descr.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Descr.java @@ -15,6 +15,10 @@ import static org.bytedeco.numpy.global.numpy.*; +// #if NPY_FEATURE_VERSION >= NPY_2_0_API_VERSION +/* + * Public version of the Descriptor struct as of 2.x + */ @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) public class PyArray_Descr extends Pointer { static { Loader.load(); } @@ -50,46 +54,21 @@ public class PyArray_Descr extends Pointer { * (not-applicable), or '=' (native). */ public native @Cast("char") byte byteorder(); public native PyArray_Descr byteorder(byte setter); - /* flags describing data type */ - public native @Cast("char") byte flags(); public native PyArray_Descr flags(byte setter); + /* Former flags flags space (unused) to ensure type_num is stable. */ + public native @Cast("char") byte _former_flags(); public native PyArray_Descr _former_flags(byte setter); /* number representing this type */ public native int type_num(); public native PyArray_Descr type_num(int setter); + /* Space for dtype instance specific flags. */ + public native @Cast("npy_uint64") long flags(); public native PyArray_Descr flags(long setter); /* element size (itemsize) for this type */ - public native int elsize(); public native PyArray_Descr elsize(int setter); + public native @Cast("npy_intp") long elsize(); public native PyArray_Descr elsize(long setter); /* alignment needed for this type */ - public native int alignment(); public native PyArray_Descr alignment(int setter); - /* - * Non-NULL if this type is - * is an array (C-contiguous) - * of some other type - */ - public native PyArray_ArrayDescr subarray(); public native PyArray_Descr subarray(PyArray_ArrayDescr setter); - /* - * The fields dictionary for this type - * For statically defined descr this - * is always Py_None - */ - public native PyObject fields(); public native PyArray_Descr fields(PyObject setter); - /* - * An ordered tuple of field names or NULL - * if no fields are defined - */ - public native PyObject names(); public native PyArray_Descr names(PyObject setter); - /* - * a table of functions specific for each - * basic data descriptor - */ - public native PyArray_ArrFuncs f(); public native PyArray_Descr f(PyArray_ArrFuncs setter); - /* Metadata about this dtype */ + public native @Cast("npy_intp") long alignment(); public native PyArray_Descr alignment(long setter); + /* metadata dict or NULL */ public native PyObject metadata(); public native PyArray_Descr metadata(PyObject setter); - /* - * Metadata specific to the C implementation - * of the particular dtype. This was added - * for NumPy 1.7.0. - */ - public native NpyAuxData c_metadata(); public native PyArray_Descr c_metadata(NpyAuxData setter); - /* Cached hash value (-1 if not yet computed). - * This was added for NumPy 2.0.0. - */ + /* Cached hash value (-1 if not yet computed). */ public native @Cast("npy_hash_t") long hash(); public native PyArray_Descr hash(long setter); + /* Unused slot (must be initialized to NULL) for future use */ + public native Pointer reserved_null(int i); public native PyArray_Descr reserved_null(int i, Pointer setter); + @MemberGetter public native @Cast("void**") PointerPointer reserved_null(); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DescrProto.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DescrProto.java new file mode 100644 index 00000000000..c7eeeb92161 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DescrProto.java @@ -0,0 +1,58 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + +/* + * Umodified PyArray_Descr struct identical to NumPy 1.x. This struct is + * used as a prototype for registering a new legacy DType. + * It is also used to access the fields in user code running on 1.x. + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArray_DescrProto extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public PyArray_DescrProto() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public PyArray_DescrProto(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArray_DescrProto(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public PyArray_DescrProto position(long position) { + return (PyArray_DescrProto)super.position(position); + } + @Override public PyArray_DescrProto getPointer(long i) { + return new PyArray_DescrProto((Pointer)this).offsetAddress(i); + } + + public native @ByRef PyObject ob_base(); public native PyArray_DescrProto ob_base(PyObject setter); + public native PyTypeObject typeobj(); public native PyArray_DescrProto typeobj(PyTypeObject setter); + public native @Cast("char") byte kind(); public native PyArray_DescrProto kind(byte setter); + public native @Cast("char") byte type(); public native PyArray_DescrProto type(byte setter); + public native @Cast("char") byte byteorder(); public native PyArray_DescrProto byteorder(byte setter); + public native @Cast("char") byte flags(); public native PyArray_DescrProto flags(byte setter); + public native int type_num(); public native PyArray_DescrProto type_num(int setter); + public native int elsize(); public native PyArray_DescrProto elsize(int setter); + public native int alignment(); public native PyArray_DescrProto alignment(int setter); + public native PyArray_ArrayDescr subarray(); public native PyArray_DescrProto subarray(PyArray_ArrayDescr setter); + public native PyObject fields(); public native PyArray_DescrProto fields(PyObject setter); + public native PyObject names(); public native PyArray_DescrProto names(PyObject setter); + public native PyArray_ArrFuncs f(); public native PyArray_DescrProto f(PyArray_ArrFuncs setter); + public native PyObject metadata(); public native PyArray_DescrProto metadata(PyObject setter); + public native NpyAuxData c_metadata(); public native PyArray_DescrProto c_metadata(NpyAuxData setter); + public native @Cast("npy_hash_t") long hash(); public native PyArray_DescrProto hash(long setter); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_StringDTypeObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_StringDTypeObject.java new file mode 100644 index 00000000000..3f98bdf4e35 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_StringDTypeObject.java @@ -0,0 +1,56 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyArray_StringDTypeObject extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public PyArray_StringDTypeObject() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public PyArray_StringDTypeObject(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyArray_StringDTypeObject(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public PyArray_StringDTypeObject position(long position) { + return (PyArray_StringDTypeObject)super.position(position); + } + @Override public PyArray_StringDTypeObject getPointer(long i) { + return new PyArray_StringDTypeObject((Pointer)this).offsetAddress(i); + } + + public native @ByRef PyArray_Descr base(); public native PyArray_StringDTypeObject base(PyArray_Descr setter); + // The object representing a null value + public native PyObject na_object(); public native PyArray_StringDTypeObject na_object(PyObject setter); + // Flag indicating whether or not to coerce arbitrary objects to strings + public native @Cast("char") byte coerce(); public native PyArray_StringDTypeObject coerce(byte setter); + // Flag indicating the na object is NaN-like + public native @Cast("char") byte has_nan_na(); public native PyArray_StringDTypeObject has_nan_na(byte setter); + // Flag indicating the na object is a string + public native @Cast("char") byte has_string_na(); public native PyArray_StringDTypeObject has_string_na(byte setter); + // If nonzero, indicates that this instance is owned by an array already + public native @Cast("char") byte array_owned(); public native PyArray_StringDTypeObject array_owned(byte setter); + // The string data to use when a default string is needed + public native @ByRef npy_static_string default_string(); public native PyArray_StringDTypeObject default_string(npy_static_string setter); + // The name of the missing data object, if any + public native @ByRef npy_static_string na_name(); public native PyArray_StringDTypeObject na_name(npy_static_string setter); + // the allocator should only be directly accessed after + // acquiring the allocator_lock and the lock should + // be released immediately after the allocator is + // no longer needed + public native npy_string_allocator allocator(); public native PyArray_StringDTypeObject allocator(npy_string_allocator setter); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java index 83b0d7e1066..047b20693d6 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java @@ -54,8 +54,8 @@ public class PyUFuncObject extends Pointer { /* Array of one-dimensional core loops */ public native @ByPtrPtr PyUFuncGenericFunction functions(); public native PyUFuncObject functions(PyUFuncGenericFunction setter); /* Array of funcdata that gets passed into the functions */ - public native Pointer data(int i); public native PyUFuncObject data(int i, Pointer setter); - public native @Cast("void**") PointerPointer data(); public native PyUFuncObject data(PointerPointer setter); + @MemberGetter public native Pointer data(int i); + @MemberGetter public native @Cast("void*const*") PointerPointer data(); /* The number of elements in 'functions' and 'data' */ public native int ntypes(); public native PyUFuncObject ntypes(int setter); @@ -66,7 +66,7 @@ public class PyUFuncObject extends Pointer { public native @Cast("const char*") BytePointer name(); public native PyUFuncObject name(BytePointer setter); /* Array of type numbers, of size ('nargs' * 'ntypes') */ - public native @Cast("char*") BytePointer types(); public native PyUFuncObject types(BytePointer setter); + public native @Cast("const char*") BytePointer types(); public native PyUFuncObject types(BytePointer setter); /* Documentation string */ public native @Cast("const char*") BytePointer doc(); public native PyUFuncObject doc(BytePointer setter); @@ -107,13 +107,8 @@ public class PyUFuncObject extends Pointer { * with the dtypes for the inputs and outputs. */ public native PyUFunc_TypeResolutionFunc type_resolver(); public native PyUFuncObject type_resolver(PyUFunc_TypeResolutionFunc setter); - /* - * A function which returns an inner loop written for - * NumPy 1.6 and earlier ufuncs. This is for backwards - * compatibility, and may be NULL if inner_loop_selector - * is specified. - */ - public native PyUFunc_LegacyInnerLoopSelectionFunc legacy_inner_loop_selector(); public native PyUFuncObject legacy_inner_loop_selector(PyUFunc_LegacyInnerLoopSelectionFunc setter); + /* Was the legacy loop resolver */ + public native Pointer reserved2(); public native PyUFuncObject reserved2(Pointer setter); /* * This was blocked off to be the "new" inner loop selector in 1.7, * but this was never implemented. (This is also why the above @@ -125,7 +120,7 @@ public class PyUFuncObject extends Pointer { // #endif /* Was previously the `PyUFunc_MaskedInnerLoopSelectionFunc` */ - public native Pointer _always_null_previously_masked_innerloop_selector(); public native PyUFuncObject _always_null_previously_masked_innerloop_selector(Pointer setter); + public native Pointer reserved3(); public native PyUFuncObject reserved3(Pointer setter); /* * List of flags for each operand when ufunc is called by nditer object. @@ -160,5 +155,9 @@ public class PyUFuncObject extends Pointer { /* New in NPY_API_VERSION 0x0000000F and above */ // #if NPY_FEATURE_VERSION >= NPY_1_22_API_VERSION + /* New private fields related to dispatching */ + public native Pointer _dispatch_cache(); public native PyUFuncObject _dispatch_cache(Pointer setter); + /* A PyListObject of `(tuple of DTypes, ArrayMethod/Promoter)` */ + public native PyObject _loops(); public native PyUFuncObject _loops(PyObject setter); // #endif } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_LegacyInnerLoopSelectionFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_LegacyInnerLoopSelectionFunc.java deleted file mode 100644 index 281b38aa59f..00000000000 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_LegacyInnerLoopSelectionFunc.java +++ /dev/null @@ -1,48 +0,0 @@ -// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.numpy; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; -import org.bytedeco.cpython.*; -import static org.bytedeco.cpython.global.python.*; - -import static org.bytedeco.numpy.global.numpy.*; - - -/* - * Legacy loop selector. (This should NOT normally be used and we can expect - * that only the `PyUFunc_DefaultLegacyInnerLoopSelector` is ever set). - * However, unlike the masked version, it probably still works. - * - * ufunc: The ufunc object. - * dtypes: An array which has been populated with dtypes, - * in most cases by the type resolution function - * for the same ufunc. - * out_innerloop: Should be populated with the correct ufunc inner - * loop for the given type. - * out_innerloopdata: Should be populated with the void* data to - * be passed into the out_innerloop function. - * out_needs_api: If the inner loop needs to use the Python API, - * should set the to 1, otherwise should leave - * this untouched. - */ -@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) -public class PyUFunc_LegacyInnerLoopSelectionFunc extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PyUFunc_LegacyInnerLoopSelectionFunc(Pointer p) { super(p); } - protected PyUFunc_LegacyInnerLoopSelectionFunc() { allocate(); } - private native void allocate(); - public native int call( - PyUFuncObject ufunc, - @Cast("PyArray_Descr**") PointerPointer dtypes, - @ByPtrPtr PyUFuncGenericFunction out_innerloop, - @Cast("void**") PointerPointer out_innerloopdata, - IntPointer out_needs_api); -} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUnicodeScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUnicodeScalarObject.java index 12219f5a6ae..efacd319874 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUnicodeScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUnicodeScalarObject.java @@ -14,6 +14,7 @@ import static org.bytedeco.numpy.global.numpy.*; +// #ifndef Py_LIMITED_API @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) public class PyUnicodeScalarObject extends Pointer { static { Loader.load(); } @@ -36,5 +37,6 @@ public class PyUnicodeScalarObject extends Pointer { public native @ByRef PyUnicodeObject base(); public native PyUnicodeScalarObject base(PyUnicodeObject setter); public native @Cast("Py_UCS4*") IntPointer obval(); public native PyUnicodeScalarObject obval(IntPointer setter); // #if NPY_FEATURE_VERSION >= NPY_1_20_API_VERSION + public native @Cast("char*") BytePointer buffer_fmt(); public native PyUnicodeScalarObject buffer_fmt(BytePointer setter); // #endif } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyVoidScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyVoidScalarObject.java index f8a07723435..6652605873a 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyVoidScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyVoidScalarObject.java @@ -14,6 +14,7 @@ import static org.bytedeco.numpy.global.numpy.*; +// #endif @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) @@ -36,9 +37,13 @@ public class PyVoidScalarObject extends Pointer { public native @ByRef PyVarObject ob_base(); public native PyVoidScalarObject ob_base(PyVarObject setter); public native @Cast("char*") BytePointer obval(); public native PyVoidScalarObject obval(BytePointer setter); +// #if defined(NPY_INTERNAL_BUILD) && NPY_INTERNAL_BUILD +// #else public native PyArray_Descr descr(); public native PyVoidScalarObject descr(PyArray_Descr setter); +// #endif public native int flags(); public native PyVoidScalarObject flags(int setter); public native PyObject base(); public native PyVoidScalarObject base(PyObject setter); // #if NPY_FEATURE_VERSION >= NPY_1_20_API_VERSION + public native Pointer _buffer_info(); public native PyVoidScalarObject _buffer_info(Pointer setter); /* private buffer info, tagged to allow warning */ // #endif } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/_PyArray_LegacyDescr.java b/numpy/src/gen/java/org/bytedeco/numpy/_PyArray_LegacyDescr.java new file mode 100644 index 00000000000..f4d2626d2a6 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/_PyArray_LegacyDescr.java @@ -0,0 +1,63 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +// #else /* 1.x and 2.x compatible version (only shared fields): */ + +// #endif /* 1.x and 2.x compatible version */ + +/* + * Semi-private struct with additional field of legacy descriptors (must + * check NPY_DT_is_legacy before casting/accessing). The struct is also not + * valid when running on 1.x (i.e. in public API use). + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class _PyArray_LegacyDescr extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public _PyArray_LegacyDescr() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public _PyArray_LegacyDescr(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public _PyArray_LegacyDescr(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public _PyArray_LegacyDescr position(long position) { + return (_PyArray_LegacyDescr)super.position(position); + } + @Override public _PyArray_LegacyDescr getPointer(long i) { + return new _PyArray_LegacyDescr((Pointer)this).offsetAddress(i); + } + + public native @ByRef PyObject ob_base(); public native _PyArray_LegacyDescr ob_base(PyObject setter); + public native PyTypeObject typeobj(); public native _PyArray_LegacyDescr typeobj(PyTypeObject setter); + public native @Cast("char") byte kind(); public native _PyArray_LegacyDescr kind(byte setter); + public native @Cast("char") byte type(); public native _PyArray_LegacyDescr type(byte setter); + public native @Cast("char") byte byteorder(); public native _PyArray_LegacyDescr byteorder(byte setter); + public native @Cast("char") byte _former_flags(); public native _PyArray_LegacyDescr _former_flags(byte setter); + public native int type_num(); public native _PyArray_LegacyDescr type_num(int setter); + public native @Cast("npy_uint64") long flags(); public native _PyArray_LegacyDescr flags(long setter); + public native @Cast("npy_intp") long elsize(); public native _PyArray_LegacyDescr elsize(long setter); + public native @Cast("npy_intp") long alignment(); public native _PyArray_LegacyDescr alignment(long setter); + public native PyObject metadata(); public native _PyArray_LegacyDescr metadata(PyObject setter); + public native @Cast("npy_hash_t") long hash(); public native _PyArray_LegacyDescr hash(long setter); + public native Pointer reserved_null(int i); public native _PyArray_LegacyDescr reserved_null(int i, Pointer setter); + @MemberGetter public native @Cast("void**") PointerPointer reserved_null(); + public native PyArray_ArrayDescr subarray(); public native _PyArray_LegacyDescr subarray(PyArray_ArrayDescr setter); + public native PyObject fields(); public native _PyArray_LegacyDescr fields(PyObject setter); + public native PyObject names(); public native _PyArray_LegacyDescr names(PyObject setter); + public native NpyAuxData c_metadata(); public native _PyArray_LegacyDescr c_metadata(NpyAuxData setter); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java b/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java index 1ca01fc3bb6..ae953199d28 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java @@ -34,22 +34,23 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { public static final int NPY_SIZEOF_LONGDOUBLE = 16; public static final int NPY_SIZEOF_COMPLEX_LONGDOUBLE = 32; public static final int NPY_SIZEOF_PY_INTPTR_T = 8; +public static final int NPY_SIZEOF_INTP = 8; +public static final int NPY_SIZEOF_UINTP = 8; +public static final int NPY_SIZEOF_WCHAR_T = 4; public static final int NPY_SIZEOF_OFF_T = 8; public static final int NPY_SIZEOF_PY_LONG_LONG = 8; public static final int NPY_SIZEOF_LONGLONG = 8; -public static final int NPY_USE_C99_COMPLEX = 1; -public static final int NPY_HAVE_COMPLEX_DOUBLE = 1; -public static final int NPY_HAVE_COMPLEX_FLOAT = 1; -public static final int NPY_HAVE_COMPLEX_LONG_DOUBLE = 1; -public static final int NPY_USE_C99_FORMATS = 1; - -/* #undef NPY_NO_SIGNAL */ +/* + * Defined to 1 or 0. Note that Pyodide hardcodes NPY_NO_SMP (and other defines + * in this header) for better cross-compilation, so don't rename them without a + * good reason. + */ public static final int NPY_NO_SMP = 0; // #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) -public static final int NPY_ABI_VERSION = 0x01000009; -public static final int NPY_API_VERSION = 0x00000011; +public static final int NPY_ABI_VERSION = 0x02000000; +public static final int NPY_API_VERSION = 0x00000012; // #ifndef __STDC_FORMAT_MACROS public static final int __STDC_FORMAT_MACROS = 1; @@ -76,7 +77,6 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { */ // #ifdef __APPLE__ // #undef NPY_SIZEOF_LONG -// #undef NPY_SIZEOF_PY_INTPTR_T // #ifdef __LP64__ // #else @@ -131,6 +131,7 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { public static final int NPY_1_23_API_VERSION = 0x00000010; public static final int NPY_1_24_API_VERSION = 0x00000010; public static final int NPY_1_25_API_VERSION = 0x00000011; +public static final int NPY_2_0_API_VERSION = 0x00000012; /* @@ -161,7 +162,7 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { * Users of the stable ABI may wish to target the last Python that is not * end of life. This would be 3.8 at NumPy 1.25 release time. * 1.17 as default was the choice of oldest-support-numpy at the time and - * has in practice no limit (comapared to 1.19). Even earlier becomes legacy. + * has in practice no limit (compared to 1.19). Even earlier becomes legacy. */ // #if defined(NPY_INTERNAL_BUILD) && NPY_INTERNAL_BUILD // #elif defined(NPY_TARGET_VERSION) && NPY_TARGET_VERSION @@ -180,6 +181,27 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { // #warning "Requested NumPy target lower than supported NumPy 1.15." // #endif +/* + * We define a human readable translation to the Python version of NumPy + * for error messages (and also to allow grepping the binaries for conda). + */ +// #if NPY_FEATURE_VERSION == NPY_1_7_API_VERSION + public static final String NPY_FEATURE_VERSION_STRING = "1.7"; +// #elif NPY_FEATURE_VERSION == NPY_1_8_API_VERSION +// #elif NPY_FEATURE_VERSION == NPY_1_9_API_VERSION +// #elif NPY_FEATURE_VERSION == NPY_1_10_API_VERSION /* also 1.11, 1.12 */ +// #elif NPY_FEATURE_VERSION == NPY_1_13_API_VERSION +// #elif NPY_FEATURE_VERSION == NPY_1_14_API_VERSION /* also 1.15 */ +// #elif NPY_FEATURE_VERSION == NPY_1_16_API_VERSION /* also 1.17, 1.18, 1.19 */ +// #elif NPY_FEATURE_VERSION == NPY_1_20_API_VERSION /* also 1.21 */ +// #elif NPY_FEATURE_VERSION == NPY_1_22_API_VERSION +// #elif NPY_FEATURE_VERSION == NPY_1_23_API_VERSION /* also 1.24 */ +// #elif NPY_FEATURE_VERSION == NPY_1_25_API_VERSION +// #elif NPY_FEATURE_VERSION == NPY_2_0_API_VERSION +// #else +// #error "Missing version string define for new NumPy version." +// #endif + // #endif /* NUMPY_CORE_INCLUDE_NUMPY_NPY_NUMPYCONFIG_H_ */ @@ -361,8 +383,8 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { NPY_CPU_BIG = 2; /* - * This is to typedef npy_intp to the appropriate pointer size for this - * platform. Py_intptr_t, Py_uintptr_t are defined in pyport.h. + * This is to typedef npy_intp to the appropriate size for Py_ssize_t. + * (Before NumPy 2.0 we used Py_intptr_t and Py_uintptr_t from `pyport.h`.) */ /* @@ -372,8 +394,6 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { public static final int NPY_SIZEOF_BYTE = 1; public static final int NPY_SIZEOF_DATETIME = 8; public static final int NPY_SIZEOF_TIMEDELTA = 8; -public static final int NPY_SIZEOF_INTP = NPY_SIZEOF_PY_INTPTR_T; -public static final int NPY_SIZEOF_UINTP = NPY_SIZEOF_PY_INTPTR_T; public static final int NPY_SIZEOF_HALF = 2; public static final int NPY_SIZEOF_CFLOAT = NPY_SIZEOF_COMPLEX_FLOAT; public static final int NPY_SIZEOF_CDOUBLE = NPY_SIZEOF_COMPLEX_DOUBLE; @@ -391,33 +411,28 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { * functions use different formatting codes that are portably specified * according to the Python documentation. See issue gh-2388. */ -// #if NPY_SIZEOF_PY_INTPTR_T == NPY_SIZEOF_INT -// #elif NPY_SIZEOF_PY_INTPTR_T == NPY_SIZEOF_LONG -// #elif defined(PY_LONG_LONG) && (NPY_SIZEOF_PY_INTPTR_T == NPY_SIZEOF_LONGLONG) +// #if NPY_SIZEOF_INTP == NPY_SIZEOF_LONG public static native @MemberGetter long NPY_INTP(); public static final long NPY_INTP = NPY_INTP(); public static native @MemberGetter long NPY_UINTP(); public static final long NPY_UINTP = NPY_UINTP(); -// #define PyIntpArrType_Type PyLongLongArrType_Type -// #define PyUIntpArrType_Type PyULongLongArrType_Type +// #define PyIntpArrType_Type PyLongArrType_Type +// #define PyUIntpArrType_Type PyULongArrType_Type public static native @MemberGetter long NPY_MAX_INTP(); public static final long NPY_MAX_INTP = NPY_MAX_INTP(); public static native @MemberGetter long NPY_MIN_INTP(); public static final long NPY_MIN_INTP = NPY_MIN_INTP(); public static native @MemberGetter long NPY_MAX_UINTP(); public static final long NPY_MAX_UINTP = NPY_MAX_UINTP(); - public static final String NPY_INTP_FMT = "lld"; -// #endif - -/* - * We can only use C99 formats for npy_int_p if it is the same as - * intp_t, hence the condition on HAVE_UNITPTR_T - */ -// #if (NPY_USE_C99_FORMATS) == 1 -// && (defined HAVE_UINTPTR_T) -// && (defined HAVE_INTTYPES_H) -// #include -// #undef NPY_INTP_FMT + public static final String NPY_INTP_FMT = "ld"; +// #elif NPY_SIZEOF_INTP == NPY_SIZEOF_INT +// #define PyIntpArrType_Type PyIntArrType_Type +// #define PyUIntpArrType_Type PyUIntArrType_Type +// #elif defined(PY_LONG_LONG) && (NPY_SIZEOF_INTP == NPY_SIZEOF_LONGLONG) +// #define PyIntpArrType_Type PyLongLongArrType_Type +// #define PyUIntpArrType_Type PyULongLongArrType_Type +// #else +// #error "Failed to correctly define NPY_INTP and NPY_UINTP" // #endif @@ -465,8 +480,9 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { * See https://github.com/numpy/numpy/issues/20348 */ // #if NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE - public static final String NPY_LONGDOUBLE_FMT = "g"; // #else + public static final String NPY_LONGDOUBLE_FMT = "Lg"; +// #define longdouble_t long double // #endif // #ifndef Py_USING_UNICODE @@ -474,38 +490,28 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { // #endif /* These are for completeness */ -public static final int NPY_SIZEOF_HASH_T = NPY_SIZEOF_INTP; - -/* - * Disabling C99 complex usage: a lot of C code in numpy/scipy rely on being - * able to do .real/.imag. Will have to convert code first. - */ -// #if 0 -// #endif -// #if NPY_SIZEOF_COMPLEX_DOUBLE != 2 * NPY_SIZEOF_DOUBLE -// #error npy_cdouble definition is not compatible with C99 complex definition ! -// Please contact NumPy maintainers and give detailed information about your -// compiler and platform +public static native @MemberGetter int NPY_SIZEOF_HASH_T(); +public static final int NPY_SIZEOF_HASH_T = NPY_SIZEOF_HASH_T(); // Targeting ../npy_cdouble.java - -// #if NPY_SIZEOF_COMPLEX_FLOAT != 2 * NPY_SIZEOF_FLOAT -// #error npy_cfloat definition is not compatible with C99 complex definition ! -// Please contact NumPy maintainers and give detailed information about your -// compiler and platform // Targeting ../npy_cfloat.java - -// #if NPY_SIZEOF_COMPLEX_LONGDOUBLE != 2 * NPY_SIZEOF_LONGDOUBLE -// #error npy_clongdouble definition is not compatible with C99 complex definition ! -// Please contact NumPy maintainers and give detailed information about your -// compiler and platform // Targeting ../npy_clongdouble.java +// #else + +// #include + +// #if defined(_MSC_VER) && !defined(__INTEL_COMPILER) +// #else /* !defined(_MSC_VER) || defined(__INTEL_COMPILER) */ +// #endif + +// #endif + /* * numarray-style bit-width typedefs */ @@ -1176,66 +1182,6 @@ It also looks like Python itself uses sizeof(char) quite a // #endif /* NUMPY_CORE_INCLUDE_NUMPY_NPY_ENDIAN_H_ */ -// Parsed from npy_interrupt.h - -/* - * This API is only provided because it is part of publicly exported - * headers. Its use is considered DEPRECATED, and it will be removed - * eventually. - * (This includes the _PyArray_SigintHandler and _PyArray_GetSigintBuf - * functions which are however, public API, and not headers.) - * - * Instead of using these non-threadsafe macros consider periodically - * querying `PyErr_CheckSignals()` or `PyOS_InterruptOccurred()` will work. - * Both of these require holding the GIL, although cpython could add a - * version of `PyOS_InterruptOccurred()` which does not. Such a version - * actually exists as private API in Python 3.10, and backported to 3.9 and 3.8, - * see also https://bugs.python.org/issue41037 and - * https://github.com/python/cpython/pull/20599). - */ - -// #ifndef NUMPY_CORE_INCLUDE_NUMPY_NPY_INTERRUPT_H_ -// #define NUMPY_CORE_INCLUDE_NUMPY_NPY_INTERRUPT_H_ - -// #ifndef NPY_NO_SIGNAL - -// #include -// #include - -// #ifndef sigsetjmp - -// #define NPY_SIGSETJMP(arg1, arg2) setjmp(arg1) -// #define NPY_SIGLONGJMP(arg1, arg2) longjmp(arg1, arg2) -// #define NPY_SIGJMP_BUF jmp_buf - -// #else - -// #define NPY_SIGSETJMP(arg1, arg2) sigsetjmp(arg1, arg2) -// #define NPY_SIGLONGJMP(arg1, arg2) siglongjmp(arg1, arg2) -// #define NPY_SIGJMP_BUF sigjmp_buf - -// #endif - -// # define NPY_SIGINT_ON { -// PyOS_sighandler_t _npy_sig_save; -// _npy_sig_save = PyOS_setsig(SIGINT, _PyArray_SigintHandler); -// if (NPY_SIGSETJMP(*((NPY_SIGJMP_BUF *)_PyArray_GetSigintBuf()), -// 1) == 0) { - -// # define NPY_SIGINT_OFF } -// PyOS_setsig(SIGINT, _npy_sig_save); -// } - -// #else /* NPY_NO_SIGNAL */ - -// #define NPY_SIGINT_ON -// #define NPY_SIGINT_OFF - -// #endif /* HAVE_SIGSETJMP */ - -// #endif /* NUMPY_CORE_INCLUDE_NUMPY_NPY_INTERRUPT_H_ */ - - // Parsed from npy_math.h // #ifndef NUMPY_CORE_INCLUDE_NUMPY_NPY_MATH_H_ @@ -1256,6 +1202,9 @@ It also looks like Python itself uses sizeof(char) quite a // #ifdef __cplusplus // #endif +// #define PyArray_MAX(a,b) (((a)>(b))?(a):(b)) +// #define PyArray_MIN(a,b) (((a)<(b))?(a):(b)) + /* * NAN and INFINITY like macros (same behavior as glibc for NAN, same as C99 * for INFINITY) @@ -1469,9 +1418,7 @@ It also looks like Python itself uses sizeof(char) quite a @NoException public static native @Cast("npy_longdouble") double npy_log2l(@Cast("npy_longdouble") double x); @NoException public static native @Cast("npy_longdouble") double npy_atan2l(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double y); @NoException public static native @Cast("npy_longdouble") double npy_powl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double y); -@NoException public static native @Cast("npy_longdouble") double npy_modfl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble*") DoublePointer y); -@NoException public static native @Cast("npy_longdouble") double npy_modfl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble*") DoubleBuffer y); -@NoException public static native @Cast("npy_longdouble") double npy_modfl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble*") double[] y); +@NoException public static native @Cast("npy_longdouble") double npy_modfl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble*") Pointer y); /* Mandatory C99 double math funcs, no blocklisting or fixups */ /* defined for legacy reasons, should be deprecated at some point */ @@ -1504,11 +1451,7 @@ It also looks like Python itself uses sizeof(char) quite a @NoException public static native @Cast("npy_longdouble") double npy_logaddexpl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double y); @NoException public static native @Cast("npy_longdouble") double npy_logaddexp2l(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double y); @NoException public static native @Cast("npy_longdouble") double npy_divmodl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double y, - @Cast("npy_longdouble*") DoublePointer modulus); -@NoException public static native @Cast("npy_longdouble") double npy_divmodl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double y, - @Cast("npy_longdouble*") DoubleBuffer modulus); -@NoException public static native @Cast("npy_longdouble") double npy_divmodl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double y, - @Cast("npy_longdouble*") double[] modulus); + @Cast("npy_longdouble*") Pointer modulus); @NoException public static native @Cast("npy_longdouble") double npy_heavisidel(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double h0); @@ -1517,57 +1460,38 @@ It also looks like Python itself uses sizeof(char) quite a * Complex declarations */ -/* - * C99 specifies that complex numbers have the same representation as - * an array of two elements, where the first element is the real part - * and the second element is the imaginary part. - */ -// #define __NPY_CPACK_IMP(x, y, type, ctype) -// union { -// ctype z; -// type a[2]; -// } z1; -// -// z1.a[0] = (x); -// z1.a[1] = (y); -// -// return z1.z; +@NoException public static native double npy_creal(@Const @ByVal npy_cdouble z); -@NoException public static native @ByVal npy_cdouble npy_cpack(double x, double y); +@NoException public static native void npy_csetreal(npy_cdouble z, double r); -@NoException public static native @ByVal npy_cfloat npy_cpackf(float x, float y); +@NoException public static native double npy_cimag(@Const @ByVal npy_cdouble z); -@NoException public static native @ByVal npy_clongdouble npy_cpackl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double y); -// #undef __NPY_CPACK_IMP +@NoException public static native void npy_csetimag(npy_cdouble z, double i); -/* - * Same remark as above, but in the other direction: extract first/second - * member of complex number, assuming a C99-compatible representation - * - * Those are defineds as static inline, and such as a reasonable compiler would - * most likely compile this to one or two instructions (on CISC at least) - */ -// #define __NPY_CEXTRACT_IMP(z, index, type, ctype) -// union { -// ctype z; -// type a[2]; -// } __z_repr; -// __z_repr.z = z; -// -// return __z_repr.a[index]; +@NoException public static native float npy_crealf(@Const @ByVal npy_cfloat z); + +@NoException public static native void npy_csetrealf(npy_cfloat z, float r); + +@NoException public static native float npy_cimagf(@Const @ByVal npy_cfloat z); + +@NoException public static native void npy_csetimagf(npy_cfloat z, float i); -@NoException public static native double npy_creal(@ByVal npy_cdouble z); +@NoException public static native @Cast("npy_longdouble") double npy_creall(@Const @ByVal npy_clongdouble z); -@NoException public static native double npy_cimag(@ByVal npy_cdouble z); +@NoException public static native @Cast("npy_longdouble") double npy_cimagl(@Const @ByVal npy_clongdouble z); -@NoException public static native float npy_crealf(@ByVal npy_cfloat z); +// #define NPY_CSETREAL(z, r) npy_csetreal(z, r) +// #define NPY_CSETIMAG(z, i) npy_csetimag(z, i) +// #define NPY_CSETREALF(z, r) npy_csetrealf(z, r) +// #define NPY_CSETIMAGF(z, i) npy_csetimagf(z, i) +// #define NPY_CSETREALL(z, r) npy_csetreall(z, r) +// #define NPY_CSETIMAGL(z, i) npy_csetimagl(z, i) -@NoException public static native float npy_cimagf(@ByVal npy_cfloat z); +@NoException public static native @ByVal npy_cdouble npy_cpack(double x, double y); -@NoException public static native @Cast("npy_longdouble") double npy_creall(@ByVal npy_clongdouble z); +@NoException public static native @ByVal npy_cfloat npy_cpackf(float x, float y); -@NoException public static native @Cast("npy_longdouble") double npy_cimagl(@ByVal npy_clongdouble z); -// #undef __NPY_CEXTRACT_IMP +@NoException public static native @ByVal npy_clongdouble npy_cpackl(@Cast("npy_longdouble") double x, @Cast("npy_longdouble") double y); /* * Double precision complex functions @@ -1821,11 +1745,6 @@ It also looks like Python itself uses sizeof(char) quite a // #define Py_ARRAYOBJECT_H // #include "ndarrayobject.h" -// #include "npy_interrupt.h" - -// #ifdef NPY_NO_PREFIX -// #include "noprefix.h" -// #endif // #endif /* NUMPY_CORE_INCLUDE_NUMPY_ARRAYOBJECT_H_ */ @@ -1931,10 +1850,13 @@ It also looks like Python itself uses sizeof(char) quite a // #define PyArrayScalar_New(cls) // Py##cls##ArrType_Type.tp_alloc(&Py##cls##ArrType_Type, 0) +// #ifndef Py_LIMITED_API +/* For the limited API, use PyArray_ScalarAsCtype instead */ // #define PyArrayScalar_VAL(obj, cls) // ((Py##cls##ScalarObject *)obj)->obval // #define PyArrayScalar_ASSIGN(obj, cls, val) // PyArrayScalar_VAL(obj, cls) = val +// #endif // #endif /* NUMPY_CORE_INCLUDE_NUMPY_ARRAYSCALARS_H_ */ @@ -1951,8 +1873,8 @@ It also looks like Python itself uses sizeof(char) quite a // #define NPY_NO_EXPORT NPY_VISIBILITY_HIDDEN -/* Only use thread if configured in config and python supports it */ -// #if defined WITH_THREAD && !NPY_NO_SMP +/* Always allow threading unless it was explicitly disabled at build time */ +// #if !NPY_NO_SMP public static final int NPY_ALLOW_THREADS = 1; // #else // #endif @@ -1961,14 +1883,6 @@ It also looks like Python itself uses sizeof(char) quite a // #define __has_extension(x) 0 // #endif -// #if !defined(_NPY_NO_DEPRECATIONS) && -// ((defined(__GNUC__)&& __GNUC__ >= 6) || -// __has_extension(attribute_deprecated_with_message)) -// #define NPY_ATTR_DEPRECATE(text) __attribute__ ((deprecated (text))) -// #else -// #define NPY_ATTR_DEPRECATE(text) -// #endif - /* * There are several places in the code where an array of dimensions * is allocated statically. This is the size of that static @@ -1977,10 +1891,17 @@ It also looks like Python itself uses sizeof(char) quite a * The array creation itself could have arbitrary dimensions but all * the places where static allocation is used would need to be changed * to dynamic (including inside of several structures) + * + * As of NumPy 2.0, we strongly discourage the downstream use of NPY_MAXDIMS, + * but since auditing everything seems a big ask, define it as 64. + * A future version could: + * - Increase or remove the limit and require recompilation (like 2.0 did) + * - Deprecate or remove the macro but keep the limit (at basically any time) */ - -public static final int NPY_MAXDIMS = 32; -public static final int NPY_MAXARGS = 32; +public static final int NPY_MAXDIMS = 64; +/* We cannot change this as it would break ABI: */ +public static final int NPY_MAXDIMS_LEGACY_ITERS = 32; +/* NPY_MAXARGS is version dependent and defined in npy_2_compat.h */ /* Used for Converter Functions "O&" code in ParseTuple */ public static final int NPY_FAIL = 0; @@ -2005,16 +1926,28 @@ It also looks like Python itself uses sizeof(char) quite a */ NPY_DATETIME = 21, NPY_TIMEDELTA = 22, NPY_HALF = 23, - NPY_NTYPES = 24, + NPY_CHAR = 24, /* Deprecated, will raise if used */ + + /* The number of *legacy* dtypes */ + NPY_NTYPES_LEGACY = 24, + + /* assign a high value to avoid changing this in the + future when new dtypes are added */ NPY_NOTYPE = 25, - NPY_CHAR = 26, + NPY_USERDEF = 256, /* leave room for characters */ /* The number of types not including the new 1.6 types */ - NPY_NTYPES_ABI_COMPATIBLE = 21; -// #if defined(_MSC_VER) && !defined(__clang__) -// #pragma deprecated(NPY_CHAR) -// #endif + NPY_NTYPES_ABI_COMPATIBLE = 21, + + /* + * New DTypes which do not share the legacy layout + * (added after NumPy 2.0). VSTRING is the first of these + * we may open up a block for user-defined dtypes in the + * future. + */ + NPY_VSTRING = 2056; + /* basetype array priority */ public static final double NPY_PRIORITY = 0.0; @@ -2055,7 +1988,7 @@ It also looks like Python itself uses sizeof(char) quite a NPY_CLONGDOUBLELTR = 'G', NPY_OBJECTLTR = 'O', NPY_STRINGLTR = 'S', - NPY_STRINGLTR2 = 'a', + NPY_DEPRECATED_STRINGLTR2 = 'a', NPY_UNICODELTR = 'U', NPY_VOIDLTR = 'V', NPY_DATETIMELTR = 'M', @@ -2063,13 +1996,19 @@ It also looks like Python itself uses sizeof(char) quite a NPY_CHARLTR = 'c', /* - * No Descriptor, just a define -- this let's - * Python users specify an array of integers - * large enough to hold a pointer on the - * platform + * New non-legacy DTypes + */ + NPY_VSTRINGLTR = 'T', + + /* + * Note, we removed `NPY_INTPLTR` due to changing its definition + * to 'n', rather than 'p'. On any typical platform this is the + * same integer. 'n' should be used for the `np.intp` with the same + * size as `size_t` while 'p' remains pointer sized. + * + * 'p', 'P', 'n', and 'N' are valid and defined explicitly + * in `arraytypes.c.src`. */ - NPY_INTPLTR = 'p', - NPY_UINTPLTR = 'P', /* * These are for dtype 'kinds', not dtype 'typecodes' @@ -2090,6 +2029,7 @@ It also looks like Python itself uses sizeof(char) quite a */ /** enum NPY_SORTKIND */ public static final int + _NPY_SORT_UNDEFINED = -1, NPY_QUICKSORT = 0, NPY_HEAPSORT = 1, NPY_MERGESORT = 2, @@ -2235,6 +2175,7 @@ It also looks like Python itself uses sizeof(char) quite a /* Raise an exception for non-business days. */ NPY_BUSDAY_RAISE = NPY_BUSDAY_BACKWARD + 4; + /************************************************************ * NumPy Auxiliary Data for inner loops, sort functions, etc. ************************************************************/ @@ -2343,27 +2284,12 @@ It also looks like Python itself uses sizeof(char) quite a // Targeting ../PyArray_ArgSortFunc.java -// Targeting ../PyArray_PartitionFunc.java - - -// Targeting ../PyArray_ArgPartitionFunc.java - - // Targeting ../PyArray_FillWithScalarFunc.java // Targeting ../PyArray_ScalarKindFunc.java -// Targeting ../PyArray_FastClipFunc.java - - -// Targeting ../PyArray_FastPutmaskFunc.java - - -// Targeting ../PyArray_FastTakeFunc.java - - // Targeting ../PyArray_Dims.java @@ -2371,6 +2297,7 @@ It also looks like Python itself uses sizeof(char) quite a + /* The item must be reference counted when it is inserted or extracted. */ public static final int NPY_ITEM_REFCOUNT = 0x01; /* Same as needing REFCOUNT */ @@ -2400,13 +2327,13 @@ It also looks like Python itself uses sizeof(char) quite a public static final int NPY_OBJECT_DTYPE_FLAGS = (NPY_LIST_PICKLE | NPY_USE_GETITEM | NPY_ITEM_IS_POINTER | NPY_ITEM_REFCOUNT | NPY_NEEDS_INIT | NPY_NEEDS_PYAPI); +// Targeting ../PyArray_Descr.java -// #define PyDataType_FLAGCHK(dtype, flag) -// (((dtype)->flags & (flag)) == (flag)) -// #define PyDataType_REFCHK(dtype) -// PyDataType_FLAGCHK(dtype, NPY_ITEM_REFCOUNT) -// Targeting ../PyArray_Descr.java +// Targeting ../_PyArray_LegacyDescr.java + + +// Targeting ../PyArray_DescrProto.java // Targeting ../PyArray_ArrayDescr.java @@ -2433,9 +2360,6 @@ It also looks like Python itself uses sizeof(char) quite a * PyArrayObject field access is deprecated as of NumPy 1.7. */ // #else -// Targeting ../PyArrayFlagsObject.java - - // Targeting ../PyArray_Chunk.java @@ -2620,19 +2544,6 @@ It also looks like Python itself uses sizeof(char) quite a /* buffer stress test size: */ /*#define NPY_BUFSIZE 17*/ -// #define PyArray_MAX(a,b) (((a)>(b))?(a):(b)) -// #define PyArray_MIN(a,b) (((a)<(b))?(a):(b)) -// #define PyArray_CLT(p,q) ((((p).real==(q).real) ? ((p).imag < (q).imag) : -// ((p).real < (q).real))) -// #define PyArray_CGT(p,q) ((((p).real==(q).real) ? ((p).imag > (q).imag) : -// ((p).real > (q).real))) -// #define PyArray_CLE(p,q) ((((p).real==(q).real) ? ((p).imag <= (q).imag) : -// ((p).real <= (q).real))) -// #define PyArray_CGE(p,q) ((((p).real==(q).real) ? ((p).imag >= (q).imag) : -// ((p).real >= (q).real))) -// #define PyArray_CEQ(p,q) (((p).real==(q).real) && ((p).imag == (q).imag)) -// #define PyArray_CNE(p,q) (((p).real!=(q).real) || ((p).imag != (q).imag)) - /* * C API: consists of Macros and functions. The MACROS are defined * here. @@ -2657,13 +2568,6 @@ It also looks like Python itself uses sizeof(char) quite a // #define NPY_BEGIN_THREADS_THRESHOLDED(loop_size) do { if ((loop_size) > 500) // { _save = PyEval_SaveThread();} } while (0); -// #define NPY_BEGIN_THREADS_DESCR(dtype) -// do {if (!(PyDataType_FLAGCHK((dtype), NPY_NEEDS_PYAPI))) -// NPY_BEGIN_THREADS;} while (0); - -// #define NPY_END_THREADS_DESCR(dtype) -// do {if (!(PyDataType_FLAGCHK((dtype), NPY_NEEDS_PYAPI))) -// NPY_END_THREADS; } while (0); // #define NPY_ALLOW_C_API_DEF PyGILState_STATE __save__; // #define NPY_ALLOW_C_API do {__save__ = PyGILState_Ensure();} while (0); @@ -2798,7 +2702,7 @@ It also looks like Python itself uses sizeof(char) quite a // _PyArray_ITER_NEXT1(_PyAIT(it)); // } // else if (_PyAIT(it)->contiguous) -// _PyAIT(it)->dataptr += PyArray_DESCR(_PyAIT(it)->ao)->elsize; +// _PyAIT(it)->dataptr += PyArray_ITEMSIZE(_PyAIT(it)->ao); // else if (_PyAIT(it)->nd_m1 == 1) { // _PyArray_ITER_NEXT2(_PyAIT(it)); // } @@ -2851,7 +2755,7 @@ It also looks like Python itself uses sizeof(char) quite a // } // else if (_PyAIT(it)->contiguous) // _PyAIT(it)->dataptr = PyArray_BYTES(_PyAIT(it)->ao) + -// __npy_ind * PyArray_DESCR(_PyAIT(it)->ao)->elsize; +// __npy_ind * PyArray_ITEMSIZE(_PyAIT(it)->ao); // else { // _PyAIT(it)->dataptr = PyArray_BYTES(_PyAIT(it)->ao); // for (__npy_i = 0; __npy_i<=_PyAIT(it)->nd_m1; @@ -2914,9 +2818,25 @@ It also looks like Python itself uses sizeof(char) quite a // #define PyArray_MultiIter_NOTDONE(multi) // (_PyMIT(multi)->index < _PyMIT(multi)->size) -// Targeting ../PyArrayMapIterObject.java +@NoException public static native int PyArray_MultiIter_NUMITER(PyArrayMultiIterObject multi); + + +@NoException public static native @Cast("npy_intp") long PyArray_MultiIter_SIZE(PyArrayMultiIterObject multi); + + +@NoException public static native @Cast("npy_intp") long PyArray_MultiIter_INDEX(PyArrayMultiIterObject multi); + + +@NoException public static native int PyArray_MultiIter_NDIM(PyArrayMultiIterObject multi); + + +@NoException public static native @Cast("npy_intp*") SizeTPointer PyArray_MultiIter_DIMS(PyArrayMultiIterObject multi); + + +@NoException public static native @Cast("void**") PointerPointer PyArray_MultiIter_ITERS(PyArrayMultiIterObject multi); + /** enum */ public static final int @@ -2951,6 +2871,7 @@ It also looks like Python itself uses sizeof(char) quite a /* The default array type */ public static final int NPY_DEFAULT_TYPE = NPY_DOUBLE; +/* default integer type defined in npy_2_compat header */ /* * All sorts of useful ways to look into a PyArrayObject. It is recommended @@ -2973,84 +2894,34 @@ It also looks like Python itself uses sizeof(char) quite a // #define PyArray_FORTRAN_IF(m) ((PyArray_CHKFLAGS(m, NPY_ARRAY_F_CONTIGUOUS) ? // NPY_ARRAY_F_CONTIGUOUS : 0)) -// #if (defined(NPY_NO_DEPRECATED_API) && (NPY_1_7_API_VERSION <= NPY_NO_DEPRECATED_API)) -/* - * Changing access macros into functions, to allow for future hiding - * of the internal memory layout. This later hiding will allow the 2.x series - * to change the internal representation of arrays without affecting - * ABI compatibility. - */ - @NoException public static native int PyArray_NDIM(@Const PyArrayObject arr); -@NoException public static native Pointer PyArray_DATA(PyArrayObject arr); +@NoException public static native Pointer PyArray_DATA(@Const PyArrayObject arr); -@NoException public static native @Cast("char*") BytePointer PyArray_BYTES(PyArrayObject arr); +@NoException public static native @Cast("char*") BytePointer PyArray_BYTES(@Const PyArrayObject arr); -@NoException public static native @Cast("npy_intp*") SizeTPointer PyArray_DIMS(PyArrayObject arr); +@NoException public static native @Cast("npy_intp*") SizeTPointer PyArray_DIMS(@Const PyArrayObject arr); -@NoException public static native @Cast("npy_intp*") SizeTPointer PyArray_STRIDES(PyArrayObject arr); +@NoException public static native @Cast("npy_intp*") SizeTPointer PyArray_STRIDES(@Const PyArrayObject arr); @NoException public static native @Cast("npy_intp") long PyArray_DIM(@Const PyArrayObject arr, int idim); @NoException public static native @Cast("npy_intp") long PyArray_STRIDE(@Const PyArrayObject arr, int istride); -@NoException public static native PyObject PyArray_BASE(PyArrayObject arr); +@NoException public static native PyObject PyArray_BASE(@Const PyArrayObject arr); -@NoException public static native PyArray_Descr PyArray_DESCR(PyArrayObject arr); +@NoException public static native PyArray_Descr PyArray_DESCR(@Const PyArrayObject arr); @NoException public static native int PyArray_FLAGS(@Const PyArrayObject arr); -@NoException public static native @Cast("npy_intp") long PyArray_ITEMSIZE(@Const PyArrayObject arr); @NoException public static native int PyArray_TYPE(@Const PyArrayObject arr); @NoException public static native int PyArray_CHKFLAGS(@Const PyArrayObject arr, int flags); -@NoException public static native PyObject PyArray_GETITEM(@Const PyArrayObject arr, @Cast("const char*") BytePointer itemptr); -@NoException public static native PyObject PyArray_GETITEM(@Const PyArrayObject arr, String itemptr); - -/* - * SETITEM should only be used if it is known that the value is a scalar - * and of a type understood by the arrays dtype. - * Use `PyArray_Pack` if the value may be of a different dtype. - */ -@NoException public static native int PyArray_SETITEM(PyArrayObject arr, @Cast("char*") BytePointer itemptr, PyObject v); -@NoException public static native int PyArray_SETITEM(PyArrayObject arr, @Cast("char*") ByteBuffer itemptr, PyObject v); -@NoException public static native int PyArray_SETITEM(PyArrayObject arr, @Cast("char*") byte[] itemptr, PyObject v); +@NoException public static native PyArray_Descr PyArray_DTYPE(@Const PyArrayObject arr); -// #else - -/* These macros are deprecated as of NumPy 1.7. */ -// #define PyArray_NDIM(obj) (((PyArrayObject_fields *)(obj))->nd) -// #define PyArray_BYTES(obj) (((PyArrayObject_fields *)(obj))->data) -// #define PyArray_DATA(obj) ((void *)((PyArrayObject_fields *)(obj))->data) -// #define PyArray_DIMS(obj) (((PyArrayObject_fields *)(obj))->dimensions) -// #define PyArray_STRIDES(obj) (((PyArrayObject_fields *)(obj))->strides) -// #define PyArray_DIM(obj,n) (PyArray_DIMS(obj)[n]) -// #define PyArray_STRIDE(obj,n) (PyArray_STRIDES(obj)[n]) -// #define PyArray_BASE(obj) (((PyArrayObject_fields *)(obj))->base) -// #define PyArray_DESCR(obj) (((PyArrayObject_fields *)(obj))->descr) -// #define PyArray_FLAGS(obj) (((PyArrayObject_fields *)(obj))->flags) -// #define PyArray_CHKFLAGS(m, FLAGS) -// ((((PyArrayObject_fields *)(m))->flags & (FLAGS)) == (FLAGS)) -// #define PyArray_ITEMSIZE(obj) -// (((PyArrayObject_fields *)(obj))->descr->elsize) -// #define PyArray_TYPE(obj) -// (((PyArrayObject_fields *)(obj))->descr->type_num) -// #define PyArray_GETITEM(obj,itemptr) -// PyArray_DESCR(obj)->f->getitem((char *)(itemptr), -// (PyArrayObject *)(obj)) - -// #define PyArray_SETITEM(obj,itemptr,v) -// PyArray_DESCR(obj)->f->setitem((PyObject *)(v), -// (char *)(itemptr), -// (PyArrayObject *)(obj)) -// #endif - -@NoException public static native PyArray_Descr PyArray_DTYPE(PyArrayObject arr); - -@NoException public static native @Cast("npy_intp*") SizeTPointer PyArray_SHAPE(PyArrayObject arr); +@NoException public static native @Cast("npy_intp*") SizeTPointer PyArray_SHAPE(@Const PyArrayObject arr); /* * Enables the specified array flags. Does no checking, @@ -3065,6 +2936,7 @@ It also looks like Python itself uses sizeof(char) quite a @NoException public static native void PyArray_CLEARFLAGS(PyArrayObject arr, int flags); // #if NPY_FEATURE_VERSION >= NPY_1_22_API_VERSION + // #endif // #define PyTypeNum_ISBOOL(type) ((type) == NPY_BOOL) @@ -3097,12 +2969,6 @@ It also looks like Python itself uses sizeof(char) quite a // #define PyTypeNum_ISCOMPLEX(type) (((type) >= NPY_CFLOAT) && // ((type) <= NPY_CLONGDOUBLE)) -// #define PyTypeNum_ISPYTHON(type) (((type) == NPY_LONG) || -// ((type) == NPY_DOUBLE) || -// ((type) == NPY_CDOUBLE) || -// ((type) == NPY_BOOL) || -// ((type) == NPY_OBJECT )) - // #define PyTypeNum_ISFLEXIBLE(type) (((type) >=NPY_STRING) && // ((type) <=NPY_VOID)) @@ -3119,6 +2985,7 @@ It also looks like Python itself uses sizeof(char) quite a // #define PyTypeNum_ISOBJECT(type) ((type) == NPY_OBJECT) +// #define PyDataType_ISLEGACY(dtype) ((dtype)->type_num < NPY_VSTRING && ((dtype)->type_num >= 0)) // #define PyDataType_ISBOOL(obj) PyTypeNum_ISBOOL(((PyArray_Descr*)(obj))->type_num) // #define PyDataType_ISUNSIGNED(obj) PyTypeNum_ISUNSIGNED(((PyArray_Descr*)(obj))->type_num) // #define PyDataType_ISSIGNED(obj) PyTypeNum_ISSIGNED(((PyArray_Descr*)(obj))->type_num) @@ -3127,17 +2994,18 @@ It also looks like Python itself uses sizeof(char) quite a // #define PyDataType_ISNUMBER(obj) PyTypeNum_ISNUMBER(((PyArray_Descr*)(obj))->type_num) // #define PyDataType_ISSTRING(obj) PyTypeNum_ISSTRING(((PyArray_Descr*)(obj))->type_num) // #define PyDataType_ISCOMPLEX(obj) PyTypeNum_ISCOMPLEX(((PyArray_Descr*)(obj))->type_num) -// #define PyDataType_ISPYTHON(obj) PyTypeNum_ISPYTHON(((PyArray_Descr*)(obj))->type_num) // #define PyDataType_ISFLEXIBLE(obj) PyTypeNum_ISFLEXIBLE(((PyArray_Descr*)(obj))->type_num) // #define PyDataType_ISDATETIME(obj) PyTypeNum_ISDATETIME(((PyArray_Descr*)(obj))->type_num) // #define PyDataType_ISUSERDEF(obj) PyTypeNum_ISUSERDEF(((PyArray_Descr*)(obj))->type_num) // #define PyDataType_ISEXTENDED(obj) PyTypeNum_ISEXTENDED(((PyArray_Descr*)(obj))->type_num) // #define PyDataType_ISOBJECT(obj) PyTypeNum_ISOBJECT(((PyArray_Descr*)(obj))->type_num) -// #define PyDataType_HASFIELDS(obj) (((PyArray_Descr *)(obj))->names != NULL) -// #define PyDataType_HASSUBARRAY(dtype) ((dtype)->subarray != NULL) -// #define PyDataType_ISUNSIZED(dtype) ((dtype)->elsize == 0 && -// !PyDataType_HASFIELDS(dtype)) // #define PyDataType_MAKEUNSIZED(dtype) ((dtype)->elsize = 0) +/* + * PyDataType_* FLAGS, FLACHK, REFCHK, HASFIELDS, HASSUBARRAY, UNSIZED, + * SUBARRAY, NAMES, FIELDS, C_METADATA, and METADATA require version specific + * lookup and are defined in npy_2_compat.h. + */ + // #define PyArray_ISBOOL(obj) PyTypeNum_ISBOOL(PyArray_TYPE(obj)) // #define PyArray_ISUNSIGNED(obj) PyTypeNum_ISUNSIGNED(PyArray_TYPE(obj)) @@ -3147,7 +3015,6 @@ It also looks like Python itself uses sizeof(char) quite a // #define PyArray_ISNUMBER(obj) PyTypeNum_ISNUMBER(PyArray_TYPE(obj)) // #define PyArray_ISSTRING(obj) PyTypeNum_ISSTRING(PyArray_TYPE(obj)) // #define PyArray_ISCOMPLEX(obj) PyTypeNum_ISCOMPLEX(PyArray_TYPE(obj)) -// #define PyArray_ISPYTHON(obj) PyTypeNum_ISPYTHON(PyArray_TYPE(obj)) // #define PyArray_ISFLEXIBLE(obj) PyTypeNum_ISFLEXIBLE(PyArray_TYPE(obj)) // #define PyArray_ISDATETIME(obj) PyTypeNum_ISDATETIME(PyArray_TYPE(obj)) // #define PyArray_ISUSERDEF(obj) PyTypeNum_ISUSERDEF(PyArray_TYPE(obj)) @@ -3201,9 +3068,17 @@ It also looks like Python itself uses sizeof(char) quite a // Targeting ../PyArrayInterface.java -// Targeting ../PyDataMem_EventHookFunc.java +// Targeting ../npy_packed_static_string.java + + +// Targeting ../npy_static_string.java + + +// Targeting ../npy_string_allocator.java +// Targeting ../PyArray_StringDTypeObject.java + /* @@ -3258,6 +3133,7 @@ It also looks like Python itself uses sizeof(char) quite a // #include // #include "ndarraytypes.h" +// #include "dtype_api.h" /* Includes the "function" C-API -- these are all stored in a list of pointers --- one for each file @@ -3268,6 +3144,11 @@ They are available as import_array() // #include "__multiarray_api.h" +/* + * Include any definitions which are defined differently for 1.x and 2.x + * (Symbols only available on 2.x are not there, but rather guarded.) + */ +// #include "npy_2_compat.h" /* C-API that requires previous API to be defined */ @@ -3346,11 +3227,6 @@ They are available as import_array() // #define PyArray_FILLWBYTE(obj, val) memset(PyArray_DATA(obj), val, // PyArray_NBYTES(obj)) -// #ifndef PYPY_VERSION -// #define PyArray_REFCOUNT(obj) (((PyObject *)(obj))->ob_refcnt) -// #define NPY_REFCOUNT PyArray_REFCOUNT -// #endif -public static final int NPY_MAX_ELSIZE = (2 * NPY_SIZEOF_LONGDOUBLE); // #define PyArray_ContiguousFromAny(op, type, min_depth, max_depth) // PyArray_FromAny(op, PyArray_DescrFromType(type), min_depth, @@ -3437,12 +3313,6 @@ They are available as import_array() // #define PyArray_Put(ap, items, values) // PyArray_PutTo(ap, items, values, NPY_RAISE) -/* Compatibility with old Numeric stuff -- don't use in new code */ - -// #define PyArray_FromDimsAndData(nd, d, type, data) -// PyArray_FromDimsAndDataAndDescr(nd, d, PyArray_DescrFromType(type), -// data) - /* Check to see if this key in the dictionary is the "title" @@ -3458,6 +3328,54 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields // #define DEPRECATE(msg) PyErr_WarnEx(PyExc_DeprecationWarning,msg,1) // #define DEPRECATE_FUTUREWARNING(msg) PyErr_WarnEx(PyExc_FutureWarning,msg,1) + +/* + * These macros and functions unfortunately require runtime version checks + * that are only defined in `npy_2_compat.h`. For that reasons they cannot be + * part of `ndarraytypes.h` which tries to be self contained. + */ + +@NoException public static native @Cast("npy_intp") long PyArray_ITEMSIZE(@Const PyArrayObject arr); + +// #define PyDataType_HASFIELDS(obj) (PyDataType_ISLEGACY((PyArray_Descr*)(obj)) && PyDataType_NAMES((PyArray_Descr*)(obj)) != NULL) +// #define PyDataType_HASSUBARRAY(dtype) (PyDataType_ISLEGACY(dtype) && PyDataType_SUBARRAY(dtype) != NULL) +// #define PyDataType_ISUNSIZED(dtype) ((dtype)->elsize == 0 && +// !PyDataType_HASFIELDS(dtype)) + +// #define PyDataType_FLAGCHK(dtype, flag) +// ((PyDataType_FLAGS(dtype) & (flag)) == (flag)) + +// #define PyDataType_REFCHK(dtype) +// PyDataType_FLAGCHK(dtype, NPY_ITEM_REFCOUNT) + +// #define NPY_BEGIN_THREADS_DESCR(dtype) +// do {if (!(PyDataType_FLAGCHK((dtype), NPY_NEEDS_PYAPI))) +// NPY_BEGIN_THREADS;} while (0); + +// #define NPY_END_THREADS_DESCR(dtype) +// do {if (!(PyDataType_FLAGCHK((dtype), NPY_NEEDS_PYAPI))) +// NPY_END_THREADS; } while (0); + +// #if !(defined(NPY_INTERNAL_BUILD) && NPY_INTERNAL_BUILD) +/* The internal copy of this is now defined in `dtypemeta.h` */ +/* + * `PyArray_Scalar` is the same as this function but converts will convert + * most NumPy types to Python scalars. + */ +@NoException public static native PyObject PyArray_GETITEM(@Const PyArrayObject arr, @Cast("const char*") BytePointer itemptr); +@NoException public static native PyObject PyArray_GETITEM(@Const PyArrayObject arr, String itemptr); + +/* + * SETITEM should only be used if it is known that the value is a scalar + * and of a type understood by the arrays dtype. + * Use `PyArray_Pack` if the value may be of a different dtype. + */ +@NoException public static native int PyArray_SETITEM(PyArrayObject arr, @Cast("char*") BytePointer itemptr, PyObject v); +@NoException public static native int PyArray_SETITEM(PyArrayObject arr, @Cast("char*") ByteBuffer itemptr, PyObject v); +@NoException public static native int PyArray_SETITEM(PyArrayObject arr, @Cast("char*") byte[] itemptr, PyObject v); +// #endif /* not internal */ + + // #ifdef __cplusplus // #endif @@ -3465,26 +3383,454 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields // #endif /* NUMPY_CORE_INCLUDE_NUMPY_NDARRAYOBJECT_H_ */ +// Parsed from dtype_api.h + +/* + * The public DType API + */ + +// #ifndef NUMPY_CORE_INCLUDE_NUMPY___DTYPE_API_H_ +// #define NUMPY_CORE_INCLUDE_NUMPY___DTYPE_API_H_ +// Targeting ../PyArrayMethodObject_tag.java + + +// Targeting ../PyArray_DTypeMeta.java + + + +// #else + +// #endif /* Py_LIMITED_API */ + +// #endif /* not internal build */ + +/* + * ****************************************************** + * ArrayMethod API (Casting and UFuncs) + * ****************************************************** + */ + + +/** enum NPY_ARRAYMETHOD_FLAGS */ +public static final int + /* Flag for whether the GIL is required */ + NPY_METH_REQUIRES_PYAPI = 1 << 0, + /* + * Some functions cannot set floating point error flags, this flag + * gives us the option (not requirement) to skip floating point error + * setup/check. No function should set error flags and ignore them + * since it would interfere with chaining operations (e.g. casting). + */ + NPY_METH_NO_FLOATINGPOINT_ERRORS = 1 << 1, + /* Whether the method supports unaligned access (not runtime) */ + NPY_METH_SUPPORTS_UNALIGNED = 1 << 2, + /* + * Used for reductions to allow reordering the operation. At this point + * assume that if set, it also applies to normal operations though! + */ + NPY_METH_IS_REORDERABLE = 1 << 3, + /* + * Private flag for now for *logic* functions. The logical functions + * `logical_or` and `logical_and` can always cast the inputs to booleans + * "safely" (because that is how the cast to bool is defined). + * @seberg: I am not sure this is the best way to handle this, so its + * private for now (also it is very limited anyway). + * There is one "exception". NA aware dtypes cannot cast to bool + * (hopefully), so the `??->?` loop should error even with this flag. + * But a second NA fallback loop will be necessary. + */ + _NPY_METH_FORCE_CAST_INPUTS = 1 << 17, + + /* All flags which can change at runtime */ + NPY_METH_RUNTIME_FLAGS = ( + NPY_METH_REQUIRES_PYAPI | + NPY_METH_NO_FLOATINGPOINT_ERRORS); +// Targeting ../PyArrayMethod_Context.java + + +// Targeting ../PyArrayMethod_Spec.java + + + + +/* + * ArrayMethod slots + * ----------------- + * + * SLOTS IDs For the ArrayMethod creation, once fully public, IDs are fixed + * but can be deprecated and arbitrarily extended. + */ +public static final int _NPY_METH_resolve_descriptors_with_scalars = 1; +public static final int NPY_METH_resolve_descriptors = 2; +public static final int NPY_METH_get_loop = 3; +public static final int NPY_METH_get_reduction_initial = 4; +/* specific loops for constructions/default get_loop: */ +public static final int NPY_METH_strided_loop = 5; +public static final int NPY_METH_contiguous_loop = 6; +public static final int NPY_METH_unaligned_strided_loop = 7; +public static final int NPY_METH_unaligned_contiguous_loop = 8; +public static final int NPY_METH_contiguous_indexed_loop = 9; +public static final int _NPY_METH_static_data = 10; +// Targeting ../PyArrayMethod_ResolveDescriptors.java + + +// Targeting ../PyArrayMethod_ResolveDescriptorsWithScalar.java + + +// Targeting ../PyArrayMethod_StridedLoop.java + + +// Targeting ../PyArrayMethod_GetLoop.java + + +// Targeting ../PyArrayMethod_GetReductionInitial.java + + +// Targeting ../PyArrayMethod_TranslateGivenDescriptors.java + + +// Targeting ../PyArrayMethod_TranslateLoopDescriptors.java + + +// Targeting ../PyArrayMethod_TraverseLoop.java + + +// Targeting ../PyArrayMethod_GetTraverseLoop.java + + +// Targeting ../PyArrayMethod_PromoterFunction.java + + + +/* + * **************************** + * DTYPE API + * **************************** + */ + +public static final int NPY_DT_ABSTRACT = 1 << 1; +public static final int NPY_DT_PARAMETRIC = 1 << 2; +public static final int NPY_DT_NUMERIC = 1 << 3; + +/* + * These correspond to slots in the NPY_DType_Slots struct and must + * be in the same order as the members of that struct. If new slots + * get added or old slots get removed NPY_NUM_DTYPE_SLOTS must also + * be updated + */ + +public static final int NPY_DT_discover_descr_from_pyobject = 1; +// this slot is considered private because its API hasn't been decided +public static final int _NPY_DT_is_known_scalar_type = 2; +public static final int NPY_DT_default_descr = 3; +public static final int NPY_DT_common_dtype = 4; +public static final int NPY_DT_common_instance = 5; +public static final int NPY_DT_ensure_canonical = 6; +public static final int NPY_DT_setitem = 7; +public static final int NPY_DT_getitem = 8; +public static final int NPY_DT_get_clear_loop = 9; +public static final int NPY_DT_get_fill_zero_loop = 10; +public static final int NPY_DT_finalize_descr = 11; + +// These PyArray_ArrFunc slots will be deprecated and replaced eventually +// getitem and setitem can be defined as a performance optimization; +// by default the user dtypes call `legacy_getitem_using_DType` and +// `legacy_setitem_using_DType`, respectively. This functionality is +// only supported for basic NumPy DTypes. + + +// used to separate dtype slots from arrfuncs slots +// intended only for internal use but defined here for clarity +public static final int _NPY_DT_ARRFUNCS_OFFSET = (1 << 10); + +// Cast is disabled +// #define NPY_DT_PyArray_ArrFuncs_cast 0 + _NPY_DT_ARRFUNCS_OFFSET + +public static final int NPY_DT_PyArray_ArrFuncs_getitem = 1 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_setitem = 2 + _NPY_DT_ARRFUNCS_OFFSET; + +// Copyswap is disabled +// #define NPY_DT_PyArray_ArrFuncs_copyswapn 3 + _NPY_DT_ARRFUNCS_OFFSET +// #define NPY_DT_PyArray_ArrFuncs_copyswap 4 + _NPY_DT_ARRFUNCS_OFFSET +public static final int NPY_DT_PyArray_ArrFuncs_compare = 5 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_argmax = 6 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_dotfunc = 7 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_scanfunc = 8 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_fromstr = 9 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_nonzero = 10 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_fill = 11 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_fillwithscalar = 12 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_sort = 13 + _NPY_DT_ARRFUNCS_OFFSET; +public static final int NPY_DT_PyArray_ArrFuncs_argsort = 14 + _NPY_DT_ARRFUNCS_OFFSET; + +// Casting related slots are disabled. See +// https://github.com/numpy/numpy/pull/23173#discussion_r1101098163 +// #define NPY_DT_PyArray_ArrFuncs_castdict 15 + _NPY_DT_ARRFUNCS_OFFSET +// #define NPY_DT_PyArray_ArrFuncs_scalarkind 16 + _NPY_DT_ARRFUNCS_OFFSET +// #define NPY_DT_PyArray_ArrFuncs_cancastscalarkindto 17 + _NPY_DT_ARRFUNCS_OFFSET +// #define NPY_DT_PyArray_ArrFuncs_cancastto 18 + _NPY_DT_ARRFUNCS_OFFSET + +// These are deprecated in NumPy 1.19, so are disabled here. +// #define NPY_DT_PyArray_ArrFuncs_fastclip 19 + _NPY_DT_ARRFUNCS_OFFSET +// #define NPY_DT_PyArray_ArrFuncs_fastputmask 20 + _NPY_DT_ARRFUNCS_OFFSET +// #define NPY_DT_PyArray_ArrFuncs_fasttake 21 + _NPY_DT_ARRFUNCS_OFFSET +public static final int NPY_DT_PyArray_ArrFuncs_argmin = 22 + _NPY_DT_ARRFUNCS_OFFSET; +// Targeting ../PyArrayDTypeMeta_Spec.java + + +// Targeting ../PyArrayDTypeMeta_DiscoverDescrFromPyobject.java + + +// Targeting ../PyArrayDTypeMeta_IsKnownScalarType.java + + +// Targeting ../PyArrayDTypeMeta_DefaultDescriptor.java + + +// Targeting ../PyArrayDTypeMeta_CommonDType.java + + + + +/* + * Convenience utility for getting a reference to the DType metaclass associated + * with a dtype instance. + */ +// #define NPY_DTYPE(descr) ((PyArray_DTypeMeta *)Py_TYPE(descr)) + +@NoException public static native PyArray_DTypeMeta NPY_DT_NewRef(PyArray_DTypeMeta o); +// Targeting ../PyArrayDTypeMeta_CommonInstance.java + + +// Targeting ../PyArrayDTypeMeta_EnsureCanonical.java + + +// Targeting ../PyArrayDTypeMeta_FinalizeDescriptor.java + + +// Targeting ../PyArrayDTypeMeta_SetItem.java + + +// Targeting ../PyArrayDTypeMeta_GetItem.java + + + +// #endif /* NUMPY_CORE_INCLUDE_NUMPY___DTYPE_API_H_ */ + + +// Parsed from npy_2_compat.h + +/* + * This header file defines relevant features which: + * - Require runtime inspection depending on the NumPy version. + * - May be needed when compiling with an older version of NumPy to allow + * a smooth transition. + * + * As such, it is shipped with NumPy 2.0, but designed to be vendored in full + * or parts by downstream projects. + * + * It must be included after any other includes. `import_array()` must have + * been called in the scope or version dependency will misbehave, even when + * only `PyUFunc_` API is used. + * + * If required complicated defs (with inline functions) should be written as: + * + * #if NPY_FEATURE_VERSION >= NPY_2_0_API_VERSION + * Simple definition when NumPy 2.0 API is guaranteed. + * #else + * static inline definition of a 1.x compatibility shim + * #if NPY_ABI_VERSION < 0x02000000 + * Make 1.x compatibility shim the public API (1.x only branch) + * #else + * Runtime dispatched version (1.x or 2.x) + * #endif + * #endif + * + * An internal build always passes NPY_FEATURE_VERSION >= NPY_2_0_API_VERSION + */ + +// #ifndef NUMPY_CORE_INCLUDE_NUMPY_NPY_2_COMPAT_H_ +// #define NUMPY_CORE_INCLUDE_NUMPY_NPY_2_COMPAT_H_ + +/* + * New macros for accessing real and complex part of a complex number can be + * found in "npy_2_complexcompat.h". + */ + + +/* + * This header is meant to be included by downstream directly for 1.x compat. + * In that case we need to ensure that users first included the full headers + * and not just `ndarraytypes.h`. + */ + +// #ifndef NPY_FEATURE_VERSION +// #error "The NumPy 2 compat header requires `import_array()` for which " +// "the `ndarraytypes.h` header include is not sufficient. Please " +// "include it after `numpy/ndarrayobject.h` or similar.\n" +// "To simplify inclusion, you may use `PyArray_ImportNumPy()` " +// "which is defined in the compat header and is lightweight (can be)." +// #endif + +// #if NPY_ABI_VERSION < 0x02000000 +// #endif + + +/* + * Define a better way to call `_import_array()` to simplify backporting as + * we now require imports more often (necessary to make ABI flexible). + */ +// #ifdef import_array1 + +@NoException public static native int PyArray_ImportNumPyAPI(); + +// #endif /* import_array1 */ + + +/* + * NPY_DEFAULT_INT + * + * The default integer has changed, `NPY_DEFAULT_INT` is available at runtime + * for use as type number, e.g. `PyArray_DescrFromType(NPY_DEFAULT_INT)`. + * + * NPY_RAVEL_AXIS + * + * This was introduced in NumPy 2.0 to allow indicating that an axis should be + * raveled in an operation. Before NumPy 2.0, NPY_MAXDIMS was used for this purpose. + * + * NPY_MAXDIMS + * + * A constant indicating the maximum number dimensions allowed when creating + * an ndarray. + * + * NPY_NTYPES_LEGACY + * + * The number of built-in NumPy dtypes. + */ +// #if NPY_FEATURE_VERSION >= NPY_2_0_API_VERSION + public static native @MemberGetter long NPY_DEFAULT_INT(); + public static final long NPY_DEFAULT_INT = NPY_DEFAULT_INT(); + public static native @MemberGetter long NPY_RAVEL_AXIS(); + public static final long NPY_RAVEL_AXIS = NPY_RAVEL_AXIS(); + public static final int NPY_MAXARGS = 64; + +// #elif NPY_ABI_VERSION < 0x02000000 +// #else +// #endif + + +/* + * Access inline functions for descriptor fields. Except for the first + * few fields, these needed to be moved (elsize, alignment) for + * additional space. Or they are descriptor specific and are not generally + * available anymore (metadata, c_metadata, subarray, names, fields). + * + * Most of these are defined via the `DESCR_ACCESSOR` macro helper. + */ +// #if NPY_FEATURE_VERSION >= NPY_2_0_API_VERSION || NPY_ABI_VERSION < 0x02000000 + /* Compiling for 1.x or 2.x only, direct field access is OK: */ + + @NoException public static native void PyDataType_SET_ELSIZE(PyArray_Descr dtype, @Cast("npy_intp") long size); + + @NoException public static native @Cast("npy_uint64") long PyDataType_FLAGS(@Const PyArray_Descr dtype); + +// #define DESCR_ACCESSOR(FIELD, field, type, legacy_only) +// static inline type +// PyDataType_##FIELD(const PyArray_Descr *dtype) { +// if (legacy_only && !PyDataType_ISLEGACY(dtype)) { +// return (type)0; +// } +// return ((_PyArray_LegacyDescr *)dtype)->field; +// } +// #else /* compiling for both 1.x and 2.x */ + + /* Cast to LegacyDescr always fine but needed when `legacy_only` */ +// #define DESCR_ACCESSOR(FIELD, field, type, legacy_only) +// static inline type +// PyDataType_##FIELD(const PyArray_Descr *dtype) { +// if (legacy_only && !PyDataType_ISLEGACY(dtype)) { +// return (type)0; +// } +// if (PyArray_RUNTIME_VERSION >= NPY_2_0_API_VERSION) { +// return ((_PyArray_LegacyDescr *)dtype)->field; +// } +// else { +// return ((PyArray_DescrProto *)dtype)->field; +// } +// } +// #endif + +@NoException public static native @Cast("npy_intp") long PyDataType_ELSIZE(@Const PyArray_Descr dtype); +@NoException public static native @Cast("npy_intp") long PyDataType_ALIGNMENT(@Const PyArray_Descr dtype); +@NoException public static native PyObject PyDataType_METADATA(@Const PyArray_Descr dtype); +@NoException public static native PyArray_ArrayDescr PyDataType_SUBARRAY(@Const PyArray_Descr dtype); +@NoException public static native PyObject PyDataType_NAMES(@Const PyArray_Descr dtype); +@NoException public static native PyObject PyDataType_FIELDS(@Const PyArray_Descr dtype); +@NoException public static native NpyAuxData PyDataType_C_METADATA(@Const PyArray_Descr dtype); + +// #undef DESCR_ACCESSOR + + +// #if !(defined(NPY_INTERNAL_BUILD) && NPY_INTERNAL_BUILD) +// #if NPY_FEATURE_VERSION >= NPY_2_0_API_VERSION + @NoException public static native PyArray_ArrFuncs PyDataType_GetArrFuncs(@Const PyArray_Descr descr); +// #elif NPY_ABI_VERSION < 0x02000000 +// #else +// #endif + + +// #endif /* not internal build */ + +// #endif /* NUMPY_CORE_INCLUDE_NUMPY_NPY_2_COMPAT_H_ */ + + +// Parsed from npy_2_complexcompat.h + +/* This header is designed to be copy-pasted into downstream packages, since it provides + a compatibility layer between the old C struct complex types and the new native C99 + complex types. The new macros are in numpy/npy_math.h, which is why it is included here. */ +// #ifndef NUMPY_CORE_INCLUDE_NUMPY_NPY_2_COMPLEXCOMPAT_H_ +// #define NUMPY_CORE_INCLUDE_NUMPY_NPY_2_COMPLEXCOMPAT_H_ + +// #include + +// #ifndef NPY_CSETREALF +// #define NPY_CSETREALF(c, r) (c)->real = (r) +// #endif +// #ifndef NPY_CSETIMAGF +// #define NPY_CSETIMAGF(c, i) (c)->imag = (i) +// #endif +// #ifndef NPY_CSETREAL +// #define NPY_CSETREAL(c, r) (c)->real = (r) +// #endif +// #ifndef NPY_CSETIMAG +// #define NPY_CSETIMAG(c, i) (c)->imag = (i) +// #endif +// #ifndef NPY_CSETREALL +// #define NPY_CSETREALL(c, r) (c)->real = (r) +// #endif +// #ifndef NPY_CSETIMAGL +// #define NPY_CSETIMAGL(c, i) (c)->imag = (i) +// #endif + +// #endif + + // Parsed from __multiarray_api.h // #if defined(_MULTIARRAYMODULE) || defined(WITH_CPYCHECKER_STEALS_REFERENCE_TO_ARG_ATTRIBUTE) - public static native @ByRef PyBoolScalarObject _PyArrayScalar_BoolValues(int i); public static native void _PyArrayScalar_BoolValues(int i, PyBoolScalarObject setter); @MemberGetter public static native PyBoolScalarObject _PyArrayScalar_BoolValues(); @NoException public static native @Cast("unsigned int") int PyArray_GetNDArrayCVersion(); -public static native @ByRef PyTypeObject PyBigArray_Type(); public static native void PyBigArray_Type(PyTypeObject setter); - public static native @ByRef PyTypeObject PyArray_Type(); public static native void PyArray_Type(PyTypeObject setter); public static native @ByRef PyTypeObject PyArrayDescr_Type(); public static native void PyArrayDescr_Type(PyTypeObject setter); // #define PyArrayDescr_Type (*(PyTypeObject *)(&PyArrayDescr_TypeFull)) -public static native @ByRef PyTypeObject PyArrayFlags_Type(); public static native void PyArrayFlags_Type(PyTypeObject setter); - public static native @ByRef PyTypeObject PyArrayIter_Type(); public static native void PyArrayIter_Type(PyTypeObject setter); public static native @ByRef PyTypeObject PyArrayMultiIter_Type(); public static native void PyArrayMultiIter_Type(PyTypeObject setter); @@ -3553,8 +3899,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields public static native @ByRef PyTypeObject PyVoidArrType_Type(); public static native void PyVoidArrType_Type(PyTypeObject setter); -@NoException public static native int PyArray_SetNumericOps(PyObject arg0); -@NoException public static native PyObject PyArray_GetNumericOps(); @NoException public static native int PyArray_INCREF(PyArrayObject arg0); @NoException public static native int PyArray_XDECREF(PyArrayObject arg0); @NoException public static native void PyArray_SetStringFunction(PyObject arg0, int arg1); @@ -3563,8 +3907,8 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native @Cast("char*") BytePointer PyArray_Zero(PyArrayObject arg0); @NoException public static native @Cast("char*") BytePointer PyArray_One(PyArrayObject arg0); @NoException public static native PyObject PyArray_CastToType(PyArrayObject arg0, PyArray_Descr arg1, int arg2); -@NoException public static native int PyArray_CastTo(PyArrayObject arg0, PyArrayObject arg1); -@NoException public static native int PyArray_CastAnyTo(PyArrayObject arg0, PyArrayObject arg1); +@NoException public static native int PyArray_CopyInto(PyArrayObject arg0, PyArrayObject arg1); +@NoException public static native int PyArray_CopyAnyInto(PyArrayObject arg0, PyArrayObject arg1); @NoException public static native int PyArray_CanCastSafely(int arg0, int arg1); @NoException public static native @Cast("npy_bool") byte PyArray_CanCastTo(PyArray_Descr arg0, PyArray_Descr arg1); @NoException public static native int PyArray_ObjectType(PyObject arg0, int arg1); @@ -3580,14 +3924,7 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native void PyArray_ScalarAsCtype(PyObject arg0, Pointer arg1); @NoException public static native int PyArray_CastScalarToCtype(PyObject arg0, Pointer arg1, PyArray_Descr arg2); @NoException public static native int PyArray_CastScalarDirect(PyObject arg0, PyArray_Descr arg1, Pointer arg2, int arg3); -@NoException public static native PyObject PyArray_ScalarFromObject(PyObject arg0); -@NoException public static native PyArray_VectorUnaryFunc PyArray_GetCastFunc(PyArray_Descr arg0, int arg1); -@NoException public static native PyObject PyArray_FromDims(int __NPY_UNUSED_TAGGEDnd, IntPointer __NPY_UNUSED_TAGGEDd, int __NPY_UNUSED_TAGGEDtype ); -@NoException public static native PyObject PyArray_FromDims(int __NPY_UNUSED_TAGGEDnd, IntBuffer __NPY_UNUSED_TAGGEDd, int __NPY_UNUSED_TAGGEDtype ); -@NoException public static native PyObject PyArray_FromDims(int __NPY_UNUSED_TAGGEDnd, int[] __NPY_UNUSED_TAGGEDd, int __NPY_UNUSED_TAGGEDtype ); -@NoException public static native PyObject PyArray_FromDimsAndDataAndDescr(int __NPY_UNUSED_TAGGEDnd, IntPointer __NPY_UNUSED_TAGGEDd, PyArray_Descr arg2, @Cast("char*") BytePointer __NPY_UNUSED_TAGGEDdata ); -@NoException public static native PyObject PyArray_FromDimsAndDataAndDescr(int __NPY_UNUSED_TAGGEDnd, IntBuffer __NPY_UNUSED_TAGGEDd, PyArray_Descr arg2, @Cast("char*") ByteBuffer __NPY_UNUSED_TAGGEDdata ); -@NoException public static native PyObject PyArray_FromDimsAndDataAndDescr(int __NPY_UNUSED_TAGGEDnd, int[] __NPY_UNUSED_TAGGEDd, PyArray_Descr arg2, @Cast("char*") byte[] __NPY_UNUSED_TAGGEDdata ); +@NoException public static native int PyArray_Pack(PyArray_Descr arg0, Pointer arg1, PyObject arg2); @NoException public static native PyObject PyArray_FromAny(PyObject arg0, PyArray_Descr arg1, int arg2, int arg3, int arg4, PyObject arg5); @NoException public static native PyObject PyArray_EnsureArray(PyObject arg0); @NoException public static native PyObject PyArray_EnsureAnyArray(PyObject arg0); @@ -3604,9 +3941,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native int PyArray_SetField(PyArrayObject arg0, PyArray_Descr arg1, int arg2, PyObject arg3); @NoException public static native PyObject PyArray_Byteswap(PyArrayObject arg0, @Cast("npy_bool") byte arg1); @NoException public static native PyObject PyArray_Resize(PyArrayObject arg0, PyArray_Dims arg1, int arg2, @Cast("NPY_ORDER") int __NPY_UNUSED_TAGGEDorder ); -@NoException public static native int PyArray_MoveInto(PyArrayObject arg0, PyArrayObject arg1); -@NoException public static native int PyArray_CopyInto(PyArrayObject arg0, PyArrayObject arg1); -@NoException public static native int PyArray_CopyAnyInto(PyArrayObject arg0, PyArrayObject arg1); @NoException public static native int PyArray_CopyObject(PyArrayObject arg0, PyObject arg1); @NoException public static native PyObject PyArray_NewCopy(PyArrayObject arg0, @Cast("NPY_ORDER") int arg1); @NoException public static native PyObject PyArray_ToList(PyArrayObject arg0); @@ -3628,7 +3962,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native int PyArray_PyIntAsInt(PyObject arg0); @NoException public static native @Cast("npy_intp") long PyArray_PyIntAsIntp(PyObject arg0); @NoException public static native int PyArray_Broadcast(PyArrayMultiIterObject arg0); -@NoException public static native void PyArray_FillObjectArray(PyArrayObject arg0, PyObject arg1); @NoException public static native int PyArray_FillWithScalar(PyArrayObject arg0, PyObject arg1); @NoException public static native @Cast("npy_bool") byte PyArray_CheckStrides(int arg0, int arg1, @Cast("npy_intp") long arg2, @Cast("npy_intp") long arg3, @Cast("const npy_intp*") SizeTPointer arg4, @Cast("const npy_intp*") SizeTPointer arg5); @NoException public static native PyArray_Descr PyArray_DescrNewByteorder(PyArray_Descr arg0, @Cast("char") byte arg1); @@ -3643,11 +3976,7 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native @Cast("NPY_SCALARKIND") int PyArray_ScalarKind(int arg0, @Cast("PyArrayObject**") PointerPointer arg1); @NoException public static native @Cast("NPY_SCALARKIND") int PyArray_ScalarKind(int arg0, @ByPtrPtr PyArrayObject arg1); @NoException public static native int PyArray_CanCoerceScalar(int arg0, int arg1, @Cast("NPY_SCALARKIND") int arg2); -@NoException public static native PyObject PyArray_NewFlagsObject(PyObject arg0); @NoException public static native @Cast("npy_bool") byte PyArray_CanCastScalar(PyTypeObject arg0, PyTypeObject arg1); -@NoException public static native int PyArray_CompareUCS4(@Cast("const npy_ucs4*") IntPointer arg0, @Cast("const npy_ucs4*") IntPointer arg1, @Cast("size_t") long arg2); -@NoException public static native int PyArray_CompareUCS4(@Cast("const npy_ucs4*") IntBuffer arg0, @Cast("const npy_ucs4*") IntBuffer arg1, @Cast("size_t") long arg2); -@NoException public static native int PyArray_CompareUCS4(@Cast("const npy_ucs4*") int[] arg0, @Cast("const npy_ucs4*") int[] arg1, @Cast("size_t") long arg2); @NoException public static native int PyArray_RemoveSmallest(PyArrayMultiIterObject arg0); @NoException public static native int PyArray_ElementStrides(PyObject arg0); @NoException public static native void PyArray_Item_INCREF(@Cast("char*") BytePointer arg0, PyArray_Descr arg1); @@ -3656,7 +3985,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native void PyArray_Item_XDECREF(@Cast("char*") BytePointer arg0, PyArray_Descr arg1); @NoException public static native void PyArray_Item_XDECREF(@Cast("char*") ByteBuffer arg0, PyArray_Descr arg1); @NoException public static native void PyArray_Item_XDECREF(@Cast("char*") byte[] arg0, PyArray_Descr arg1); -@NoException public static native PyObject PyArray_FieldNames(PyObject arg0); @NoException public static native PyObject PyArray_Transpose(PyArrayObject arg0, PyArray_Dims arg1); @NoException public static native PyObject PyArray_TakeFrom(PyArrayObject arg0, PyObject arg1, int arg2, PyArrayObject arg3, @Cast("NPY_CLIPMODE") int arg4); @NoException public static native PyObject PyArray_PutTo(PyArrayObject arg0, PyObject arg1, PyObject arg2, @Cast("NPY_CLIPMODE") int arg3); @@ -3700,14 +4028,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native int PyArray_CompareLists(@Cast("const npy_intp*") SizeTPointer arg0, @Cast("const npy_intp*") SizeTPointer arg1, int arg2); @NoException public static native int PyArray_AsCArray(@Cast("PyObject**") PointerPointer arg0, Pointer arg1, @Cast("npy_intp*") SizeTPointer arg2, int arg3, PyArray_Descr arg4); @NoException public static native int PyArray_AsCArray(@ByPtrPtr PyObject arg0, Pointer arg1, @Cast("npy_intp*") SizeTPointer arg2, int arg3, PyArray_Descr arg4); -@NoException public static native int PyArray_As1D(@Cast("PyObject**") PointerPointer __NPY_UNUSED_TAGGEDop, @Cast("char**") PointerPointer __NPY_UNUSED_TAGGEDptr, IntPointer __NPY_UNUSED_TAGGEDd1, int __NPY_UNUSED_TAGGEDtypecode ); -@NoException public static native int PyArray_As1D(@ByPtrPtr PyObject __NPY_UNUSED_TAGGEDop, @Cast("char**") @ByPtrPtr BytePointer __NPY_UNUSED_TAGGEDptr, IntPointer __NPY_UNUSED_TAGGEDd1, int __NPY_UNUSED_TAGGEDtypecode ); -@NoException public static native int PyArray_As1D(@ByPtrPtr PyObject __NPY_UNUSED_TAGGEDop, @Cast("char**") @ByPtrPtr ByteBuffer __NPY_UNUSED_TAGGEDptr, IntBuffer __NPY_UNUSED_TAGGEDd1, int __NPY_UNUSED_TAGGEDtypecode ); -@NoException public static native int PyArray_As1D(@ByPtrPtr PyObject __NPY_UNUSED_TAGGEDop, @Cast("char**") @ByPtrPtr byte[] __NPY_UNUSED_TAGGEDptr, int[] __NPY_UNUSED_TAGGEDd1, int __NPY_UNUSED_TAGGEDtypecode ); -@NoException public static native int PyArray_As2D(@Cast("PyObject**") PointerPointer __NPY_UNUSED_TAGGEDop, @Cast("char***") @ByPtrPtr PointerPointer __NPY_UNUSED_TAGGEDptr, IntPointer __NPY_UNUSED_TAGGEDd1, IntPointer __NPY_UNUSED_TAGGEDd2, int __NPY_UNUSED_TAGGEDtypecode ); -@NoException public static native int PyArray_As2D(@ByPtrPtr PyObject __NPY_UNUSED_TAGGEDop, @Cast("char***") @ByPtrPtr PointerPointer __NPY_UNUSED_TAGGEDptr, IntPointer __NPY_UNUSED_TAGGEDd1, IntPointer __NPY_UNUSED_TAGGEDd2, int __NPY_UNUSED_TAGGEDtypecode ); -@NoException public static native int PyArray_As2D(@ByPtrPtr PyObject __NPY_UNUSED_TAGGEDop, @Cast("char***") @ByPtrPtr PointerPointer __NPY_UNUSED_TAGGEDptr, IntBuffer __NPY_UNUSED_TAGGEDd1, IntBuffer __NPY_UNUSED_TAGGEDd2, int __NPY_UNUSED_TAGGEDtypecode ); -@NoException public static native int PyArray_As2D(@ByPtrPtr PyObject __NPY_UNUSED_TAGGEDop, @Cast("char***") @ByPtrPtr PointerPointer __NPY_UNUSED_TAGGEDptr, int[] __NPY_UNUSED_TAGGEDd1, int[] __NPY_UNUSED_TAGGEDd2, int __NPY_UNUSED_TAGGEDtypecode ); @NoException public static native int PyArray_Free(PyObject arg0, Pointer arg1); @NoException public static native int PyArray_Converter(PyObject arg0, @Cast("PyObject**") PointerPointer arg1); @NoException public static native int PyArray_Converter(PyObject arg0, @ByPtrPtr PyObject arg1); @@ -3715,9 +4035,7 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native PyObject PyArray_Concatenate(PyObject arg0, int arg1); @NoException public static native PyObject PyArray_InnerProduct(PyObject arg0, PyObject arg1); @NoException public static native PyObject PyArray_MatrixProduct(PyObject arg0, PyObject arg1); -@NoException public static native PyObject PyArray_CopyAndTranspose(PyObject arg0); @NoException public static native PyObject PyArray_Correlate(PyObject arg0, PyObject arg1, int arg2); -@NoException public static native int PyArray_TypestrConvert(int arg0, int arg1); @NoException public static native int PyArray_DescrConverter(PyObject arg0, @Cast("PyArray_Descr**") PointerPointer arg1); @NoException public static native int PyArray_DescrConverter(PyObject arg0, @ByPtrPtr PyArray_Descr arg1); @NoException public static native int PyArray_DescrConverter2(PyObject arg0, @Cast("PyArray_Descr**") PointerPointer arg1); @@ -3748,21 +4066,17 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native PyObject PyArray_LexSort(PyObject arg0, int arg1); @NoException public static native PyObject PyArray_Round(PyArrayObject arg0, int arg1, PyArrayObject arg2); @NoException public static native @Cast("unsigned char") byte PyArray_EquivTypenums(int arg0, int arg1); -@NoException public static native int PyArray_RegisterDataType(PyArray_Descr arg0); +@NoException public static native int PyArray_RegisterDataType(PyArray_DescrProto arg0); @NoException public static native int PyArray_RegisterCastFunc(PyArray_Descr arg0, int arg1, PyArray_VectorUnaryFunc arg2); @NoException public static native int PyArray_RegisterCanCast(PyArray_Descr arg0, int arg1, @Cast("NPY_SCALARKIND") int arg2); @NoException public static native void PyArray_InitArrFuncs(PyArray_ArrFuncs arg0); @NoException public static native PyObject PyArray_IntTupleFromIntp(int arg0, @Cast("const npy_intp*") SizeTPointer arg1); -@NoException public static native int PyArray_TypeNumFromName(@Cast("const char*") BytePointer arg0); -@NoException public static native int PyArray_TypeNumFromName(String arg0); @NoException public static native int PyArray_ClipmodeConverter(PyObject arg0, @Cast("NPY_CLIPMODE*") IntPointer arg1); @NoException public static native int PyArray_ClipmodeConverter(PyObject arg0, @Cast("NPY_CLIPMODE*") IntBuffer arg1); @NoException public static native int PyArray_ClipmodeConverter(PyObject arg0, @Cast("NPY_CLIPMODE*") int[] arg1); @NoException public static native int PyArray_OutputConverter(PyObject arg0, @Cast("PyArrayObject**") PointerPointer arg1); @NoException public static native int PyArray_OutputConverter(PyObject arg0, @ByPtrPtr PyArrayObject arg1); @NoException public static native PyObject PyArray_BroadcastToShape(PyObject arg0, @Cast("npy_intp*") SizeTPointer arg1, int arg2); -@NoException public static native void _PyArray_SigintHandler(int arg0); -@NoException public static native Pointer _PyArray_GetSigintBuf(); @NoException public static native int PyArray_DescrAlignConverter(PyObject arg0, @Cast("PyArray_Descr**") PointerPointer arg1); @NoException public static native int PyArray_DescrAlignConverter(PyObject arg0, @ByPtrPtr PyArray_Descr arg1); @NoException public static native int PyArray_DescrAlignConverter2(PyObject arg0, @Cast("PyArray_Descr**") PointerPointer arg1); @@ -3772,8 +4086,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native PyObject PyArray_CheckAxis(PyArrayObject arg0, IntBuffer arg1, int arg2); @NoException public static native PyObject PyArray_CheckAxis(PyArrayObject arg0, int[] arg1, int arg2); @NoException public static native @Cast("npy_intp") long PyArray_OverflowMultiplyList(@Cast("const npy_intp*") SizeTPointer arg0, int arg1); -@NoException public static native int PyArray_CompareString(@Cast("const char*") BytePointer arg0, @Cast("const char*") BytePointer arg1, @Cast("size_t") long arg2); -@NoException public static native int PyArray_CompareString(String arg0, String arg1, @Cast("size_t") long arg2); @NoException public static native PyObject PyArray_MultiIterFromObjects(@Cast("PyObject**") PointerPointer arg0, int arg1, int arg2); @NoException public static native PyObject PyArray_MultiIterFromObjects(@ByPtrPtr PyObject arg0, int arg1, int arg2); @NoException public static native int PyArray_GetEndianness(); @@ -3790,11 +4102,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields public static native @ByRef PyTypeObject NpyIter_Type(); public static native void NpyIter_Type(PyTypeObject setter); -@NoException public static native void PyArray_SetDatetimeParseFunction(PyObject __NPY_UNUSED_TAGGEDop ); -@NoException public static native void PyArray_DatetimeToDatetimeStruct(@Cast("npy_datetime") long __NPY_UNUSED_TAGGEDval, @Cast("NPY_DATETIMEUNIT") int __NPY_UNUSED_TAGGEDfr, npy_datetimestruct arg2); -@NoException public static native void PyArray_TimedeltaToTimedeltaStruct(@Cast("npy_timedelta") long __NPY_UNUSED_TAGGEDval, @Cast("NPY_DATETIMEUNIT") int __NPY_UNUSED_TAGGEDfr, npy_timedeltastruct arg2); -@NoException public static native @Cast("npy_datetime") long PyArray_DatetimeStructToDatetime(@Cast("NPY_DATETIMEUNIT") int __NPY_UNUSED_TAGGEDfr, npy_datetimestruct __NPY_UNUSED_TAGGEDd ); -@NoException public static native @Cast("npy_datetime") long PyArray_TimedeltaStructToTimedelta(@Cast("NPY_DATETIMEUNIT") int __NPY_UNUSED_TAGGEDfr, npy_timedeltastruct __NPY_UNUSED_TAGGEDd ); @NoException public static native NpyIter NpyIter_New(PyArrayObject arg0, @Cast("npy_uint32") int arg1, @Cast("NPY_ORDER") int arg2, @Cast("NPY_CASTING") int arg3, PyArray_Descr arg4); @NoException public static native NpyIter NpyIter_MultiNew(int arg0, @Cast("PyArrayObject**") PointerPointer arg1, @Cast("npy_uint32") int arg2, @Cast("NPY_ORDER") int arg3, @Cast("NPY_CASTING") int arg4, @Cast("npy_uint32*") IntPointer arg5, @Cast("PyArray_Descr**") PointerPointer arg6); @NoException public static native NpyIter NpyIter_MultiNew(int arg0, @ByPtrPtr PyArrayObject arg1, @Cast("npy_uint32") int arg2, @Cast("NPY_ORDER") int arg3, @Cast("NPY_CASTING") int arg4, @Cast("npy_uint32*") IntPointer arg5, @ByPtrPtr PyArray_Descr arg6); @@ -3880,10 +4187,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native PyArrayObject PyArray_EinsteinSum(@Cast("char*") ByteBuffer arg0, @Cast("npy_intp") long arg1, @ByPtrPtr PyArrayObject arg2, PyArray_Descr arg3, @Cast("NPY_ORDER") int arg4, @Cast("NPY_CASTING") int arg5, PyArrayObject arg6); @NoException public static native PyArrayObject PyArray_EinsteinSum(@Cast("char*") byte[] arg0, @Cast("npy_intp") long arg1, @ByPtrPtr PyArrayObject arg2, PyArray_Descr arg3, @Cast("NPY_ORDER") int arg4, @Cast("NPY_CASTING") int arg5, PyArrayObject arg6); @NoException public static native PyObject PyArray_NewLikeArray(PyArrayObject arg0, @Cast("NPY_ORDER") int arg1, PyArray_Descr arg2, int arg3); -@NoException public static native int PyArray_GetArrayParamsFromObject(PyObject __NPY_UNUSED_TAGGEDop, PyArray_Descr __NPY_UNUSED_TAGGEDrequested_dtype, @Cast("npy_bool") byte __NPY_UNUSED_TAGGEDwriteable, @Cast("PyArray_Descr**") PointerPointer __NPY_UNUSED_TAGGEDout_dtype, IntPointer __NPY_UNUSED_TAGGEDout_ndim, @Cast("npy_intp*") SizeTPointer __NPY_UNUSED_TAGGEDout_dims, @Cast("PyArrayObject**") PointerPointer __NPY_UNUSED_TAGGEDout_arr, PyObject __NPY_UNUSED_TAGGEDcontext ); -@NoException public static native int PyArray_GetArrayParamsFromObject(PyObject __NPY_UNUSED_TAGGEDop, PyArray_Descr __NPY_UNUSED_TAGGEDrequested_dtype, @Cast("npy_bool") byte __NPY_UNUSED_TAGGEDwriteable, @ByPtrPtr PyArray_Descr __NPY_UNUSED_TAGGEDout_dtype, IntPointer __NPY_UNUSED_TAGGEDout_ndim, @Cast("npy_intp*") SizeTPointer __NPY_UNUSED_TAGGEDout_dims, @ByPtrPtr PyArrayObject __NPY_UNUSED_TAGGEDout_arr, PyObject __NPY_UNUSED_TAGGEDcontext ); -@NoException public static native int PyArray_GetArrayParamsFromObject(PyObject __NPY_UNUSED_TAGGEDop, PyArray_Descr __NPY_UNUSED_TAGGEDrequested_dtype, @Cast("npy_bool") byte __NPY_UNUSED_TAGGEDwriteable, @ByPtrPtr PyArray_Descr __NPY_UNUSED_TAGGEDout_dtype, IntBuffer __NPY_UNUSED_TAGGEDout_ndim, @Cast("npy_intp*") SizeTPointer __NPY_UNUSED_TAGGEDout_dims, @ByPtrPtr PyArrayObject __NPY_UNUSED_TAGGEDout_arr, PyObject __NPY_UNUSED_TAGGEDcontext ); -@NoException public static native int PyArray_GetArrayParamsFromObject(PyObject __NPY_UNUSED_TAGGEDop, PyArray_Descr __NPY_UNUSED_TAGGEDrequested_dtype, @Cast("npy_bool") byte __NPY_UNUSED_TAGGEDwriteable, @ByPtrPtr PyArray_Descr __NPY_UNUSED_TAGGEDout_dtype, int[] __NPY_UNUSED_TAGGEDout_ndim, @Cast("npy_intp*") SizeTPointer __NPY_UNUSED_TAGGEDout_dims, @ByPtrPtr PyArrayObject __NPY_UNUSED_TAGGEDout_arr, PyObject __NPY_UNUSED_TAGGEDcontext ); @NoException public static native int PyArray_ConvertClipmodeSequence(PyObject arg0, @Cast("NPY_CLIPMODE*") IntPointer arg1, int arg2); @NoException public static native int PyArray_ConvertClipmodeSequence(PyObject arg0, @Cast("NPY_CLIPMODE*") IntBuffer arg1, int arg2); @NoException public static native int PyArray_ConvertClipmodeSequence(PyObject arg0, @Cast("NPY_CLIPMODE*") int[] arg1, int arg2); @@ -3901,14 +4204,8 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native Pointer PyDataMem_NEW(@Cast("size_t") long arg0); @NoException public static native void PyDataMem_FREE(Pointer arg0); @NoException public static native Pointer PyDataMem_RENEW(Pointer arg0, @Cast("size_t") long arg1); -@NoException public static native PyDataMem_EventHookFunc PyDataMem_SetEventHook(PyDataMem_EventHookFunc arg0, Pointer arg1, @Cast("void**") PointerPointer arg2); -@NoException public static native PyDataMem_EventHookFunc PyDataMem_SetEventHook(PyDataMem_EventHookFunc arg0, Pointer arg1, @Cast("void**") @ByPtrPtr Pointer arg2); public static native @Cast("NPY_CASTING") int NPY_DEFAULT_ASSIGN_CASTING(); public static native void NPY_DEFAULT_ASSIGN_CASTING(int setter); -@NoException public static native void PyArray_MapIterSwapAxes(PyArrayMapIterObject arg0, @Cast("PyArrayObject**") PointerPointer arg1, int arg2); -@NoException public static native void PyArray_MapIterSwapAxes(PyArrayMapIterObject arg0, @ByPtrPtr PyArrayObject arg1, int arg2); -@NoException public static native PyObject PyArray_MapIterArray(PyArrayObject arg0, PyObject arg1); -@NoException public static native void PyArray_MapIterNext(PyArrayMapIterObject arg0); @NoException public static native int PyArray_Partition(PyArrayObject arg0, PyArrayObject arg1, int arg2, @Cast("NPY_SELECTKIND") int arg3); @NoException public static native PyObject PyArray_ArgPartition(PyArrayObject arg0, PyArrayObject arg1, int arg2, @Cast("NPY_SELECTKIND") int arg3); @NoException public static native int PyArray_SelectkindConverter(PyObject arg0, @Cast("NPY_SELECTKIND*") IntPointer arg1); @@ -3916,13 +4213,43 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native int PyArray_SelectkindConverter(PyObject arg0, @Cast("NPY_SELECTKIND*") int[] arg1); @NoException public static native Pointer PyDataMem_NEW_ZEROED(@Cast("size_t") long arg0, @Cast("size_t") long arg1); @NoException public static native int PyArray_CheckAnyScalarExact(PyObject arg0); -@NoException public static native PyObject PyArray_MapIterArrayCopyIfOverlap(PyArrayObject arg0, PyObject arg1, int arg2, PyArrayObject arg3); @NoException public static native int PyArray_ResolveWritebackIfCopy(PyArrayObject arg0); @NoException public static native int PyArray_SetWritebackIfCopyBase(PyArrayObject arg0, PyArrayObject arg1); public static native PyObject PyDataMem_DefaultHandler(); public static native void PyDataMem_DefaultHandler(PyObject setter); +@NoException public static native int NpyDatetime_ConvertDatetime64ToDatetimeStruct(PyArray_DatetimeMetaData arg0, @Cast("npy_datetime") long arg1, npy_datetimestruct arg2); +@NoException public static native int NpyDatetime_ConvertDatetimeStructToDatetime64(PyArray_DatetimeMetaData arg0, @Const npy_datetimestruct arg1, @Cast("npy_datetime*") CLongPointer arg2); +@NoException public static native int NpyDatetime_ConvertPyDateTimeToDatetimeStruct(PyObject arg0, npy_datetimestruct arg1, @Cast("NPY_DATETIMEUNIT*") IntPointer arg2, int arg3); +@NoException public static native int NpyDatetime_ConvertPyDateTimeToDatetimeStruct(PyObject arg0, npy_datetimestruct arg1, @Cast("NPY_DATETIMEUNIT*") IntBuffer arg2, int arg3); +@NoException public static native int NpyDatetime_ConvertPyDateTimeToDatetimeStruct(PyObject arg0, npy_datetimestruct arg1, @Cast("NPY_DATETIMEUNIT*") int[] arg2, int arg3); +@NoException public static native int NpyDatetime_GetDatetimeISO8601StrLen(int arg0, @Cast("NPY_DATETIMEUNIT") int arg1); +@NoException public static native int NpyDatetime_MakeISO8601Datetime(npy_datetimestruct arg0, @Cast("char*") BytePointer arg1, @Cast("npy_intp") long arg2, int arg3, int arg4, @Cast("NPY_DATETIMEUNIT") int arg5, int arg6, @Cast("NPY_CASTING") int arg7); +@NoException public static native int NpyDatetime_MakeISO8601Datetime(npy_datetimestruct arg0, @Cast("char*") ByteBuffer arg1, @Cast("npy_intp") long arg2, int arg3, int arg4, @Cast("NPY_DATETIMEUNIT") int arg5, int arg6, @Cast("NPY_CASTING") int arg7); +@NoException public static native int NpyDatetime_MakeISO8601Datetime(npy_datetimestruct arg0, @Cast("char*") byte[] arg1, @Cast("npy_intp") long arg2, int arg3, int arg4, @Cast("NPY_DATETIMEUNIT") int arg5, int arg6, @Cast("NPY_CASTING") int arg7); +@NoException public static native int NpyDatetime_ParseISO8601Datetime(@Cast("const char*") BytePointer arg0, @Cast("Py_ssize_t") long arg1, @Cast("NPY_DATETIMEUNIT") int arg2, @Cast("NPY_CASTING") int arg3, npy_datetimestruct arg4, @Cast("NPY_DATETIMEUNIT*") IntPointer arg5, @Cast("npy_bool*") BytePointer arg6); +@NoException public static native int NpyDatetime_ParseISO8601Datetime(String arg0, @Cast("Py_ssize_t") long arg1, @Cast("NPY_DATETIMEUNIT") int arg2, @Cast("NPY_CASTING") int arg3, npy_datetimestruct arg4, @Cast("NPY_DATETIMEUNIT*") IntBuffer arg5, @Cast("npy_bool*") ByteBuffer arg6); +@NoException public static native int NpyDatetime_ParseISO8601Datetime(@Cast("const char*") BytePointer arg0, @Cast("Py_ssize_t") long arg1, @Cast("NPY_DATETIMEUNIT") int arg2, @Cast("NPY_CASTING") int arg3, npy_datetimestruct arg4, @Cast("NPY_DATETIMEUNIT*") int[] arg5, @Cast("npy_bool*") byte[] arg6); +@NoException public static native int NpyDatetime_ParseISO8601Datetime(String arg0, @Cast("Py_ssize_t") long arg1, @Cast("NPY_DATETIMEUNIT") int arg2, @Cast("NPY_CASTING") int arg3, npy_datetimestruct arg4, @Cast("NPY_DATETIMEUNIT*") IntPointer arg5, @Cast("npy_bool*") BytePointer arg6); +@NoException public static native int NpyDatetime_ParseISO8601Datetime(@Cast("const char*") BytePointer arg0, @Cast("Py_ssize_t") long arg1, @Cast("NPY_DATETIMEUNIT") int arg2, @Cast("NPY_CASTING") int arg3, npy_datetimestruct arg4, @Cast("NPY_DATETIMEUNIT*") IntBuffer arg5, @Cast("npy_bool*") ByteBuffer arg6); +@NoException public static native int NpyDatetime_ParseISO8601Datetime(String arg0, @Cast("Py_ssize_t") long arg1, @Cast("NPY_DATETIMEUNIT") int arg2, @Cast("NPY_CASTING") int arg3, npy_datetimestruct arg4, @Cast("NPY_DATETIMEUNIT*") int[] arg5, @Cast("npy_bool*") byte[] arg6); +@NoException public static native int NpyString_load(npy_string_allocator arg0, @Const npy_packed_static_string arg1, npy_static_string arg2); +@NoException public static native int NpyString_pack(npy_string_allocator arg0, npy_packed_static_string arg1, @Cast("const char*") BytePointer arg2, @Cast("size_t") long arg3); +@NoException public static native int NpyString_pack(npy_string_allocator arg0, npy_packed_static_string arg1, String arg2, @Cast("size_t") long arg3); +@NoException public static native int NpyString_pack_null(npy_string_allocator arg0, npy_packed_static_string arg1); +@NoException public static native npy_string_allocator NpyString_acquire_allocator(@Const PyArray_StringDTypeObject arg0); +@NoException public static native void NpyString_acquire_allocators(@Cast("size_t") long arg0, @Cast("PyArray_Descr*const*") PointerPointer descrs, @Cast("npy_string_allocator**") PointerPointer allocators); +@NoException public static native void NpyString_acquire_allocators(@Cast("size_t") long arg0, @ByPtrPtr PyArray_Descr descrs, @ByPtrPtr npy_string_allocator allocators); +@NoException public static native void NpyString_release_allocator(npy_string_allocator arg0); +@NoException public static native void NpyString_release_allocators(@Cast("size_t") long arg0, @Cast("npy_string_allocator**") PointerPointer allocators); +@NoException public static native void NpyString_release_allocators(@Cast("size_t") long arg0, @ByPtrPtr npy_string_allocator allocators); +@NoException public static native PyArray_Descr PyArray_GetDefaultDescr(PyArray_DTypeMeta arg0); +@NoException public static native int PyArrayInitDTypeMeta_FromSpec(PyArray_DTypeMeta arg0, PyArrayDTypeMeta_Spec arg1); +@NoException public static native PyArray_DTypeMeta PyArray_CommonDType(PyArray_DTypeMeta arg0, PyArray_DTypeMeta arg1); +@NoException public static native PyArray_DTypeMeta PyArray_PromoteDTypeSequence(@Cast("npy_intp") long arg0, @Cast("PyArray_DTypeMeta**") PointerPointer arg1); +@NoException public static native PyArray_DTypeMeta PyArray_PromoteDTypeSequence(@Cast("npy_intp") long arg0, @ByPtrPtr PyArray_DTypeMeta arg1); +@NoException public static native PyArray_ArrFuncs _PyDataType_GetArrFuncs(@Const PyArray_Descr arg0); // #else @@ -3932,6 +4259,7 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields // #if defined(NO_IMPORT) || defined(NO_IMPORT_ARRAY) public static native Pointer PyArray_API(int i); public static native void PyArray_API(int i, Pointer setter); public static native @Cast("void**") PointerPointer PyArray_API(); public static native void PyArray_API(PointerPointer setter); +public static native int PyArray_RUNTIME_VERSION(); public static native void PyArray_RUNTIME_VERSION(int setter); // #else // #if defined(PY_ARRAY_UNIQUE_SYMBOL) // #else @@ -3939,14 +4267,44 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields // #endif +/* + * The DType classes are inconvenient for the Python generation so exposed + * manually in the header below (may be moved). + */ +// #include "numpy/_public_dtype_api_table.h" + // #if !defined(NO_IMPORT_ARRAY) && !defined(NO_IMPORT) @NoException public static native int _import_array(); -// #define import_array() {if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import"); return NULL; } } - -// #define import_array1(ret) {if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import"); return ret; } } - -// #define import_array2(msg, ret) {if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, msg); return ret; } } +// #define import_array() { +// if (_import_array() < 0) { +// PyErr_Print(); +// PyErr_SetString( +// PyExc_ImportError, +// "numpy._core.multiarray failed to import" +// ); +// return NULL; +// } +// } + +// #define import_array1(ret) { +// if (_import_array() < 0) { +// PyErr_Print(); +// PyErr_SetString( +// PyExc_ImportError, +// "numpy._core.multiarray failed to import" +// ); +// return ret; +// } +// } + +// #define import_array2(msg, ret) { +// if (_import_array() < 0) { +// PyErr_Print(); +// PyErr_SetString(PyExc_ImportError, msg); +// return ret; +// } +// } // #endif @@ -4012,18 +4370,12 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields public static native @ByRef PyTypeObject PyUFunc_Type(); public static native void PyUFunc_Type(PyTypeObject setter); -@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") PointerPointer arg1, @Cast("char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9); -@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9); -@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") ByteBuffer arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9); -@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") byte[] arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9); -@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9); -@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") ByteBuffer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9); -@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") byte[] arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9); +@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void*const*") PointerPointer arg1, @Cast("const char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9); +@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void*const*") @ByPtrPtr Pointer arg1, @Cast("const char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9); +@NoException public static native PyObject PyUFunc_FromFuncAndData(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void*const*") @ByPtrPtr Pointer arg1, String arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9); @NoException public static native int PyUFunc_RegisterLoopForType(PyUFuncObject arg0, int arg1, PyUFuncGenericFunction arg2, @Const IntPointer arg3, Pointer arg4); @NoException public static native int PyUFunc_RegisterLoopForType(PyUFuncObject arg0, int arg1, PyUFuncGenericFunction arg2, @Const IntBuffer arg3, Pointer arg4); @NoException public static native int PyUFunc_RegisterLoopForType(PyUFuncObject arg0, int arg1, PyUFuncGenericFunction arg2, @Const int[] arg3, Pointer arg4); -@NoException public static native int PyUFunc_GenericFunction(PyUFuncObject __NPY_UNUSED_TAGGEDufunc, PyObject __NPY_UNUSED_TAGGEDargs, PyObject __NPY_UNUSED_TAGGEDkwds, @Cast("PyArrayObject**") PointerPointer __NPY_UNUSED_TAGGEDop ); -@NoException public static native int PyUFunc_GenericFunction(PyUFuncObject __NPY_UNUSED_TAGGEDufunc, PyObject __NPY_UNUSED_TAGGEDargs, PyObject __NPY_UNUSED_TAGGEDkwds, @ByPtrPtr PyArrayObject __NPY_UNUSED_TAGGEDop ); @NoException public static native void PyUFunc_f_f_As_d_d(@Cast("char**") PointerPointer arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); @NoException public static native void PyUFunc_f_f_As_d_d(@Cast("char**") @ByPtrPtr BytePointer arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); @NoException public static native void PyUFunc_f_f_As_d_d(@Cast("char**") @ByPtrPtr ByteBuffer arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); @@ -4108,30 +4460,14 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native void PyUFunc_On_Om(@Cast("char**") @ByPtrPtr BytePointer arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); @NoException public static native void PyUFunc_On_Om(@Cast("char**") @ByPtrPtr ByteBuffer arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); @NoException public static native void PyUFunc_On_Om(@Cast("char**") @ByPtrPtr byte[] arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); -@NoException public static native int PyUFunc_GetPyValues(@Cast("char*") BytePointer arg0, IntPointer arg1, IntPointer arg2, @Cast("PyObject**") PointerPointer arg3); -@NoException public static native int PyUFunc_GetPyValues(@Cast("char*") BytePointer arg0, IntPointer arg1, IntPointer arg2, @ByPtrPtr PyObject arg3); -@NoException public static native int PyUFunc_GetPyValues(@Cast("char*") ByteBuffer arg0, IntBuffer arg1, IntBuffer arg2, @ByPtrPtr PyObject arg3); -@NoException public static native int PyUFunc_GetPyValues(@Cast("char*") byte[] arg0, int[] arg1, int[] arg2, @ByPtrPtr PyObject arg3); -@NoException public static native int PyUFunc_checkfperr(int arg0, PyObject arg1, IntPointer arg2); -@NoException public static native int PyUFunc_checkfperr(int arg0, PyObject arg1, IntBuffer arg2); -@NoException public static native int PyUFunc_checkfperr(int arg0, PyObject arg1, int[] arg2); @NoException public static native void PyUFunc_clearfperr(); @NoException public static native int PyUFunc_getfperr(); -@NoException public static native int PyUFunc_handlefperr(int arg0, PyObject arg1, int arg2, IntPointer arg3); -@NoException public static native int PyUFunc_handlefperr(int arg0, PyObject arg1, int arg2, IntBuffer arg3); -@NoException public static native int PyUFunc_handlefperr(int arg0, PyObject arg1, int arg2, int[] arg3); @NoException public static native int PyUFunc_ReplaceLoopBySignature(PyUFuncObject arg0, PyUFuncGenericFunction arg1, @Const IntPointer arg2, @ByPtrPtr PyUFuncGenericFunction arg3); @NoException public static native int PyUFunc_ReplaceLoopBySignature(PyUFuncObject arg0, PyUFuncGenericFunction arg1, @Const IntBuffer arg2, @ByPtrPtr PyUFuncGenericFunction arg3); @NoException public static native int PyUFunc_ReplaceLoopBySignature(PyUFuncObject arg0, PyUFuncGenericFunction arg1, @Const int[] arg2, @ByPtrPtr PyUFuncGenericFunction arg3); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") PointerPointer arg1, @Cast("char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") ByteBuffer arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9, String arg10); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") byte[] arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9, String arg10); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") ByteBuffer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") byte[] arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9, String arg10); -@NoException public static native int PyUFunc_SetUsesArraysAsData(@Cast("void**") PointerPointer __NPY_UNUSED_TAGGEDdata, @Cast("size_t") long __NPY_UNUSED_TAGGEDi ); -@NoException public static native int PyUFunc_SetUsesArraysAsData(@Cast("void**") @ByPtrPtr Pointer __NPY_UNUSED_TAGGEDdata, @Cast("size_t") long __NPY_UNUSED_TAGGEDi ); +@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void*const*") PointerPointer arg1, @Cast("const char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10); +@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void*const*") @ByPtrPtr Pointer arg1, @Cast("const char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10); +@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignature(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void*const*") @ByPtrPtr Pointer arg1, String arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9, String arg10); @NoException public static native void PyUFunc_e_e(@Cast("char**") PointerPointer arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); @NoException public static native void PyUFunc_e_e(@Cast("char**") @ByPtrPtr BytePointer arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); @NoException public static native void PyUFunc_e_e(@Cast("char**") @ByPtrPtr ByteBuffer arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); @@ -4158,17 +4494,19 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields @NoException public static native void PyUFunc_ee_e_As_dd_d(@Cast("char**") @ByPtrPtr byte[] arg0, @Cast("const npy_intp*") SizeTPointer arg1, @Cast("const npy_intp*") SizeTPointer arg2, Pointer arg3); @NoException public static native int PyUFunc_DefaultTypeResolver(PyUFuncObject arg0, @Cast("NPY_CASTING") int arg1, @Cast("PyArrayObject**") PointerPointer arg2, PyObject arg3, @Cast("PyArray_Descr**") PointerPointer arg4); @NoException public static native int PyUFunc_DefaultTypeResolver(PyUFuncObject arg0, @Cast("NPY_CASTING") int arg1, @ByPtrPtr PyArrayObject arg2, PyObject arg3, @ByPtrPtr PyArray_Descr arg4); -@NoException public static native int PyUFunc_ValidateCasting(PyUFuncObject arg0, @Cast("NPY_CASTING") int arg1, @Cast("PyArrayObject**") PointerPointer arg2, @Cast("PyArray_Descr**") PointerPointer arg3); +@NoException public static native int PyUFunc_ValidateCasting(PyUFuncObject arg0, @Cast("NPY_CASTING") int arg1, @Cast("PyArrayObject**") PointerPointer arg2, @Cast("PyArray_Descr*const*") PointerPointer arg3); @NoException public static native int PyUFunc_ValidateCasting(PyUFuncObject arg0, @Cast("NPY_CASTING") int arg1, @ByPtrPtr PyArrayObject arg2, @ByPtrPtr PyArray_Descr arg3); @NoException public static native int PyUFunc_RegisterLoopForDescr(PyUFuncObject arg0, PyArray_Descr arg1, PyUFuncGenericFunction arg2, @Cast("PyArray_Descr**") PointerPointer arg3, Pointer arg4); @NoException public static native int PyUFunc_RegisterLoopForDescr(PyUFuncObject arg0, PyArray_Descr arg1, PyUFuncGenericFunction arg2, @ByPtrPtr PyArray_Descr arg3, Pointer arg4); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") PointerPointer arg1, @Cast("char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10, PyObject arg11); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10, PyObject arg11); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") ByteBuffer arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9, String arg10, PyObject arg11); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") byte[] arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10, PyObject arg11); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9, String arg10, PyObject arg11); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") ByteBuffer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10, PyObject arg11); -@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void**") @ByPtrPtr Pointer arg1, @Cast("char*") byte[] arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9, String arg10, PyObject arg11); +@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void*const*") PointerPointer arg1, @Cast("const char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10, PyObject arg11); +@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void*const*") @ByPtrPtr Pointer arg1, @Cast("const char*") BytePointer arg2, int arg3, int arg4, int arg5, int arg6, @Cast("const char*") BytePointer arg7, @Cast("const char*") BytePointer arg8, int arg9, @Cast("const char*") BytePointer arg10, PyObject arg11); +@NoException public static native PyObject PyUFunc_FromFuncAndDataAndSignatureAndIdentity(@ByPtrPtr PyUFuncGenericFunction arg0, @Cast("void*const*") @ByPtrPtr Pointer arg1, String arg2, int arg3, int arg4, int arg5, int arg6, String arg7, String arg8, int arg9, String arg10, PyObject arg11); +@NoException public static native int PyUFunc_AddLoopFromSpec(PyObject arg0, PyArrayMethod_Spec arg1); +@NoException public static native int PyUFunc_AddPromoter(PyObject arg0, PyObject arg1, PyObject arg2); +@NoException public static native int PyUFunc_AddWrappingLoop(PyObject arg0, @Cast("PyArray_DTypeMeta**") PointerPointer new_dtypes, @Cast("PyArray_DTypeMeta**") PointerPointer wrapped_dtypes, PyArrayMethod_TranslateGivenDescriptors arg3, PyArrayMethod_TranslateLoopDescriptors arg4); +@NoException public static native int PyUFunc_AddWrappingLoop(PyObject arg0, @ByPtrPtr PyArray_DTypeMeta new_dtypes, @ByPtrPtr PyArray_DTypeMeta wrapped_dtypes, PyArrayMethod_TranslateGivenDescriptors arg3, PyArrayMethod_TranslateLoopDescriptors arg4); +@NoException public static native int PyUFunc_GiveFloatingpointErrors(@Cast("const char*") BytePointer arg0, int arg1); +@NoException public static native int PyUFunc_GiveFloatingpointErrors(String arg0, int arg1); // #else @@ -4206,9 +4544,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields // Targeting ../PyUFunc_TypeResolutionFunc.java -// Targeting ../PyUFunc_LegacyInnerLoopSelectionFunc.java - - // Targeting ../PyUFuncObject.java @@ -4222,34 +4557,10 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields /* flags inferred during execution */ public static final int UFUNC_CORE_DIM_MISSING = 0x00040000; -public static final int UFUNC_ERR_IGNORE = 0; -public static final int UFUNC_ERR_WARN = 1; -public static final int UFUNC_ERR_RAISE = 2; -public static final int UFUNC_ERR_CALL = 3; -public static final int UFUNC_ERR_PRINT = 4; -public static final int UFUNC_ERR_LOG = 5; - - /* Python side integer mask */ - -public static final int UFUNC_MASK_DIVIDEBYZERO = 0x07; -public static final int UFUNC_MASK_OVERFLOW = 0x3f; -public static final int UFUNC_MASK_UNDERFLOW = 0x1ff; -public static final int UFUNC_MASK_INVALID = 0xfff; - -public static final int UFUNC_SHIFT_DIVIDEBYZERO = 0; -public static final int UFUNC_SHIFT_OVERFLOW = 3; -public static final int UFUNC_SHIFT_UNDERFLOW = 6; -public static final int UFUNC_SHIFT_INVALID = 9; - public static final int UFUNC_OBJ_ISOBJECT = 1; public static final int UFUNC_OBJ_NEEDS_API = 2; - /* Default user error mode */ -public static final int UFUNC_ERR_DEFAULT = - (UFUNC_ERR_WARN << UFUNC_SHIFT_DIVIDEBYZERO) + - (UFUNC_ERR_WARN << UFUNC_SHIFT_OVERFLOW) + - (UFUNC_ERR_WARN << UFUNC_SHIFT_INVALID); // #if NPY_ALLOW_THREADS // #define NPY_LOOP_BEGIN_THREADS do {if (!(loop->obj & UFUNC_OBJ_NEEDS_API)) _save = PyEval_SaveThread();} while (0); @@ -4302,8 +4613,6 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields -// #include "__ufunc_api.h" - public static final String UFUNC_PYVALS_NAME = "UFUNC_PYVALS"; /* @@ -4328,6 +4637,8 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields // #endif // #endif +// #include "__ufunc_api.h" + // #ifdef __cplusplus // #endif diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_cdouble.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_cdouble.java index 1f8764e087a..8fe3abfd1d1 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_cdouble.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_cdouble.java @@ -14,7 +14,9 @@ import static org.bytedeco.numpy.global.numpy.*; -// #endif + +// #if defined(__cplusplus) + @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) public class npy_cdouble extends Pointer { static { Loader.load(); } @@ -32,5 +34,7 @@ public class npy_cdouble extends Pointer { @Override public npy_cdouble getPointer(long i) { return new npy_cdouble((Pointer)this).offsetAddress(i); } - public native double real(); public native npy_cdouble real(double setter); -public native double imag(); public native npy_cdouble imag(double setter); } + + public native double _Val(int i); public native npy_cdouble _Val(int i, double setter); + @MemberGetter public native DoublePointer _Val(); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_cfloat.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_cfloat.java index 312e158e8c4..34d61a9fbb6 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_cfloat.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_cfloat.java @@ -14,7 +14,7 @@ import static org.bytedeco.numpy.global.numpy.*; -// #endif + @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) public class npy_cfloat extends Pointer { static { Loader.load(); } @@ -32,5 +32,7 @@ public class npy_cfloat extends Pointer { @Override public npy_cfloat getPointer(long i) { return new npy_cfloat((Pointer)this).offsetAddress(i); } - public native float real(); public native npy_cfloat real(float setter); -public native float imag(); public native npy_cfloat imag(float setter); } + + public native float _Val(int i); public native npy_cfloat _Val(int i, float setter); + @MemberGetter public native FloatPointer _Val(); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_clongdouble.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_clongdouble.java index 0f549205e57..6f06e2bdec0 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_clongdouble.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_clongdouble.java @@ -14,7 +14,7 @@ import static org.bytedeco.numpy.global.numpy.*; -// #endif + @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) public class npy_clongdouble extends Pointer { static { Loader.load(); } @@ -32,5 +32,7 @@ public class npy_clongdouble extends Pointer { @Override public npy_clongdouble getPointer(long i) { return new npy_clongdouble((Pointer)this).offsetAddress(i); } - public native @Cast("npy_longdouble") double real(); public native npy_clongdouble real(double setter); -public native @Cast("npy_longdouble") double imag(); public native npy_clongdouble imag(double setter); } + + public native @Cast("long double") double _Val(int i); public native npy_clongdouble _Val(int i, double setter); + @MemberGetter public native @Cast("long double*") Pointer _Val(); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_packed_static_string.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_packed_static_string.java new file mode 100644 index 00000000000..bad96559d79 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_packed_static_string.java @@ -0,0 +1,34 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + + +/**************************************** + * NpyString + * + * Types used by the NpyString API. + ****************************************/ + +/* + * A "packed" encoded string. The string data must be accessed by first unpacking the string. + */ +@Opaque @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class npy_packed_static_string extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public npy_packed_static_string() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public npy_packed_static_string(Pointer p) { super(p); } +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_static_string.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_static_string.java new file mode 100644 index 00000000000..6cc1722c07e --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_static_string.java @@ -0,0 +1,41 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +/* + * An unpacked read-only view onto the data in a packed string + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class npy_static_string extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public npy_static_string() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public npy_static_string(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public npy_static_string(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public npy_static_string position(long position) { + return (npy_static_string)super.position(position); + } + @Override public npy_static_string getPointer(long i) { + return new npy_static_string((Pointer)this).offsetAddress(i); + } + + public native @Cast("size_t") long size(); public native npy_static_string size(long setter); + public native @Cast("const char*") BytePointer buf(); public native npy_static_string buf(BytePointer setter); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_string_allocator.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_string_allocator.java new file mode 100644 index 00000000000..dc48494cdd3 --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_string_allocator.java @@ -0,0 +1,27 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +/* + * Handles heap allocations for static strings. + */ +@Opaque @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class npy_string_allocator extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public npy_string_allocator() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public npy_string_allocator(Pointer p) { super(p); } +} diff --git a/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java b/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java index 2873528887f..c850c9aedc8 100644 --- a/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java +++ b/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Samuel Audet + * Copyright (C) 2019-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -44,6 +44,7 @@ inherit = {openblas.class, python.class}, value = { @Platform( + define = "NPY_TARGET_VERSION NPY_2_0_API_VERSION", cinclude = { "_numpyconfig.h", "numpyconfig.h", @@ -52,7 +53,7 @@ "npy_os.h", "npy_cpu.h", "npy_endian.h", - "npy_interrupt.h", +// "npy_interrupt.h", "npy_math.h", // "npy_math_internal.h", "halffloat.h", @@ -61,6 +62,9 @@ "arrayscalars.h", "ndarraytypes.h", "ndarrayobject.h", + "dtype_api.h", + "npy_2_compat.h", + "npy_2_complexcompat.h", "__multiarray_api.h", "_neighborhood_iterator_imp.h", // "noprefix.h", @@ -104,9 +108,9 @@ public static File[] cachePackages() throws IOException { public void map(InfoMap infoMap) { infoMap.put(new Info("__multiarray_api.h").linePatterns("#define PyArray_GetNDArrayCVersion .*", - "#define PyDataMem_DefaultHandler .*").skip()) + " PyArray_API\\[365\\]\\)").skip()) .put(new Info("__ufunc_api.h").linePatterns("#define PyUFunc_Type .*", - " PyUFunc_API\\[42\\]\\)").skip()) + " PyUFunc_API\\[46\\]\\)").skip()) .put(new Info("npy_math.h").linePatterns("#define npy_.*").skip()) .put(new Info("NPY_VISIBILITY_HIDDEN", "NPY_FEATURE_VERSION", "NPY_NOINLINE", "NPY_GCC_UNROLL_LOOPS", "NPY_GCC_OPT_3", @@ -145,11 +149,11 @@ public void map(InfoMap infoMap) { .put(new Info("defined(_MSC_VER) && defined(_WIN64) && (_MSC_VER > 1400) ||" + " defined(__MINGW32__) || defined(__MINGW64__)", - "NPY_FEATURE_VERSION >= NPY_1_20_API_VERSION", - "NPY_FEATURE_VERSION >= NPY_1_22_API_VERSION", + "NPY_ABI_VERSION < 0x02000000", "defined(NPY_INTERNAL_BUILD) && NPY_INTERNAL_BUILD", "NPY_SIZEOF_PY_INTPTR_T == NPY_SIZEOF_INT", "NPY_SIZEOF_PY_INTPTR_T == NPY_SIZEOF_LONG", + "NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE", "NPY_BITSOF_LONG == 8", "NPY_BITSOF_LONGLONG == 8", "NPY_BITSOF_LONG == 16", "NPY_BITSOF_LONGLONG == 16", "NPY_BITSOF_LONG == 32", "NPY_BITSOF_LONGLONG == 32", @@ -162,12 +166,15 @@ public void map(InfoMap infoMap) { .put(new Info("NPY_BITSOF_LONG == 64", "NPY_BITSOF_LONGLONG == 64", "NPY_BITSOF_INT == 32", "NPY_BITSOF_SHORT == 16", + "NPY_FEATURE_VERSION >= NPY_2_0_API_VERSION", + "NPY_FEATURE_VERSION >= NPY_1_20_API_VERSION", + "NPY_FEATURE_VERSION >= NPY_1_22_API_VERSION", "PY_VERSION_HEX >= 0x03080000").define(true)) .put(new Info("NPY_MAX_INT", "INT_MIN", "NPY_MIN_INT", "NPY_MAX_UINT", "NPY_MAX_LONG", "NPY_MIN_LONG", "NPY_MAX_ULONG", "NPY_INTP", "NPY_UINTP", "NPY_MAX_INTP", "NPY_MIN_INTP", "NPY_MAX_UINTP").translate(false).cppTypes("long")) - .put(new Info("NPY_SIZEOF_SHORT", "NPY_SIZEOF_INT", "NPY_SIZEOF_LONG", + .put(new Info("NPY_SIZEOF_SHORT", "NPY_SIZEOF_INT", "NPY_SIZEOF_LONG", "NPY_SIZEOF_HASH_T", "NPY_MAX_BYTE", "NPY_MIN_BYTE", "NPY_MAX_UBYTE", "NPY_MAX_SHORT", "NPY_MIN_SHORT", "NPY_MAX_USHORT", "NPY_BITSOF_CHAR", "NPY_BITSOF_BYTE", "NPY_BITSOF_SHORT", "NPY_BITSOF_INT", "NPY_BITSOF_LONG", "NPY_BITSOF_LONGLONG", "NPY_BITSOF_INTP", "NPY_BITSOF_HALF", "NPY_BITSOF_FLOAT", "NPY_BITSOF_DOUBLE", "NPY_BITSOF_LONGDOUBLE", @@ -188,7 +195,7 @@ public void map(InfoMap infoMap) { .put(new Info("PyArrayDescr_TypeFull").javaText( "public static native @ByRef PyTypeObject PyArrayDescr_Type(); public static native void PyArrayDescr_Type(PyTypeObject setter);")) - .put(new Info("PyArrayMapIter_Type", "PyArrayNeighborhoodIter_Type", + .put(new Info("PyArrayMapIter_Type", "PyArrayNeighborhoodIter_Type", "longdouble_t", "PyArray_HANDLER", "PyDataMem_SetHandler", "PyDataMem_GetHandler").skip()) ; } diff --git a/onnx/README.md b/onnx/README.md index 0b8e23028e6..59415233857 100644 --- a/onnx/README.md +++ b/onnx/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * ONNX 1.16.0 https://onnx.ai/ + * ONNX 1.16.1 https://onnx.ai/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -47,7 +47,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco onnx-platform - 1.16.0-1.5.11-SNAPSHOT + 1.16.1-1.5.11-SNAPSHOT diff --git a/onnx/cppbuild.sh b/onnx/cppbuild.sh index 67953f317df..0c827e3e9f9 100755 --- a/onnx/cppbuild.sh +++ b/onnx/cppbuild.sh @@ -12,7 +12,7 @@ export ONNX_ML=1 export CMAKE_BUILD_DIR=.setuptools-cmake-build/ export MAX_JOBS=$MAKEJ -export ONNX=1.16.0 +export ONNX=1.16.1 export PROTO=3.20.3 export PYBIND=2.11.0 diff --git a/onnx/platform/pom.xml b/onnx/platform/pom.xml index 133d301b166..a7002faec73 100644 --- a/onnx/platform/pom.xml +++ b/onnx/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnx-platform - 1.16.0-${project.parent.version} + 1.16.1-${project.parent.version} JavaCPP Presets Platform for ONNX @@ -28,7 +28,7 @@ org.bytedeco cpython-platform - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} true diff --git a/onnx/pom.xml b/onnx/pom.xml index 10d86aaa846..d5ba47b4f89 100644 --- a/onnx/pom.xml +++ b/onnx/pom.xml @@ -11,7 +11,7 @@ org.bytedeco onnx - 1.16.0-${project.parent.version} + 1.16.1-${project.parent.version} JavaCPP Presets for ONNX @@ -22,7 +22,7 @@ org.bytedeco cpython - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} true @@ -42,7 +42,7 @@ org.bytedeco cpython-platform - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} diff --git a/onnx/samples/pom.xml b/onnx/samples/pom.xml index c2af83206d6..f8b239feddf 100644 --- a/onnx/samples/pom.xml +++ b/onnx/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnx-platform - 1.16.0-1.5.11-SNAPSHOT + 1.16.1-1.5.11-SNAPSHOT diff --git a/onnxruntime/README.md b/onnxruntime/README.md index f1da6e3fb42..749ef2b9572 100644 --- a/onnxruntime/README.md +++ b/onnxruntime/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * ONNX Runtime 1.17.3 https://microsoft.github.io/onnxruntime/ + * ONNX Runtime 1.18.0 https://microsoft.github.io/onnxruntime/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -46,14 +46,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco onnxruntime-platform - 1.17.3-1.5.11-SNAPSHOT + 1.18.0-1.5.11-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.17.3-1.5.11-SNAPSHOT + 1.18.0-1.5.11-SNAPSHOT diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index 12ee3420e44..1045185eb7f 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -22,7 +22,7 @@ if [[ "$EXTENSION" == *gpu ]]; then GPU_FLAGS="--use_cuda" fi -ONNXRUNTIME=1.17.3 +ONNXRUNTIME=1.18.0 mkdir -p "$PLATFORM$EXTENSION" cd "$PLATFORM$EXTENSION" diff --git a/onnxruntime/onnxruntime.patch b/onnxruntime/onnxruntime.patch index 6b680a348be..2ffc367583d 100644 --- a/onnxruntime/onnxruntime.patch +++ b/onnxruntime/onnxruntime.patch @@ -1,8 +1,8 @@ diff --git a/cmake/adjust_global_compile_flags.cmake b/cmake/adjust_global_compile_flags.cmake -index 68522a7dda..69432fa783 100644 +index 690b6d4e66..cc99e69580 100644 --- a/cmake/adjust_global_compile_flags.cmake +++ b/cmake/adjust_global_compile_flags.cmake -@@ -11,8 +11,8 @@ endif() +@@ -20,8 +20,8 @@ endif() # Enable space optimization for gcc/clang # Cannot use "-ffunction-sections -fdata-sections" if we enable bitcode (iOS) if (NOT MSVC AND NOT onnxruntime_ENABLE_BITCODE) @@ -14,10 +14,10 @@ index 68522a7dda..69432fa783 100644 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmake -index 59ebf8eca4..2a326e4057 100644 +index e15c8a046d..0504f81348 100644 --- a/cmake/onnxruntime.cmake +++ b/cmake/onnxruntime.cmake -@@ -131,9 +131,9 @@ target_compile_definitions(onnxruntime PRIVATE FILE_NAME=\"onnxruntime.dll\") +@@ -117,9 +117,9 @@ target_compile_definitions(onnxruntime PRIVATE FILE_NAME=\"onnxruntime.dll\") if(UNIX) if (APPLE) @@ -30,10 +30,10 @@ index 59ebf8eca4..2a326e4057 100644 else() set(ONNXRUNTIME_SO_LINK_FLAG " -DEF:${SYMBOL_FILE}") diff --git a/onnxruntime/core/session/provider_bridge_ort.cc b/onnxruntime/core/session/provider_bridge_ort.cc -index 8f0a5aeaa3..c684682e7d 100644 +index 80bd301c20..e7e4b1ce4f 100644 --- a/onnxruntime/core/session/provider_bridge_ort.cc +++ b/onnxruntime/core/session/provider_bridge_ort.cc -@@ -1132,13 +1132,33 @@ struct ProviderHostImpl : ProviderHost { +@@ -1365,13 +1365,33 @@ struct ProviderHostImpl : ProviderHost { #if defined(_MSC_VER) && !defined(__clang__) #pragma warning(pop) #endif @@ -67,7 +67,7 @@ index 8f0a5aeaa3..c684682e7d 100644 ORT_THROW_IF_ERROR(Env::Default().LoadDynamicLibrary(full_path, true /*shared_globals on unix*/, &handle_)); void (*PProvider_SetHost)(void*); -@@ -1157,7 +1177,7 @@ struct ProviderSharedLibrary { +@@ -1390,7 +1410,7 @@ struct ProviderSharedLibrary { } } @@ -76,7 +76,7 @@ index 8f0a5aeaa3..c684682e7d 100644 ~ProviderSharedLibrary() { // assert(!handle_); // We should already be unloaded at this point (disabled until Python shuts down deterministically) } -@@ -1190,6 +1210,18 @@ struct ProviderLibrary { +@@ -1423,6 +1443,18 @@ struct ProviderLibrary { s_library_shared.Ensure(); auto full_path = Env::Default().GetRuntimePath() + filename_; @@ -96,10 +96,10 @@ index 8f0a5aeaa3..c684682e7d 100644 Provider* (*PGetProvider)(); diff --git a/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc b/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc -index d6546ccdd9..70914d6758 100644 +index 575434d19b..272893301a 100644 --- a/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc +++ b/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc -@@ -113,10 +113,11 @@ struct OnUnload { +@@ -114,10 +114,11 @@ struct OnUnload { } g_on_unload; @@ -113,7 +113,7 @@ index d6546ccdd9..70914d6758 100644 return g_host->CreateAllocator(info); } -@@ -251,19 +252,22 @@ MLDataType DataTypeImpl::GetSparseTensorType() { return Provider +@@ -252,19 +253,22 @@ MLDataType DataTypeImpl::GetSparseTensorType() { return Provider #endif Status IDataTransfer::CopyTensor(const Tensor& src, Tensor& dst) const { @@ -137,7 +137,7 @@ index d6546ccdd9..70914d6758 100644 TensorShape::TensorShape(gsl::span dims) { Allocate(dims.size()); -@@ -271,16 +275,19 @@ TensorShape::TensorShape(gsl::span dims) { +@@ -272,16 +276,19 @@ TensorShape::TensorShape(gsl::span dims) { } TensorShape& TensorShape::operator=(const TensorShape& other) { @@ -157,7 +157,7 @@ index d6546ccdd9..70914d6758 100644 g_host->TensorShape__Allocate(this, size); } -@@ -291,6 +298,7 @@ int64_t TensorShape::Size() const { +@@ -292,6 +299,7 @@ int64_t TensorShape::Size() const { } int64_t TensorShape::SizeHelper(size_t start, size_t end) const { @@ -165,7 +165,7 @@ index d6546ccdd9..70914d6758 100644 return g_host->TensorShape__SizeHelper(this, start, end); } -@@ -300,74 +308,89 @@ TensorShape TensorShape::Slice(size_t dimstart, size_t dimend) const { +@@ -301,84 +309,98 @@ TensorShape TensorShape::Slice(size_t dimstart, size_t dimend) const { } std::string TensorShape::ToString() const { @@ -207,11 +207,6 @@ index d6546ccdd9..70914d6758 100644 return g_host->IExecutionProvider__Compile(this, fused_nodes_and_graphs, node_compute_funcs); } - int IExecutionProvider::GenerateMetaDefId(const onnxruntime::GraphViewer& graph_viewer, HashValue& model_hash) const { -+ g_host = Provider_GetHost(); - return g_host->IExecutionProvider__GenerateMetaDefId(this, graph_viewer, model_hash); - } - #ifdef USE_TENSORRT std::unique_ptr CreateCUDAAllocator(int16_t device_id, const char* name) { + g_host = Provider_GetHost(); @@ -258,7 +253,25 @@ index d6546ccdd9..70914d6758 100644 return g_host->GetCpuPreferredNodes(graph, kernel_lookup, tentative_nodes); } -@@ -464,10 +487,12 @@ std::vector GetStackTrace() { return g_host->GetStackTrace(); } + namespace profiling { + +-std::string demangle(const char* name) { return g_host->demangle(name); } +-std::string demangle(const std::string& name) { return g_host->demangle(name); } ++std::string demangle(const char* name) { g_host = Provider_GetHost(); return g_host->demangle(name); } ++std::string demangle(const std::string& name) { g_host = Provider_GetHost(); return g_host->demangle(name); } + + } // namespace profiling + + namespace logging { + +-unsigned int GetThreadId() { return g_host->GetThreadId(); } +-unsigned int GetProcessId() { return g_host->GetProcessId(); } ++unsigned int GetThreadId() { g_host = Provider_GetHost(); return g_host->GetThreadId(); } ++unsigned int GetProcessId() { g_host = Provider_GetHost(); return g_host->GetProcessId(); } + + const char* Category::onnxruntime = "onnxruntime"; + +@@ -461,10 +483,12 @@ std::vector GetStackTrace() { return g_host->GetStackTrace(); } void LogRuntimeError(uint32_t session_id, const common::Status& status, const char* file, const char* function, uint32_t line) { @@ -272,10 +285,10 @@ index d6546ccdd9..70914d6758 100644 } diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py -index 4c3e8b76e8..24b8b715d7 100644 +index 3df351711a..6a75127088 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py -@@ -946,6 +946,9 @@ def generate_build_tree( +@@ -1003,6 +1003,9 @@ def generate_build_tree( cmake_args += [ "-Donnxruntime_RUN_ONNX_TESTS=" + ("ON" if args.enable_onnx_tests else "OFF"), "-Donnxruntime_GENERATE_TEST_REPORTS=ON", @@ -285,13 +298,13 @@ index 4c3e8b76e8..24b8b715d7 100644 # There are two ways of locating python C API header file. "find_package(PythonLibs 3.5 REQUIRED)" # and "find_package(Python 3.5 COMPONENTS Development.Module)". The first one is deprecated and it # depends on the "PYTHON_EXECUTABLE" variable. The second needs "Python_EXECUTABLE". Here we set both -@@ -2525,6 +2528,9 @@ def main(): +@@ -2795,6 +2798,9 @@ def main(): log.info("Activating emsdk...") run_subprocess([emsdk_file, "activate", emsdk_version], cwd=emsdk_dir) + if is_linux() and args.arm64: + cmake_extra_args = ["-DCMAKE_SYSTEM_NAME=Linux", "-DCMAKE_SYSTEM_PROCESSOR=aarch64"] + - if is_ubuntu_1604(): - if args.arm or args.arm64: - raise BuildError("Only Windows ARM(64) cross-compiled builds supported currently through this script") + if args.enable_pybind and is_windows(): + install_python_deps(args.numpy_version) + diff --git a/onnxruntime/platform/gpu/pom.xml b/onnxruntime/platform/gpu/pom.xml index a2f7e975c60..eb51fc8a842 100644 --- a/onnxruntime/platform/gpu/pom.xml +++ b/onnxruntime/platform/gpu/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform-gpu - 1.17.3-${project.parent.version} + 1.18.0-${project.parent.version} JavaCPP Presets Platform GPU for ONNX Runtime diff --git a/onnxruntime/platform/pom.xml b/onnxruntime/platform/pom.xml index 8a4197328a5..929032caf79 100644 --- a/onnxruntime/platform/pom.xml +++ b/onnxruntime/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform - 1.17.3-${project.parent.version} + 1.18.0-${project.parent.version} JavaCPP Presets Platform for ONNX Runtime diff --git a/onnxruntime/pom.xml b/onnxruntime/pom.xml index 2d825c4b9cc..a68f2ac3d4b 100644 --- a/onnxruntime/pom.xml +++ b/onnxruntime/pom.xml @@ -11,7 +11,7 @@ org.bytedeco onnxruntime - 1.17.3-${project.parent.version} + 1.18.0-${project.parent.version} JavaCPP Presets for ONNX Runtime diff --git a/onnxruntime/samples/pom.xml b/onnxruntime/samples/pom.xml index 81579e28c17..ee30ff3e9a7 100644 --- a/onnxruntime/samples/pom.xml +++ b/onnxruntime/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco onnxruntime-platform - 1.17.3-1.5.11-SNAPSHOT + 1.18.0-1.5.11-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.17.3-1.5.11-SNAPSHOT + 1.18.0-1.5.11-SNAPSHOT diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelContext.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelContext.java index 929f389bdc5..aa4313a95c6 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelContext.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelContext.java @@ -31,7 +31,11 @@ public class KernelContext extends Pointer { private native void allocate(OrtKernelContext context); public native @Cast("size_t") long GetInputCount(); public native @Cast("size_t") long GetOutputCount(); + // If input is optional and is not present, the method returns en empty ConstValue + // which can be compared to nullptr. public native @ByVal ConstValue GetInput(@Cast("size_t") long index); + // If outout is optional and is not present, the method returns en empty UnownedValue + // which can be compared to nullptr. public native @ByVal @Cast("Ort::UnownedValue*") ValueImpl GetOutput(@Cast("size_t") long index, @Cast("const int64_t*") LongPointer dim_values, @Cast("size_t") long dim_count); public native @ByVal @Cast("Ort::UnownedValue*") ValueImpl GetOutput(@Cast("size_t") long index, @Cast("const int64_t*") LongBuffer dim_values, @Cast("size_t") long dim_count); public native @ByVal @Cast("Ort::UnownedValue*") ValueImpl GetOutput(@Cast("size_t") long index, @Cast("const int64_t*") long[] dim_values, @Cast("size_t") long dim_count); diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java index 1566533fa56..88f229f62c0 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java @@ -72,4 +72,19 @@ public static class Info_OrtAllocator extends FunctionPointer { } /** Return a pointer to an ::OrtMemoryInfo that describes this allocator */ public native Info_OrtAllocator Info(); public native OrtAllocator Info(Info_OrtAllocator setter); + /** + * \brief Optional allocation function to use for memory allocations made during session initialization. + * Use this function if you want to separate allocations made by ORT during Run() calls from + * those made during session initialization. This allows for separate memory management strategies for these allocations. + */ + public static class Reserve_OrtAllocator_long extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Reserve_OrtAllocator_long(Pointer p) { super(p); } + protected Reserve_OrtAllocator_long() { allocate(); } + private native void allocate(); + public native Pointer call(OrtAllocator this_, @Cast("size_t") long size); + } + /** Returns a pointer to an allocated block of {@code size} bytes */ + public native Reserve_OrtAllocator_long Reserve(); public native OrtAllocator Reserve(Reserve_OrtAllocator_long setter); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java index 37d753354dd..2bd68e616bd 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java @@ -1336,7 +1336,14 @@ public native OrtStatus KernelInfoGetAttribute_string( @Const OrtKernelInfo info /** \brief Used for custom operators, get an input of a kernel * - * @see ::OrtCustomOp + * The function attempts fetches the input of the kernel. If the input is optional + * and not present, the function returns success and out is set to nullptr. + * + * @param context [in] ::OrtKernelContext instance + * @param input [in] index. See KernelContext_GetInputCount for boundaries check. + * @param returns [in, out] a ptr to OrtValue if the input is present + * + * \snippet{doc} snippets.dox OrtStatus Return Value */ public native OrtStatus KernelContext_GetInput( @Const OrtKernelContext context, @Cast("size_t") long index, @Cast("const OrtValue**") PointerPointer out); @@ -1345,7 +1352,14 @@ public native OrtStatus KernelContext_GetInput( @Const OrtKernelContext context, /** \brief Used for custom operators, get an output of a kernel * - * @see ::OrtCustomOp + * The function attempts fetches the output of the kernel. If the output is optional + * and not present, the function returns success and out is set to nullptr. + * + * @param context [in] ::OrtKernelContext instance + * @param output [in] index. See KernelContext_GetOutputCount for boundaries check. + * @param returns [in, out] a ptr to OrtValue if the output is present + * + * \snippet{doc} snippets.dox OrtStatus Return Value */ public native OrtStatus KernelContext_GetOutput( OrtKernelContext context, @Cast("size_t") long index, @Cast("const int64_t*") LongPointer dim_values, @Cast("size_t") long dim_count, @Cast("OrtValue**") PointerPointer out); @@ -2593,7 +2607,7 @@ public native OrtStatus SessionOptionsAppendExecutionProvider_TensorRT_V2( * * Please refer to https://onnxruntime.ai/docs/execution-providers/TensorRT-ExecutionProvider.html#cc * to know the available keys and values. Key should be in null terminated string format of the member of ::OrtTensorRTProviderOptionsV2 - * and value should be its related range. + * and value should be its related range. Recreates the options and only sets the supplied values. * * For example, key="trt_max_workspace_size" and value="2147483648" * @@ -3177,7 +3191,7 @@ public native OrtStatus SessionOptionsAppendExecutionProvider_CUDA_V2( * * Please refer to https://onnxruntime.ai/docs/execution-providers/CUDA-ExecutionProvider.html#configuration-options * to know the available keys and values. Key should be in null terminated string format of the member of ::OrtCUDAProviderOptionsV2 - * and value should be its related range. + * and value should be its related range. Recreates the options and only sets the supplied values. * * For example, key="device_id" and value="0" * @@ -3273,7 +3287,7 @@ public native OrtStatus SessionOptionsAppendExecutionProvider_MIGraphX( * @param options [in] * @param initializer_names [in] Array of null terminated UTF-8 encoded strings of the initializers names. * @param initializers [in] Array of ::OrtValue type - * @param initializers_num [in] Number of elements in the initializer_names and initializers + * @param num_initializers [in] Number of elements in the initializer_names and initializers * * \snippet{doc} snippets.dox OrtStatus Return Value * @@ -3281,16 +3295,16 @@ public native OrtStatus SessionOptionsAppendExecutionProvider_MIGraphX( */ public native OrtStatus AddExternalInitializers( OrtSessionOptions options, @Cast("const char*const*") PointerPointer initializer_names, - @Cast("const OrtValue*const*") PointerPointer initializers, @Cast("size_t") long initializers_num); + @Cast("const OrtValue*const*") PointerPointer initializers, @Cast("size_t") long num_initializers); public native OrtStatus AddExternalInitializers( OrtSessionOptions options, @Cast("const char*const*") @ByPtrPtr BytePointer initializer_names, - @Const @ByPtrPtr OrtValue initializers, @Cast("size_t") long initializers_num); + @Const @ByPtrPtr OrtValue initializers, @Cast("size_t") long num_initializers); public native OrtStatus AddExternalInitializers( OrtSessionOptions options, @Cast("const char*const*") @ByPtrPtr ByteBuffer initializer_names, - @Const @ByPtrPtr OrtValue initializers, @Cast("size_t") long initializers_num); + @Const @ByPtrPtr OrtValue initializers, @Cast("size_t") long num_initializers); public native OrtStatus AddExternalInitializers( OrtSessionOptions options, @Cast("const char*const*") @ByPtrPtr byte[] initializer_names, - @Const @ByPtrPtr OrtValue initializers, @Cast("size_t") long initializers_num); + @Const @ByPtrPtr OrtValue initializers, @Cast("size_t") long num_initializers); /** \brief: Create attribute of onnxruntime operator * @@ -3491,6 +3505,7 @@ public native OrtStatus InvokeOp( * QNN supported keys: * "backend_path": file path to QNN backend library. * "profiling_level": QNN profiling level, options: "off", "basic", "detailed". Default to off. + * "profiling_file_path": QNN profiling file path if ETW not enabled. * "rpc_control_latency": QNN RPC control latency. * "vtcm_mb": QNN VTCM size in MB. default to 0(not set). * "htp_performance_mode": QNN performance mode, options: "burst", "balanced", "default", "high_performance", @@ -3512,6 +3527,10 @@ public native OrtStatus InvokeOp( * - "73" * - "75" * "device_id": The ID of the device to use when setting 'htp_arch'. Defaults to "0" (for single device). + "enable_htp_fp16_precision": Only used for float32 model. + Enable the float32 model to be inferenced with fp16 precision. Otherwise, it will be fp32 precision. + - "0": Default. With fp32 precision. + - "1": With fp16 precision. * * SNPE supported keys: * "runtime": SNPE runtime engine, options: "CPU", "CPU_FLOAT32", "GPU", "GPU_FLOAT32_16_HYBRID", "GPU_FLOAT16", @@ -4719,4 +4738,98 @@ public native OrtStatus SessionOptionsAppendExecutionProvider_OpenVINO_V2( @Cast("const char*const*") @ByPtrPtr byte[] provider_options_keys, @Cast("const char*const*") @ByPtrPtr byte[] provider_options_values, @Cast("size_t") long num_keys); + + /** \brief Append VitisAI provider to session options + * + * If VitisAI is not available (due to a non VitisAI enabled build, or if VitisAI is not installed on the system), this function will return failure. + * + * @param options [in] + * @param provider_options_keys [in] + * @param provider_options_values [in] + * @param num_keys [in] + * + * \snippet{doc} snippets.dox OrtStatus Return Value + */ + public native OrtStatus SessionOptionsAppendExecutionProvider_VitisAI( + OrtSessionOptions options, + @Cast("const char*const*") PointerPointer provider_options_keys, + @Cast("const char*const*") PointerPointer provider_options_values, + @Cast("size_t") long num_keys); + public native OrtStatus SessionOptionsAppendExecutionProvider_VitisAI( + OrtSessionOptions options, + @Cast("const char*const*") @ByPtrPtr BytePointer provider_options_keys, + @Cast("const char*const*") @ByPtrPtr BytePointer provider_options_values, + @Cast("size_t") long num_keys); + public native OrtStatus SessionOptionsAppendExecutionProvider_VitisAI( + OrtSessionOptions options, + @Cast("const char*const*") @ByPtrPtr ByteBuffer provider_options_keys, + @Cast("const char*const*") @ByPtrPtr ByteBuffer provider_options_values, + @Cast("size_t") long num_keys); + public native OrtStatus SessionOptionsAppendExecutionProvider_VitisAI( + OrtSessionOptions options, + @Cast("const char*const*") @ByPtrPtr byte[] provider_options_keys, + @Cast("const char*const*") @ByPtrPtr byte[] provider_options_values, + @Cast("size_t") long num_keys); + + /** \brief Get scratch buffer from the corresponding allocator under the sepcific OrtMemoryInfo object. + * NOTE: callers are responsible to release this scratch buffer from the corresponding allocator + * @param context [in] OrtKernelContext instance + * @param mem_info [in] OrtMemoryInfo instance + * @param count_or_bytes [in] How many bytes is this scratch buffer + * @param out [out] A pointer to the scrach buffer + * \snippet{doc} snippets.dox OrtStatus Return Value + */ + public native OrtStatus KernelContext_GetScratchBuffer( @Const OrtKernelContext context, @Const OrtMemoryInfo mem_info, @Cast("size_t") long count_or_bytes, @Cast("void**") PointerPointer out); + public native OrtStatus KernelContext_GetScratchBuffer( @Const OrtKernelContext context, @Const OrtMemoryInfo mem_info, @Cast("size_t") long count_or_bytes, @Cast("void**") @ByPtrPtr Pointer out); + + /** \brief Get allocator from KernelInfo for a specific memory type. Please use C API ReleaseAllocator to release out object + * + * @param info [in] OrtKernelInfo instance + * @param mem_type [in] OrtMemType object + * @param out [out] A pointer to OrtAllocator + * + * \snippet{doc} snippets.dox OrtStatus Return Value + */ + public native OrtStatus KernelInfoGetAllocator( @Const OrtKernelInfo info, @Cast("OrtMemType") int mem_type, @Cast("OrtAllocator**") PointerPointer out); + public native OrtStatus KernelInfoGetAllocator( @Const OrtKernelInfo info, @Cast("OrtMemType") int mem_type, @ByPtrPtr OrtAllocator out); + + /** \brief Replace initialized Tensors with external data with the provided files in memory + * + * The function will find the initialized TensorProtos with external data in the graph with the provided + * external file names and the file content in memory. The API gets the external file name, offset, data length + * from TensorProto, and locate the tensor data from the file in memory buffer. + * It creates a Tensor to replace the existing Tensor in graph. The replacement + * will occur before any of the optimizations take place. The data will be copied into the graph + * since TensorProto can't refer to the user provided buffers. + * + * @param session [in] options + * @param external_initializer_file_names [in] Array of null terminated UTF-8 encoded strings of the file names + * which holds the external initializers. + * @param external_initializer_file_buffer_array [in] Array of pointers to the buffer of the file content. + * The buffer can be freed after session creation. + * @param external_initializer_file_lengths [in] Array of size_t to indicate the length of file content + * @param num_external_initializer_files [in] Number of external files + * + * \snippet{doc} snippets.dox OrtStatus Return Value + */ + public native OrtStatus AddExternalInitializersFromFilesInMemory( OrtSessionOptions options, + @Cast("const ORTCHAR_T*const*") PointerPointer external_initializer_file_names, + @Cast("char*const*") PointerPointer external_initializer_file_buffer_array, + @Cast("const size_t*") SizeTPointer external_initializer_file_lengths, + @Cast("size_t") long num_external_initializer_files); + public native OrtStatus AddExternalInitializersFromFilesInMemory( OrtSessionOptions options, + @Cast("const ORTCHAR_T*const*") @ByPtrPtr Pointer external_initializer_file_names, + @Cast("char*const*") @ByPtrPtr BytePointer external_initializer_file_buffer_array, + @Cast("const size_t*") SizeTPointer external_initializer_file_lengths, + @Cast("size_t") long num_external_initializer_files); + public native OrtStatus AddExternalInitializersFromFilesInMemory( OrtSessionOptions options, + @Cast("const ORTCHAR_T*const*") @ByPtrPtr Pointer external_initializer_file_names, + @Cast("char*const*") @ByPtrPtr ByteBuffer external_initializer_file_buffer_array, + @Cast("const size_t*") SizeTPointer external_initializer_file_lengths, + @Cast("size_t") long num_external_initializer_files); + public native OrtStatus AddExternalInitializersFromFilesInMemory( OrtSessionOptions options, + @Cast("const ORTCHAR_T*const*") @ByPtrPtr Pointer external_initializer_file_names, + @Cast("char*const*") @ByPtrPtr byte[] external_initializer_file_buffer_array, + @Cast("const size_t*") SizeTPointer external_initializer_file_lengths, + @Cast("size_t") long num_external_initializer_files); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOp.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOp.java index ddbb15ed4b7..68c26756d10 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOp.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOp.java @@ -274,4 +274,51 @@ public static class GetEndVersion_OrtCustomOp extends FunctionPointer { public native int call(@Const OrtCustomOp op); } public native GetEndVersion_OrtCustomOp GetEndVersion(); public native OrtCustomOp GetEndVersion(GetEndVersion_OrtCustomOp setter); + + // Get the inplace_map that defines which output can reuse which input + // Callers will provide 2 raw int* and pass in their address, this function will fill these 2 arrays + // when return, output (*output_index)[i] may reuse the input (*input_index[i]). + // The return value is the size of these 2 arrays. + // Callers are responsible to delete these 2 arrays after use by calling OrtCustomOp::ReleaseMayInplace(). + public static class GetMayInplace_PointerPointer_PointerPointer extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public GetMayInplace_PointerPointer_PointerPointer(Pointer p) { super(p); } + protected GetMayInplace_PointerPointer_PointerPointer() { allocate(); } + private native void allocate(); + public native @Cast("size_t") long call(@Cast("int**") PointerPointer input_index, @Cast("int**") PointerPointer output_index); + } + public native GetMayInplace_PointerPointer_PointerPointer GetMayInplace(); public native OrtCustomOp GetMayInplace(GetMayInplace_PointerPointer_PointerPointer setter); + + // Release the pointer input_index and output_index allocated from GetMayInplace() function. + // If GetMayInplace() is defined, this function MUST be defined as well. + public static class ReleaseMayInplace_IntPointer_IntPointer extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ReleaseMayInplace_IntPointer_IntPointer(Pointer p) { super(p); } + protected ReleaseMayInplace_IntPointer_IntPointer() { allocate(); } + private native void allocate(); + public native void call(IntPointer input_index, IntPointer output_index); + } + public native ReleaseMayInplace_IntPointer_IntPointer ReleaseMayInplace(); public native OrtCustomOp ReleaseMayInplace(ReleaseMayInplace_IntPointer_IntPointer setter); + + // Same as GetMayInplace() and ReleaseMayInplace() + public static class GetAliasMap_PointerPointer_PointerPointer extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public GetAliasMap_PointerPointer_PointerPointer(Pointer p) { super(p); } + protected GetAliasMap_PointerPointer_PointerPointer() { allocate(); } + private native void allocate(); + public native @Cast("size_t") long call(@Cast("int**") PointerPointer input_index, @Cast("int**") PointerPointer output_index); + } + public native GetAliasMap_PointerPointer_PointerPointer GetAliasMap(); public native OrtCustomOp GetAliasMap(GetAliasMap_PointerPointer_PointerPointer setter); + public static class ReleaseAliasMap_IntPointer_IntPointer extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ReleaseAliasMap_IntPointer_IntPointer(Pointer p) { super(p); } + protected ReleaseAliasMap_IntPointer_IntPointer() { allocate(); } + private native void allocate(); + public native void call(IntPointer input_index, IntPointer output_index); + } + public native ReleaseAliasMap_IntPointer_IntPointer ReleaseAliasMap(); public native OrtCustomOp ReleaseAliasMap(ReleaseAliasMap_IntPointer_IntPointer setter); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java index 906a06a3ff6..7d701021a0f 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java @@ -86,6 +86,8 @@ public class OrtROCMProviderOptions extends Pointer { */ public native OrtArenaCfg default_memory_arena_cfg(); public native OrtROCMProviderOptions default_memory_arena_cfg(OrtArenaCfg setter); + public native int enable_hip_graph(); public native OrtROCMProviderOptions enable_hip_graph(int setter); + /** \brief Enable TunableOp for using. * Set it to 1/0 to enable/disable TunableOp. Otherwise, it is disabled by default. * This option can be overriden by environment variable ORT_ROCM_TUNABLE_OP_ENABLE. diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptionsImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptionsImpl.java index ed17731f9ce..281f3385f38 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptionsImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptionsImpl.java @@ -88,6 +88,19 @@ public class SessionOptionsImpl extends ConstSessionOptionsImpl { public native @ByRef SessionOptionsImpl AddInitializer(String name, @Const OrtValue ort_val); /** Wraps OrtApi::AddExternalInitializers */ public native @ByRef SessionOptionsImpl AddExternalInitializers(@Const @ByRef StringVector names, @StdMove ValueVector ort_values); + /** Wraps OrtApi::AddExternalInitializersFromFilesInMemory */ + public native @ByRef SessionOptionsImpl AddExternalInitializersFromFilesInMemory(@Cast("std::basic_string*") @StdVector Pointer external_initializer_file_names, + @Cast("char**") @StdVector PointerPointer external_initializer_file_buffer_array, + @Cast("size_t*") @StdVector SizeTPointer external_initializer_file_lengths); + public native @ByRef SessionOptionsImpl AddExternalInitializersFromFilesInMemory(@Cast("std::basic_string*") @StdVector Pointer external_initializer_file_names, + @Cast("char**") @StdVector @ByPtrPtr BytePointer external_initializer_file_buffer_array, + @Cast("size_t*") @StdVector SizeTPointer external_initializer_file_lengths); + public native @ByRef SessionOptionsImpl AddExternalInitializersFromFilesInMemory(@Cast("std::basic_string*") @StdVector Pointer external_initializer_file_names, + @Cast("char**") @StdVector @ByPtrPtr ByteBuffer external_initializer_file_buffer_array, + @Cast("size_t*") @StdVector SizeTPointer external_initializer_file_lengths); + public native @ByRef SessionOptionsImpl AddExternalInitializersFromFilesInMemory(@Cast("std::basic_string*") @StdVector Pointer external_initializer_file_names, + @Cast("char**") @StdVector @ByPtrPtr byte[] external_initializer_file_buffer_array, + @Cast("size_t*") @StdVector SizeTPointer external_initializer_file_lengths); /** Wraps OrtApi::SessionOptionsAppendExecutionProvider_CUDA */ public native @ByRef SessionOptionsImpl AppendExecutionProvider_CUDA(@Const @ByRef OrtCUDAProviderOptions provider_options); @@ -132,7 +145,11 @@ public class SessionOptionsImpl extends ConstSessionOptionsImpl { public native @ByRef SessionOptionsImpl RegisterCustomOpsLibrary(@Cast("const ORTCHAR_T*") Pointer library_name, @Const @ByRef(nullValue = "Ort::CustomOpConfigs{}") CustomOpConfigs custom_op_configs); public native @ByRef SessionOptionsImpl RegisterCustomOpsLibrary(@Cast("const ORTCHAR_T*") Pointer library_name); - /** Wraps OrtApi::RegisterCustomOpsUsingFunction */ + /** Wraps OrtApi::RegisterCustomOpsUsingFunction +

+ * Wraps OrtApi::SessionOptionsAppendExecutionProvider_VitisAI */ public native @ByRef SessionOptionsImpl RegisterCustomOpsUsingFunction(@Cast("const char*") BytePointer function_name); public native @ByRef SessionOptionsImpl RegisterCustomOpsUsingFunction(String function_name); + public native @ByRef SessionOptionsImpl AppendExecutionProvider_VitisAI(@Const @ByRef(nullValue = "std::unordered_map{}") StringStringMap provider_options); + public native @ByRef SessionOptionsImpl AppendExecutionProvider_VitisAI(); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java index 5e5cd5e1b52..a80ac244277 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java @@ -74,7 +74,7 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { * * This value is used by some API functions to behave as this version of the header expects. */ -public static final int ORT_API_VERSION = 17; +public static final int ORT_API_VERSION = 18; // #ifdef __cplusplus // #endif @@ -313,7 +313,7 @@ public enum OrtSparseIndicesFormat { /** \} */ // #define ORT_RUNTIME_CLASS(X) // struct Ort##X; -// typedef struct Ort##X Ort##X; +// typedef struct Ort##X Ort##X // Targeting ../OrtEnv.java @@ -590,7 +590,7 @@ public enum OrtSparseIndicesFormat { * * \param device_id CUDA device id, starts from zero. */ -public static native OrtStatus OrtSessionOptionsAppendExecutionProvider_Tensorrt( OrtSessionOptions options, int device_id); + // #ifdef __cplusplus // #endif diff --git a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java index 1ce97706da9..abc952aa973 100644 --- a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java +++ b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java @@ -64,16 +64,16 @@ // "onnxruntime/core/providers/rocm/rocm_provider_factory.h", // "onnxruntime/core/providers/dml/dml_provider_factory.h", }, - link = {"onnxruntime_providers_shared", "onnxruntime@.1.17.3"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.18.0"} ), @Platform( value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"}, - link = {"onnxruntime_providers_shared", "onnxruntime@.1.17.3", "onnxruntime_providers_dnnl"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.18.0", "onnxruntime_providers_dnnl"} ), @Platform( value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"}, extension = "-gpu", - link = {"onnxruntime_providers_shared", "onnxruntime@.1.17.3", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.18.0", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"} ), }, target = "org.bytedeco.onnxruntime", diff --git a/opencv/README.md b/opencv/README.md index 84b0e79ca74..6ef3392efa8 100644 --- a/opencv/README.md +++ b/opencv/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * OpenCV 4.9.0 http://opencv.org/ + * OpenCV 4.10.0 http://opencv.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -49,14 +49,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco opencv-platform - 4.9.0-1.5.11-SNAPSHOT + 4.10.0-1.5.11-SNAPSHOT org.bytedeco opencv-platform-gpu - 4.9.0-1.5.11-SNAPSHOT + 4.10.0-1.5.11-SNAPSHOT @@ -77,7 +77,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.26.4-1.5.11-SNAPSHOT + 2.0.0-1.5.11-SNAPSHOT diff --git a/opencv/cppbuild.sh b/opencv/cppbuild.sh index 89466cbe1d6..40db25e4f20 100755 --- a/opencv/cppbuild.sh +++ b/opencv/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENCV_VERSION=4.9.0 +OPENCV_VERSION=4.10.0 download https://github.com/opencv/opencv/archive/$OPENCV_VERSION.tar.gz opencv-$OPENCV_VERSION.tar.gz download https://github.com/opencv/opencv_contrib/archive/$OPENCV_VERSION.tar.gz opencv_contrib-$OPENCV_VERSION.tar.gz @@ -27,7 +27,7 @@ if [[ -n "${BUILD_PATH:-}" ]]; then CPYTHON_PATH="$P" elif [[ -f "$P/include/openblas_config.h" ]]; then OPENBLAS_PATH="$P" - elif [[ -f "$P/python/numpy/core/include/numpy/numpyconfig.h" ]]; then + elif [[ -f "$P/python/numpy/_core/include/numpy/numpyconfig.h" ]]; then NUMPY_PATH="$P" fi done @@ -123,7 +123,7 @@ sedinplace '/if(PYTHONINTERP_FOUND)/a\ ' cmake/OpenCVDetectPython.cmake sedinplace '/execute_process/{N;N;N;d;}' cmake/OpenCVDetectPython.cmake -BUILD_X="-DBUILD_ANDROID_EXAMPLES=OFF -DBUILD_ANDROID_PROJECTS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_JASPER=ON -DBUILD_JPEG=ON -DBUILD_WEBP=ON -DBUILD_OPENEXR=ON -DBUILD_PNG=ON -DBUILD_TIFF=ON -DBUILD_ZLIB=ON -DBUILD_opencv_java=ON -DBUILD_opencv_objc=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=ON -DOPENCV_SKIP_PYTHON_LOADER=ON -DPYTHON3_EXECUTABLE=$PYTHON3_EXECUTABLE -DPYTHON3_INCLUDE_DIR=$PYTHON3_INCLUDE_DIR -DPYTHON3_LIBRARY=$PYTHON3_LIBRARY -DPYTHON3_PACKAGES_PATH=$PYTHON3_PACKAGES_PATH -DPYTHON3_NUMPY_INCLUDE_DIRS=$NUMPY_PATH/python/numpy/core/include/ -DBUILD_opencv_gapi=OFF -DBUILD_opencv_hdf=OFF -DBUILD_opencv_sfm=OFF -DBUILD_opencv_img_hash=ON" +BUILD_X="-DBUILD_ANDROID_EXAMPLES=OFF -DBUILD_ANDROID_PROJECTS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_JASPER=ON -DBUILD_JPEG=ON -DBUILD_WEBP=ON -DBUILD_OPENEXR=ON -DBUILD_PNG=ON -DBUILD_TIFF=ON -DBUILD_ZLIB=ON -DBUILD_opencv_java=ON -DBUILD_opencv_objc=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=ON -DOPENCV_SKIP_PYTHON_LOADER=ON -DPYTHON3_EXECUTABLE=$PYTHON3_EXECUTABLE -DPYTHON3_INCLUDE_DIR=$PYTHON3_INCLUDE_DIR -DPYTHON3_LIBRARY=$PYTHON3_LIBRARY -DPYTHON3_PACKAGES_PATH=$PYTHON3_PACKAGES_PATH -DPYTHON3_NUMPY_INCLUDE_DIRS=$NUMPY_PATH/python/numpy/_core/include/ -DBUILD_opencv_gapi=OFF -DBUILD_opencv_hdf=OFF -DBUILD_opencv_sfm=OFF -DBUILD_opencv_img_hash=ON" # support for OpenMP is NOT thread-safe so make sure to never enable it and use pthreads instead WITH_X="-DWITH_1394=OFF -DWITH_FFMPEG=OFF -DWITH_GSTREAMER=OFF -DWITH_IPP=OFF -DWITH_LAPACK=ON -DWITH_OPENCL=ON -DWITH_OPENJPEG=OFF -DWITH_OPENMP=OFF -DOPENCV_ENABLE_NONFREE=ON -DWITH_VA=OFF -DWITH_INF_ENGINE=OFF -DWITH_EIGEN=OFF -DENABLE_CXX11=ON -DENABLE_LIBJPEG_TURBO_SIMD=OFF" diff --git a/opencv/opencv.patch b/opencv/opencv.patch index 41569466e8b..b6ef0f00115 100644 --- a/opencv/opencv.patch +++ b/opencv/opencv.patch @@ -1,7 +1,20 @@ -diff -ruN opencv-4.9.0/3rdparty/libpng/pngpriv.h opencv-4.9.0-patch/3rdparty/libpng/pngpriv.h ---- opencv-4.9.0/3rdparty/libpng/pngpriv.h 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/3rdparty/libpng/pngpriv.h 2023-12-31 10:47:15.699853334 +0900 -@@ -195,13 +195,13 @@ +diff -ruN opencv-4.10.0/3rdparty/libpng/pngpriv.h opencv-4.10.0-patch/3rdparty/libpng/pngpriv.h +--- opencv-4.10.0/3rdparty/libpng/pngpriv.h 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/3rdparty/libpng/pngpriv.h 2024-06-17 07:25:41.578640065 +0900 +@@ -127,12 +127,6 @@ + * associated assembler code, pass --enable-arm-neon=no to configure + * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS. + */ +-# if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \ +- defined(PNG_ALIGNED_MEMORY_SUPPORTED) +-# define PNG_ARM_NEON_OPT 2 +-# else +-# define PNG_ARM_NEON_OPT 0 +-# endif + #endif + + #if PNG_ARM_NEON_OPT > 0 +@@ -211,14 +205,6 @@ # endif #endif @@ -12,19 +25,13 @@ diff -ruN opencv-4.9.0/3rdparty/libpng/pngpriv.h opencv-4.9.0-patch/3rdparty/lib -# define PNG_POWERPC_VSX_OPT 0 -# endif -#endif -+//#ifndef PNG_POWERPC_VSX_OPT -+//# if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__) -+//# define PNG_POWERPC_VSX_OPT 2 -+//# else -+//# define PNG_POWERPC_VSX_OPT 0 -+//# endif -+//#endif - - #ifndef PNG_INTEL_SSE_OPT - # ifdef PNG_INTEL_SSE -diff -ruN opencv-4.9.0/CMakeLists.txt opencv-4.9.0-patch/CMakeLists.txt ---- opencv-4.9.0/CMakeLists.txt 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/CMakeLists.txt 2023-12-31 10:47:54.236927735 +0900 +- + #ifndef PNG_LOONGARCH_LSX_OPT + # if defined(__loongarch_sx) + # define PNG_LOONGARCH_LSX_OPT 1 +diff -ruN opencv-4.10.0/CMakeLists.txt opencv-4.10.0-patch/CMakeLists.txt +--- opencv-4.10.0/CMakeLists.txt 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/CMakeLists.txt 2024-06-17 07:24:40.860495505 +0900 @@ -6,12 +6,12 @@ # # ---------------------------------------------------------------------------- @@ -42,9 +49,9 @@ diff -ruN opencv-4.9.0/CMakeLists.txt opencv-4.9.0-patch/CMakeLists.txt +#") +#endif() - include(cmake/OpenCVMinDepVersions.cmake) -@@ -439,7 +439,6 @@ + +@@ -450,7 +450,6 @@ VISIBLE_IF UNIX AND NOT ANDROID AND NOT IOS AND NOT XROS VERIFY HAVE_GPHOTO2) OCV_OPTION(WITH_LAPACK "Include Lapack library support" (NOT CV_DISABLE_OPTIMIZATION) @@ -52,9 +59,9 @@ diff -ruN opencv-4.9.0/CMakeLists.txt opencv-4.9.0-patch/CMakeLists.txt VERIFY HAVE_LAPACK) OCV_OPTION(WITH_ITT "Include Intel ITT support" ON VISIBLE_IF NOT APPLE_FRAMEWORK -diff -ruN opencv-4.9.0/modules/core/include/opencv2/core/fast_math.hpp opencv-4.9.0-patch/modules/core/include/opencv2/core/fast_math.hpp ---- opencv-4.9.0/modules/core/include/opencv2/core/fast_math.hpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/core/include/opencv2/core/fast_math.hpp 2023-12-31 10:47:15.700853336 +0900 +diff -ruN opencv-4.10.0/modules/core/include/opencv2/core/fast_math.hpp opencv-4.10.0-patch/modules/core/include/opencv2/core/fast_math.hpp +--- opencv-4.10.0/modules/core/include/opencv2/core/fast_math.hpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/core/include/opencv2/core/fast_math.hpp 2024-06-17 07:24:40.861495508 +0900 @@ -89,7 +89,6 @@ #define ARM_ROUND(_value, _asm_string) \ int res; \ @@ -63,9 +70,9 @@ diff -ruN opencv-4.9.0/modules/core/include/opencv2/core/fast_math.hpp opencv-4. __asm__(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \ return res // 2. version for double -diff -ruN opencv-4.9.0/modules/core/include/opencv2/core/utils/instrumentation.hpp opencv-4.9.0-patch/modules/core/include/opencv2/core/utils/instrumentation.hpp ---- opencv-4.9.0/modules/core/include/opencv2/core/utils/instrumentation.hpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/core/include/opencv2/core/utils/instrumentation.hpp 2023-12-31 10:47:15.700853336 +0900 +diff -ruN opencv-4.10.0/modules/core/include/opencv2/core/utils/instrumentation.hpp opencv-4.10.0-patch/modules/core/include/opencv2/core/utils/instrumentation.hpp +--- opencv-4.10.0/modules/core/include/opencv2/core/utils/instrumentation.hpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/core/include/opencv2/core/utils/instrumentation.hpp 2024-06-17 07:24:40.861495508 +0900 @@ -92,7 +92,7 @@ double getTotalMs() const { return ((double)m_ticksTotal / cv::getTickFrequency()) * 1000; } double getMeanMs() const { return (((double)m_ticksTotal/m_counter) / cv::getTickFrequency()) * 1000; } @@ -75,10 +82,10 @@ diff -ruN opencv-4.9.0/modules/core/include/opencv2/core/utils/instrumentation.h typedef Node InstrNode; -diff -ruN opencv-4.9.0/modules/core/src/system.cpp opencv-4.9.0-patch/modules/core/src/system.cpp ---- opencv-4.9.0/modules/core/src/system.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/core/src/system.cpp 2023-12-31 10:47:15.700853336 +0900 -@@ -2464,7 +2464,7 @@ +diff -ruN opencv-4.10.0/modules/core/src/system.cpp opencv-4.10.0-patch/modules/core/src/system.cpp +--- opencv-4.10.0/modules/core/src/system.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/core/src/system.cpp 2024-06-17 07:24:40.861495508 +0900 +@@ -2433,7 +2433,7 @@ NodeData::~NodeData() { } @@ -87,9 +94,9 @@ diff -ruN opencv-4.9.0/modules/core/src/system.cpp opencv-4.9.0-patch/modules/co { if(left.m_lineNum == right.m_lineNum && left.m_funName == right.m_funName && left.m_fileName == right.m_fileName) { -diff -ruN opencv-4.9.0/modules/dnn/include/opencv2/dnn/dnn.hpp opencv-4.9.0-patch/modules/dnn/include/opencv2/dnn/dnn.hpp ---- opencv-4.9.0/modules/dnn/include/opencv2/dnn/dnn.hpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/include/opencv2/dnn/dnn.hpp 2023-12-31 10:47:15.701853338 +0900 +diff -ruN opencv-4.10.0/modules/dnn/include/opencv2/dnn/dnn.hpp opencv-4.10.0-patch/modules/dnn/include/opencv2/dnn/dnn.hpp +--- opencv-4.10.0/modules/dnn/include/opencv2/dnn/dnn.hpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/include/opencv2/dnn/dnn.hpp 2024-06-17 07:24:40.862495510 +0900 @@ -155,7 +155,7 @@ /** * @brief Derivatives of this class encapsulates functions of certain backends. @@ -117,10 +124,10 @@ diff -ruN opencv-4.9.0/modules/dnn/include/opencv2/dnn/dnn.hpp opencv-4.9.0-patc /** * @brief Returns parameters of layers with channel-wise multiplication and addition. -diff -ruN opencv-4.9.0/modules/dnn/src/int8layers/batch_norm_layer.cpp opencv-4.9.0-patch/modules/dnn/src/int8layers/batch_norm_layer.cpp ---- opencv-4.9.0/modules/dnn/src/int8layers/batch_norm_layer.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/int8layers/batch_norm_layer.cpp 2023-12-31 10:47:15.701853338 +0900 -@@ -59,7 +59,7 @@ +diff -ruN opencv-4.10.0/modules/dnn/src/int8layers/batch_norm_layer.cpp opencv-4.10.0-patch/modules/dnn/src/int8layers/batch_norm_layer.cpp +--- opencv-4.10.0/modules/dnn/src/int8layers/batch_norm_layer.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/int8layers/batch_norm_layer.cpp 2024-06-17 07:24:40.862495510 +0900 +@@ -57,7 +57,7 @@ zeropoint = output_zp; } @@ -129,9 +136,9 @@ diff -ruN opencv-4.9.0/modules/dnn/src/int8layers/batch_norm_layer.cpp opencv-4. { Mat w_, b_; top->getScaleShift(w_, b_); -diff -ruN opencv-4.9.0/modules/dnn/src/int8layers/convolution_layer.cpp opencv-4.9.0-patch/modules/dnn/src/int8layers/convolution_layer.cpp ---- opencv-4.9.0/modules/dnn/src/int8layers/convolution_layer.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/int8layers/convolution_layer.cpp 2023-12-31 10:47:15.701853338 +0900 +diff -ruN opencv-4.10.0/modules/dnn/src/int8layers/convolution_layer.cpp opencv-4.10.0-patch/modules/dnn/src/int8layers/convolution_layer.cpp +--- opencv-4.10.0/modules/dnn/src/int8layers/convolution_layer.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/int8layers/convolution_layer.cpp 2024-06-17 07:24:40.863495512 +0900 @@ -134,7 +134,7 @@ (dilation.height == 1 && dilation.width == 1); } @@ -150,9 +157,9 @@ diff -ruN opencv-4.9.0/modules/dnn/src/int8layers/convolution_layer.cpp opencv-4 { return BaseConvolutionLayerInt8Impl::tryFuse(top); } -diff -ruN opencv-4.9.0/modules/dnn/src/int8layers/softmax_layer.cpp opencv-4.9.0-patch/modules/dnn/src/int8layers/softmax_layer.cpp ---- opencv-4.9.0/modules/dnn/src/int8layers/softmax_layer.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/int8layers/softmax_layer.cpp 2023-12-31 10:47:15.702853340 +0900 +diff -ruN opencv-4.10.0/modules/dnn/src/int8layers/softmax_layer.cpp opencv-4.10.0-patch/modules/dnn/src/int8layers/softmax_layer.cpp +--- opencv-4.10.0/modules/dnn/src/int8layers/softmax_layer.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/int8layers/softmax_layer.cpp 2024-06-17 07:24:40.863495512 +0900 @@ -95,7 +95,7 @@ backendId == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH; } @@ -162,9 +169,9 @@ diff -ruN opencv-4.9.0/modules/dnn/src/int8layers/softmax_layer.cpp opencv-4.9.0 { Ptr dequantize_layer = top.dynamicCast(); return !dequantize_layer.empty() && preferableTarget != DNN_TARGET_OPENCL_FP16; -diff -ruN opencv-4.9.0/modules/dnn/src/layer.cpp opencv-4.9.0-patch/modules/dnn/src/layer.cpp ---- opencv-4.9.0/modules/dnn/src/layer.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/layer.cpp 2023-12-31 10:47:15.702853340 +0900 +diff -ruN opencv-4.10.0/modules/dnn/src/layer.cpp opencv-4.10.0-patch/modules/dnn/src/layer.cpp +--- opencv-4.10.0/modules/dnn/src/layer.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/layer.cpp 2024-06-17 07:24:40.863495512 +0900 @@ -99,7 +99,7 @@ } @@ -174,10 +181,10 @@ diff -ruN opencv-4.9.0/modules/dnn/src/layer.cpp opencv-4.9.0-patch/modules/dnn/ void Layer::getScaleShift(Mat& scale, Mat& shift) const { scale = Mat(); -diff -ruN opencv-4.9.0/modules/dnn/src/layers/batch_norm_layer.cpp opencv-4.9.0-patch/modules/dnn/src/layers/batch_norm_layer.cpp ---- opencv-4.9.0/modules/dnn/src/layers/batch_norm_layer.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/layers/batch_norm_layer.cpp 2023-12-31 10:47:15.702853340 +0900 -@@ -121,7 +121,7 @@ +diff -ruN opencv-4.10.0/modules/dnn/src/layers/batch_norm_layer.cpp opencv-4.10.0-patch/modules/dnn/src/layers/batch_norm_layer.cpp +--- opencv-4.10.0/modules/dnn/src/layers/batch_norm_layer.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/layers/batch_norm_layer.cpp 2024-06-17 07:24:40.864495515 +0900 +@@ -119,7 +119,7 @@ shift = bias_; } @@ -186,9 +193,9 @@ diff -ruN opencv-4.9.0/modules/dnn/src/layers/batch_norm_layer.cpp opencv-4.9.0- { Mat w, b; top->getScaleShift(w, b); -diff -ruN opencv-4.9.0/modules/dnn/src/layers/convolution_layer.cpp opencv-4.9.0-patch/modules/dnn/src/layers/convolution_layer.cpp ---- opencv-4.9.0/modules/dnn/src/layers/convolution_layer.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/layers/convolution_layer.cpp 2023-12-31 10:47:15.702853340 +0900 +diff -ruN opencv-4.10.0/modules/dnn/src/layers/convolution_layer.cpp opencv-4.10.0-patch/modules/dnn/src/layers/convolution_layer.cpp +--- opencv-4.10.0/modules/dnn/src/layers/convolution_layer.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/layers/convolution_layer.cpp 2024-06-17 07:24:40.864495515 +0900 @@ -177,7 +177,7 @@ (dilation.height == 1 && dilation.width == 1); } @@ -216,9 +223,9 @@ diff -ruN opencv-4.9.0/modules/dnn/src/layers/convolution_layer.cpp opencv-4.9.0 { if (fusedAdd) // If the Conv layer has fused Add layer, it cannot fuse other layers. return false; -diff -ruN opencv-4.9.0/modules/dnn/src/layers/elementwise_layers.cpp opencv-4.9.0-patch/modules/dnn/src/layers/elementwise_layers.cpp ---- opencv-4.9.0/modules/dnn/src/layers/elementwise_layers.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/layers/elementwise_layers.cpp 2023-12-31 10:47:15.703853341 +0900 +diff -ruN opencv-4.10.0/modules/dnn/src/layers/elementwise_layers.cpp opencv-4.10.0-patch/modules/dnn/src/layers/elementwise_layers.cpp +--- opencv-4.10.0/modules/dnn/src/layers/elementwise_layers.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/layers/elementwise_layers.cpp 2024-06-17 07:24:40.865495517 +0900 @@ -217,7 +217,7 @@ #endif @@ -246,9 +253,9 @@ diff -ruN opencv-4.9.0/modules/dnn/src/layers/elementwise_layers.cpp opencv-4.9. { if (power != 1.0f && shift != 0.0f) return false; -diff -ruN opencv-4.9.0/modules/dnn/src/layers/lrn_layer.cpp opencv-4.9.0-patch/modules/dnn/src/layers/lrn_layer.cpp ---- opencv-4.9.0/modules/dnn/src/layers/lrn_layer.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/layers/lrn_layer.cpp 2023-12-31 10:47:15.703853341 +0900 +diff -ruN opencv-4.10.0/modules/dnn/src/layers/lrn_layer.cpp opencv-4.10.0-patch/modules/dnn/src/layers/lrn_layer.cpp +--- opencv-4.10.0/modules/dnn/src/layers/lrn_layer.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/layers/lrn_layer.cpp 2024-06-17 07:24:40.865495517 +0900 @@ -402,7 +402,7 @@ return Ptr(); } @@ -258,9 +265,9 @@ diff -ruN opencv-4.9.0/modules/dnn/src/layers/lrn_layer.cpp opencv-4.9.0-patch/m const std::vector &inputs, const std::vector &outputs, int targetId) const CV_OVERRIDE -diff -ruN opencv-4.9.0/modules/dnn/src/layers/not_implemented_layer.cpp opencv-4.9.0-patch/modules/dnn/src/layers/not_implemented_layer.cpp ---- opencv-4.9.0/modules/dnn/src/layers/not_implemented_layer.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/layers/not_implemented_layer.cpp 2023-12-31 10:47:15.703853341 +0900 +diff -ruN opencv-4.10.0/modules/dnn/src/layers/not_implemented_layer.cpp opencv-4.10.0-patch/modules/dnn/src/layers/not_implemented_layer.cpp +--- opencv-4.10.0/modules/dnn/src/layers/not_implemented_layer.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/layers/not_implemented_layer.cpp 2024-06-17 07:24:40.865495517 +0900 @@ -108,7 +108,7 @@ CV_Error(Error::StsNotImplemented, msg); } @@ -279,10 +286,10 @@ diff -ruN opencv-4.9.0/modules/dnn/src/layers/not_implemented_layer.cpp opencv-4 { CV_Error(Error::StsNotImplemented, msg); } -diff -ruN opencv-4.9.0/modules/dnn/src/layers/pooling_layer.cpp opencv-4.9.0-patch/modules/dnn/src/layers/pooling_layer.cpp ---- opencv-4.9.0/modules/dnn/src/layers/pooling_layer.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/layers/pooling_layer.cpp 2023-12-31 10:47:15.704853343 +0900 -@@ -1281,7 +1281,7 @@ +diff -ruN opencv-4.10.0/modules/dnn/src/layers/pooling_layer.cpp opencv-4.10.0-patch/modules/dnn/src/layers/pooling_layer.cpp +--- opencv-4.10.0/modules/dnn/src/layers/pooling_layer.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/layers/pooling_layer.cpp 2024-06-17 07:24:40.866495519 +0900 +@@ -1272,7 +1272,7 @@ return Ptr(); } @@ -291,9 +298,9 @@ diff -ruN opencv-4.9.0/modules/dnn/src/layers/pooling_layer.cpp opencv-4.9.0-pat const std::vector &inputs, const std::vector &outputs, int targetId) const CV_OVERRIDE -diff -ruN opencv-4.9.0/modules/dnn/src/op_halide.cpp opencv-4.9.0-patch/modules/dnn/src/op_halide.cpp ---- opencv-4.9.0/modules/dnn/src/op_halide.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/dnn/src/op_halide.cpp 2023-12-31 10:47:15.704853343 +0900 +diff -ruN opencv-4.10.0/modules/dnn/src/op_halide.cpp opencv-4.10.0-patch/modules/dnn/src/op_halide.cpp +--- opencv-4.10.0/modules/dnn/src/op_halide.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/dnn/src/op_halide.cpp 2024-06-17 07:24:40.866495519 +0900 @@ -351,7 +351,7 @@ CV__DNN_INLINE_NS_BEGIN @@ -303,9 +310,9 @@ diff -ruN opencv-4.9.0/modules/dnn/src/op_halide.cpp opencv-4.9.0-patch/modules/ const std::vector &outputs, int targetId) const { #ifndef HAVE_HALIDE -diff -ruN opencv-4.9.0/modules/flann/include/opencv2/flann/miniflann.hpp opencv-4.9.0-patch/modules/flann/include/opencv2/flann/miniflann.hpp ---- opencv-4.9.0/modules/flann/include/opencv2/flann/miniflann.hpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/flann/include/opencv2/flann/miniflann.hpp 2023-12-31 10:47:15.704853343 +0900 +diff -ruN opencv-4.10.0/modules/flann/include/opencv2/flann/miniflann.hpp opencv-4.10.0-patch/modules/flann/include/opencv2/flann/miniflann.hpp +--- opencv-4.10.0/modules/flann/include/opencv2/flann/miniflann.hpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/flann/include/opencv2/flann/miniflann.hpp 2024-06-17 07:24:40.866495519 +0900 @@ -91,10 +91,6 @@ std::vector& numValues) const; @@ -317,9 +324,9 @@ diff -ruN opencv-4.9.0/modules/flann/include/opencv2/flann/miniflann.hpp opencv- }; struct CV_EXPORTS KDTreeIndexParams : public IndexParams -diff -ruN opencv-4.9.0/modules/imgproc/src/resize.cpp opencv-4.9.0-patch/modules/imgproc/src/resize.cpp ---- opencv-4.9.0/modules/imgproc/src/resize.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/imgproc/src/resize.cpp 2023-12-31 10:47:15.705853345 +0900 +diff -ruN opencv-4.10.0/modules/imgproc/src/resize.cpp opencv-4.10.0-patch/modules/imgproc/src/resize.cpp +--- opencv-4.10.0/modules/imgproc/src/resize.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/imgproc/src/resize.cpp 2024-06-17 07:24:40.867495522 +0900 @@ -858,11 +858,11 @@ void(*hResize)(ET* src, int cn, int *ofst, fixedpoint* m, fixedpoint* dst, int dst_min, int dst_max, int dst_width); switch (cn) @@ -337,9 +344,9 @@ diff -ruN opencv-4.9.0/modules/imgproc/src/resize.cpp opencv-4.9.0-patch/modules } interpolation interp_x(inv_scale_x, src_width, dst_width); -diff -ruN opencv-4.9.0/modules/java/CMakeLists.txt opencv-4.9.0-patch/modules/java/CMakeLists.txt ---- opencv-4.9.0/modules/java/CMakeLists.txt 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/java/CMakeLists.txt 2023-12-31 10:47:15.705853345 +0900 +diff -ruN opencv-4.10.0/modules/java/CMakeLists.txt opencv-4.10.0-patch/modules/java/CMakeLists.txt +--- opencv-4.10.0/modules/java/CMakeLists.txt 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/java/CMakeLists.txt 2024-06-17 07:24:40.868495524 +0900 @@ -3,15 +3,6 @@ add_subdirectory(generator) endif() @@ -356,7 +363,7 @@ diff -ruN opencv-4.9.0/modules/java/CMakeLists.txt opencv-4.9.0-patch/modules/ja set(the_description "The java bindings") ocv_add_module(java BINDINGS opencv_core opencv_imgproc PRIVATE_REQUIRED opencv_java_bindings_generator) -@@ -58,11 +49,6 @@ +@@ -56,11 +47,6 @@ add_subdirectory(jni) # generates ${the_module} target (${the_module}_jni doesn't work properly with Android non-gradle samples) @@ -368,9 +375,9 @@ diff -ruN opencv-4.9.0/modules/java/CMakeLists.txt opencv-4.9.0-patch/modules/ja if(BUILD_TESTS) if(ANDROID) -diff -ruN opencv-4.9.0/modules/java/common.cmake opencv-4.9.0-patch/modules/java/common.cmake ---- opencv-4.9.0/modules/java/common.cmake 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/java/common.cmake 2023-12-31 10:47:15.705853345 +0900 +diff -ruN opencv-4.10.0/modules/java/common.cmake opencv-4.10.0-patch/modules/java/common.cmake +--- opencv-4.10.0/modules/java/common.cmake 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/java/common.cmake 2024-06-17 07:24:40.868495524 +0900 @@ -1,10 +1,3 @@ -if(ANDROID) - ocv_update(OPENCV_JAVA_LIB_NAME_SUFFIX "${OPENCV_VERSION_MAJOR}") @@ -382,9 +389,9 @@ diff -ruN opencv-4.9.0/modules/java/common.cmake opencv-4.9.0-patch/modules/java if(MSVC) ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4996) else() -diff -ruN opencv-4.9.0/modules/java/generator/CMakeLists.txt opencv-4.9.0-patch/modules/java/generator/CMakeLists.txt ---- opencv-4.9.0/modules/java/generator/CMakeLists.txt 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/java/generator/CMakeLists.txt 2023-12-31 10:47:15.705853345 +0900 +diff -ruN opencv-4.10.0/modules/java/generator/CMakeLists.txt opencv-4.10.0-patch/modules/java/generator/CMakeLists.txt +--- opencv-4.10.0/modules/java/generator/CMakeLists.txt 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/java/generator/CMakeLists.txt 2024-06-17 07:24:40.868495524 +0900 @@ -5,9 +5,6 @@ set(OPENCV_JAVA_SIGNATURES_FILE "${CMAKE_CURRENT_BINARY_DIR}/opencv_java_signatures.json" CACHE INTERNAL "") set(OPENCV_JAVA_BINDINGS_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE INTERNAL "") @@ -403,9 +410,9 @@ diff -ruN opencv-4.9.0/modules/java/generator/CMakeLists.txt opencv-4.9.0-patch/ endif() unset(__config_str) -diff -ruN opencv-4.9.0/modules/java/jni/CMakeLists.txt opencv-4.9.0-patch/modules/java/jni/CMakeLists.txt ---- opencv-4.9.0/modules/java/jni/CMakeLists.txt 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/java/jni/CMakeLists.txt 2023-12-31 10:47:15.705853345 +0900 +diff -ruN opencv-4.10.0/modules/java/jni/CMakeLists.txt opencv-4.10.0-patch/modules/java/jni/CMakeLists.txt +--- opencv-4.10.0/modules/java/jni/CMakeLists.txt 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/java/jni/CMakeLists.txt 2024-06-17 07:24:40.868495524 +0900 @@ -25,6 +25,9 @@ elseif(APPLE) set(CMAKE_SHARED_MODULE_SUFFIX ".dylib") # Java is not able to load .so files @@ -425,9 +432,9 @@ diff -ruN opencv-4.9.0/modules/java/jni/CMakeLists.txt opencv-4.9.0-patch/module # Additional target properties set_target_properties(${the_module} PROPERTIES OUTPUT_NAME "${the_module}${OPENCV_JAVA_LIB_NAME_SUFFIX}" -diff -ruN opencv-4.9.0/modules/stitching/include/opencv2/stitching.hpp opencv-4.9.0-patch/modules/stitching/include/opencv2/stitching.hpp ---- opencv-4.9.0/modules/stitching/include/opencv2/stitching.hpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/stitching/include/opencv2/stitching.hpp 2023-12-31 10:47:15.706853347 +0900 +diff -ruN opencv-4.10.0/modules/stitching/include/opencv2/stitching.hpp opencv-4.10.0-patch/modules/stitching/include/opencv2/stitching.hpp +--- opencv-4.10.0/modules/stitching/include/opencv2/stitching.hpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/stitching/include/opencv2/stitching.hpp 2024-06-17 07:24:40.868495524 +0900 @@ -351,12 +351,12 @@ /** * @deprecated use Stitcher::create @@ -443,9 +450,9 @@ diff -ruN opencv-4.9.0/modules/stitching/include/opencv2/stitching.hpp opencv-4. //! @} stitching -diff -ruN opencv-4.9.0/modules/stitching/src/stitcher.cpp opencv-4.9.0-patch/modules/stitching/src/stitcher.cpp ---- opencv-4.9.0/modules/stitching/src/stitcher.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/stitching/src/stitcher.cpp 2023-12-31 10:47:15.706853347 +0900 +diff -ruN opencv-4.10.0/modules/stitching/src/stitcher.cpp opencv-4.10.0-patch/modules/stitching/src/stitcher.cpp +--- opencv-4.10.0/modules/stitching/src/stitcher.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/stitching/src/stitcher.cpp 2024-06-17 07:24:40.869495527 +0900 @@ -638,14 +638,14 @@ } @@ -463,9 +470,9 @@ diff -ruN opencv-4.9.0/modules/stitching/src/stitcher.cpp opencv-4.9.0-patch/mod { CV_INSTRUMENT_REGION(); -diff -ruN opencv-4.9.0/modules/video/src/tracking/detail/tracker_mil_state.hpp opencv-4.9.0-patch/modules/video/src/tracking/detail/tracker_mil_state.hpp ---- opencv-4.9.0/modules/video/src/tracking/detail/tracker_mil_state.hpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/video/src/tracking/detail/tracker_mil_state.hpp 2023-12-31 10:47:15.706853347 +0900 +diff -ruN opencv-4.10.0/modules/video/src/tracking/detail/tracker_mil_state.hpp opencv-4.10.0-patch/modules/video/src/tracking/detail/tracker_mil_state.hpp +--- opencv-4.10.0/modules/video/src/tracking/detail/tracker_mil_state.hpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/video/src/tracking/detail/tracker_mil_state.hpp 2024-06-17 07:24:40.869495527 +0900 @@ -20,7 +20,7 @@ /** * Implementation of the target state for TrackerStateEstimatorMILBoosting @@ -475,9 +482,9 @@ diff -ruN opencv-4.9.0/modules/video/src/tracking/detail/tracker_mil_state.hpp o { public: -diff -ruN opencv-4.9.0/modules/video/src/tracking/detail/tracking_online_mil.cpp opencv-4.9.0-patch/modules/video/src/tracking/detail/tracking_online_mil.cpp ---- opencv-4.9.0/modules/video/src/tracking/detail/tracking_online_mil.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/video/src/tracking/detail/tracking_online_mil.cpp 2023-12-31 10:47:15.706853347 +0900 +diff -ruN opencv-4.10.0/modules/video/src/tracking/detail/tracking_online_mil.cpp opencv-4.10.0-patch/modules/video/src/tracking/detail/tracking_online_mil.cpp +--- opencv-4.10.0/modules/video/src/tracking/detail/tracking_online_mil.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/video/src/tracking/detail/tracking_online_mil.cpp 2024-06-17 07:24:40.869495527 +0900 @@ -339,7 +339,7 @@ return float(log_p1 - log_p0); } @@ -487,9 +494,9 @@ diff -ruN opencv-4.9.0/modules/video/src/tracking/detail/tracking_online_mil.cpp { std::vector res(x.rows); -diff -ruN opencv-4.9.0/modules/video/src/tracking/detail/tracking_online_mil.hpp opencv-4.9.0-patch/modules/video/src/tracking/detail/tracking_online_mil.hpp ---- opencv-4.9.0/modules/video/src/tracking/detail/tracking_online_mil.hpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/video/src/tracking/detail/tracking_online_mil.hpp 2023-12-31 10:47:15.706853347 +0900 +diff -ruN opencv-4.10.0/modules/video/src/tracking/detail/tracking_online_mil.hpp opencv-4.10.0-patch/modules/video/src/tracking/detail/tracking_online_mil.hpp +--- opencv-4.10.0/modules/video/src/tracking/detail/tracking_online_mil.hpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/video/src/tracking/detail/tracking_online_mil.hpp 2024-06-17 07:24:40.869495527 +0900 @@ -49,7 +49,7 @@ uint _counter; }; @@ -499,202 +506,10 @@ diff -ruN opencv-4.9.0/modules/video/src/tracking/detail/tracking_online_mil.hpp { public: float _mu0, _mu1, _sig0, _sig1; -diff -ruN opencv-4.9.0/modules/videoio/src/cap_avfoundation.mm opencv-4.9.0-patch/modules/videoio/src/cap_avfoundation.mm ---- opencv-4.9.0/modules/videoio/src/cap_avfoundation.mm 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/videoio/src/cap_avfoundation.mm 2023-09-27 19:18:31.000000000 +0900 -@@ -61,8 +61,6 @@ - - #define DISABLE_AUTO_RESTART 999 - --#if !TARGET_OS_VISION -- - @interface CaptureDelegate : NSObject - { - int newFrame; -@@ -127,7 +125,6 @@ - int disableAutoRestart; - }; - --#endif - - /***************************************************************************** - * -@@ -163,7 +160,6 @@ - uint32_t mMode; - int mFormat; - -- void handleTracks(NSArray* tracks, const char* filename); - bool setupReadingAt(CMTime position); - IplImage* retrieveFramePixelBuffer(); - int getPreferredOrientationDegrees() const; -@@ -221,8 +217,6 @@ - - } - --#if !TARGET_OS_VISION -- - cv::Ptr cv::create_AVFoundation_capture_cam(int index) - { - CvCaptureCAM* retval = new CvCaptureCAM(index); -@@ -232,8 +226,6 @@ - return 0; - } - --#endif -- - cv::Ptr cv::create_AVFoundation_writer(const std::string& filename, int fourcc, - double fps, const cv::Size &frameSize, - const cv::VideoWriterParameters& params) -@@ -253,8 +245,6 @@ - * - *****************************************************************************/ - --#if !TARGET_OS_VISION -- - CvCaptureCAM::CvCaptureCAM(int cameraNum) { - mCaptureSession = nil; - mCaptureDeviceInput = nil; -@@ -783,7 +773,6 @@ - - @end - --#endif - - /***************************************************************************** - * -@@ -822,26 +811,24 @@ - return; - } - --// Available since iOS 15 --#if TARGET_OS_VISION || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) -- if (@available(iOS 15, visionOS 1, *)) { -- [mAsset loadTracksWithMediaType:AVMediaTypeVideo completionHandler:^(NSArray* tracks, NSError* err) { -- if (err != nil) { -- handleTracks(tracks, filename); -- } -- [localpool drain]; -- }]; -+ NSArray *tracks = [mAsset tracksWithMediaType:AVMediaTypeVideo]; -+ if ([tracks count] == 0) { -+ fprintf(stderr, "OpenCV: Couldn't read video stream from file \"%s\"\n", filename); -+ [localpool drain]; -+ started = 0; - return; -- } else { --#if !TARGET_OS_VISION -- NSArray *tracks = [mAsset tracksWithMediaType:AVMediaTypeVideo]; -- handleTracks(tracks, filename); --#endif - } --#else -- NSArray *tracks = [mAsset tracksWithMediaType:AVMediaTypeVideo]; -- handleTracks(tracks, filename); --#endif -+ -+ mAssetTrack = [tracks[0] retain]; -+ -+ if ( ! setupReadingAt(kCMTimeZero) ) { -+ fprintf(stderr, "OpenCV: Couldn't read movie file \"%s\"\n", filename); -+ [localpool drain]; -+ started = 0; -+ return; -+ } -+ -+ started = 1; - [localpool drain]; - } - -@@ -863,24 +850,6 @@ - [localpool drain]; - } - --void CvCaptureFile::handleTracks(NSArray* tracks, const char* filename) { -- if ([tracks count] == 0) { -- fprintf(stderr, "OpenCV: Couldn't read video stream from file \"%s\"\n", filename); -- started = 0; -- return; -- } -- -- mAssetTrack = [tracks[0] retain]; -- -- if ( ! setupReadingAt(kCMTimeZero) ) { -- fprintf(stderr, "OpenCV: Couldn't read movie file \"%s\"\n", filename); -- started = 0; -- return; -- } -- -- started = 1; --} -- - bool CvCaptureFile::setupReadingAt(CMTime position) { - if (mAssetReader) { - if (mAssetReader.status == AVAssetReaderStatusReading) { -@@ -1300,25 +1269,25 @@ - //exception; - } - -- // Three codec supported AVVideoCodecTypeH264 AVVideoCodecTypeJPEG AVVideoCodecTypeHEVC -+ // Three codec supported AVVideoCodecH264 AVVideoCodecJPEG AVVideoCodecTypeHEVC - // On iPhone 3G H264 is not supported. - if (fourcc == CV_FOURCC('J','P','E','G') || fourcc == CV_FOURCC('j','p','e','g') || - fourcc == CV_FOURCC('M','J','P','G') || fourcc == CV_FOURCC('m','j','p','g')){ -- codec = [AVVideoCodecTypeJPEG copy]; // Use JPEG codec if specified, otherwise H264 -+ codec = [AVVideoCodecJPEG copy]; // Use JPEG codec if specified, otherwise H264 - }else if(fourcc == CV_FOURCC('H','2','6','4') || fourcc == CV_FOURCC('a','v','c','1')){ -- codec = [AVVideoCodecTypeH264 copy]; -+ codec = [AVVideoCodecH264 copy]; - // Available since iOS 11 --#if TARGET_OS_VISION || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) -+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 - }else if(fourcc == CV_FOURCC('H','2','6','5') || fourcc == CV_FOURCC('h','v','c','1') || - fourcc == CV_FOURCC('H','E','V','C') || fourcc == CV_FOURCC('h','e','v','c')){ -- if (@available(iOS 11, visionOS 1, *)) { -+ if (@available(iOS 11, *)) { - codec = [AVVideoCodecTypeHEVC copy]; - } else { -- codec = [AVVideoCodecTypeH264 copy]; -+ codec = [AVVideoCodecH264 copy]; - } - #endif - }else{ -- codec = [AVVideoCodecTypeH264 copy]; // default canonical H264. -+ codec = [AVVideoCodecH264 copy]; // default canonical H264. - } - - //NSLog(@"Path: %@", path); -@@ -1380,17 +1349,17 @@ - NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init]; - - [mMovieWriterInput markAsFinished]; -- [mMovieWriter finishWritingWithCompletionHandler:^() { -- [mMovieWriter release]; -- [mMovieWriterInput release]; -- [mMovieWriterAdaptor release]; -- [path release]; -- [codec release]; -- [fileType release]; -- cvReleaseImage(&argbimage); -+ [mMovieWriter finishWriting]; -+ [mMovieWriter release]; -+ [mMovieWriterInput release]; -+ [mMovieWriterAdaptor release]; -+ [path release]; -+ [codec release]; -+ [fileType release]; -+ cvReleaseImage(&argbimage); -+ -+ [localpool drain]; - -- [localpool drain]; -- }]; - } - - bool CvVideoWriter_AVFoundation::writeFrame(const IplImage* iplimage) { -diff -ruN opencv-4.9.0/modules/videoio/src/cap_v4l.cpp opencv-4.9.0-patch/modules/videoio/src/cap_v4l.cpp ---- opencv-4.9.0/modules/videoio/src/cap_v4l.cpp 2023-12-28 01:46:55.000000000 +0900 -+++ opencv-4.9.0-patch/modules/videoio/src/cap_v4l.cpp 2023-12-31 10:47:15.707853349 +0900 -@@ -1944,8 +1944,6 @@ +diff -ruN opencv-4.10.0/modules/videoio/src/cap_v4l.cpp opencv-4.10.0-patch/modules/videoio/src/cap_v4l.cpp +--- opencv-4.10.0/modules/videoio/src/cap_v4l.cpp 2024-06-02 20:41:07.000000000 +0900 ++++ opencv-4.10.0-patch/modules/videoio/src/cap_v4l.cpp 2024-06-17 07:24:40.869495527 +0900 +@@ -1790,8 +1790,6 @@ return V4L2_CID_FOCUS_ABSOLUTE; case cv::CAP_PROP_GUID: return -1; @@ -703,7 +518,7 @@ diff -ruN opencv-4.9.0/modules/videoio/src/cap_v4l.cpp opencv-4.9.0-patch/module case cv::CAP_PROP_BACKLIGHT: return V4L2_CID_BACKLIGHT_COMPENSATION; case cv::CAP_PROP_PAN: -@@ -1962,10 +1960,6 @@ +@@ -1808,10 +1806,6 @@ return -1; case cv::CAP_PROP_AUTOFOCUS: return V4L2_CID_FOCUS_AUTO; diff --git a/opencv/platform/gpu/pom.xml b/opencv/platform/gpu/pom.xml index d396e019a2a..6c241bfdeda 100644 --- a/opencv/platform/gpu/pom.xml +++ b/opencv/platform/gpu/pom.xml @@ -12,7 +12,7 @@ org.bytedeco opencv-platform-gpu - 4.9.0-${project.parent.version} + 4.10.0-${project.parent.version} JavaCPP Presets Platform GPU for OpenCV diff --git a/opencv/platform/pom.xml b/opencv/platform/pom.xml index 7c4c92fbdda..a5566975717 100644 --- a/opencv/platform/pom.xml +++ b/opencv/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco opencv-platform - 4.9.0-${project.parent.version} + 4.10.0-${project.parent.version} JavaCPP Presets Platform for OpenCV diff --git a/opencv/pom.xml b/opencv/pom.xml index e4a401f2bc3..bdf74bbe2b3 100644 --- a/opencv/pom.xml +++ b/opencv/pom.xml @@ -11,7 +11,7 @@ org.bytedeco opencv - 4.9.0-${project.parent.version} + 4.10.0-${project.parent.version} JavaCPP Presets for OpenCV @@ -23,7 +23,7 @@ org.bytedeco numpy - 1.26.4-${project.parent.version} + 2.0.0-${project.parent.version} true @@ -67,7 +67,7 @@ org.bytedeco numpy-platform - 1.26.4-${project.parent.version} + 2.0.0-${project.parent.version} diff --git a/opencv/samples/pom.xml b/opencv/samples/pom.xml index 199de5d82ef..27879e83205 100644 --- a/opencv/samples/pom.xml +++ b/opencv/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco opencv-platform - 4.9.0-1.5.11-SNAPSHOT + 4.10.0-1.5.11-SNAPSHOT org.bytedeco opencv-platform-gpu - 4.9.0-1.5.11-SNAPSHOT + 4.10.0-1.5.11-SNAPSHOT @@ -40,7 +40,7 @@ org.bytedeco numpy-platform - 1.26.4-1.5.11-SNAPSHOT + 2.0.0-1.5.11-SNAPSHOT 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 index 138f50da764..1c27607fb3f 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -232,7 +232,7 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { @ByVal GpuMat detectedIds, @ByVal GpuMat objPoints, @ByVal GpuMat imgPoints); -/** @deprecated Use cv::solvePnP +/** @deprecated Use Board::matchImagePoints and cv::solvePnP */ @Namespace("cv::aruco") public static native int estimatePoseBoard(@ByVal MatVector corners, @ByVal Mat ids, @Ptr Board board, @ByVal Mat cameraMatrix, @ByVal Mat distCoeffs, @ByVal Mat rvec, @@ -306,6 +306,7 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { * This function estimates a Charuco board pose from some detected corners. * The function checks if the input corners are enough and valid to perform pose estimation. * If pose estimation is valid, returns true, else returns false. + * @deprecated Use CharucoBoard::matchImagePoints and cv::solvePnP * @see use cv::drawFrameAxes to get world coordinate system axis for object points */ @Namespace("cv::aruco") public static native @Cast("bool") boolean estimatePoseCharucoBoard(@ByVal Mat charucoCorners, @ByVal Mat charucoIds, @@ -431,7 +432,10 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { * PatternPositionType defines center this system and axes direction. * Axis X (red color) - first coordinate, axis Y (green color) - second coordinate, * axis Z (blue color) - third coordinate. - * @see estimatePoseSingleMarkers(), check tutorial_aruco_detection in aruco contrib + * + * @deprecated Use Board::matchImagePoints and cv::solvePnP + * + * @see estimatePoseSingleMarkers() */ /** enum cv::aruco::PatternPositionType */ public static final int @@ -440,9 +444,6 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { * The coordinates of the four corners (CCW order) of the marker in its own coordinate system are: * (-markerLength/2, markerLength/2, 0), (markerLength/2, markerLength/2, 0), * (markerLength/2, -markerLength/2, 0), (-markerLength/2, -markerLength/2, 0). - * - * These pattern points define this coordinate system: - * ![Image with axes drawn](tutorials/images/singlemarkersaxes2.jpg) */ ARUCO_CCW_CENTER = 0, /** \brief The marker coordinate system is centered on the top-left corner of the marker. @@ -451,9 +452,6 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { * (0, 0, 0), (markerLength, 0, 0), * (markerLength, markerLength, 0), (0, markerLength, 0). * - * These pattern points define this coordinate system: - * ![Image with axes drawn](tutorials/images/singlemarkersaxes.jpg) - * * These pattern dots are convenient to use with a chessboard/ChArUco board. */ ARUCO_CW_TOP_LEFT_CORNER = 1; @@ -496,6 +494,8 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { * This function calibrates a camera using an Aruco Board. The function receives a list of * detected markers from several views of the Board. The process is similar to the chessboard * calibration in calibrateCamera(). The function returns the final re-projection error. + * + * @deprecated Use Board::matchImagePoints and cv::solvePnP */ @Namespace("cv::aruco") public static native @Name("calibrateCameraAruco") double calibrateCameraArucoExtended(@ByVal MatVector corners, @ByVal Mat ids, @ByVal Mat counter, @Ptr Board board, @ByVal Size imageSize, @ByVal Mat cameraMatrix, @ByVal Mat distCoeffs, @@ -581,6 +581,7 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { /** \overload * \brief It's the same function as #calibrateCameraAruco but without calibration error estimation. + * @deprecated Use Board::matchImagePoints and cv::solvePnP */ @Namespace("cv::aruco") public static native double calibrateCameraAruco(@ByVal MatVector corners, @ByVal Mat ids, @ByVal Mat counter, @Ptr Board board, @ByVal Size imageSize, @ByVal Mat cameraMatrix, @@ -698,6 +699,8 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { * This function calibrates a camera using a set of corners of a Charuco Board. The function * receives a list of detected corners and its identifiers from several views of the Board. * The function returns the final re-projection error. + * + * @deprecated Use CharucoBoard::matchImagePoints and cv::solvePnP */ @Namespace("cv::aruco") public static native @Name("calibrateCameraCharuco") double calibrateCameraCharucoExtended(@ByVal MatVector charucoCorners, @ByVal MatVector charucoIds, @Ptr CharucoBoard board, @ByVal Size imageSize, @ByVal Mat cameraMatrix, @@ -801,6 +804,8 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { /** * \brief It's the same function as #calibrateCameraCharuco but without calibration error estimation. + * + * @deprecated Use CharucoBoard::matchImagePoints and cv::solvePnP */ @Namespace("cv::aruco") public static native double calibrateCameraCharuco(@ByVal MatVector charucoCorners, @ByVal MatVector charucoIds, @Ptr CharucoBoard board, @ByVal Size imageSize, @@ -1145,6 +1150,8 @@ public class opencv_aruco extends org.bytedeco.opencv.presets.opencv_aruco { * @param borderBits width of the marker borders. * * This function return the image of a ChArUco marker, ready to be printed. + * + * @deprecated Use CharucoBoard::generateImage() */ @Namespace("cv::aruco") public static native void drawCharucoDiamond(@Ptr Dictionary dictionary, @ByVal @Cast("cv::Vec4i*") Scalar4i ids, int squareLength, int markerLength, @ByVal Mat img, int marginSize/*=0*/, 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 index 09b32dfaedf..8f39f94ecec 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 index bc0a8a68034..5e1eedcee83 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -269,7 +269,7 @@ The module provides biological visual systems models (human visual system and ot ** ** ** - ** This class is based on image processing tools of the author and already used within the Retina class (this is the same code as method retina::applyFastToneMapping, but in an independent class, it is ligth from a memory requirement point of view). It implements an adaptation of the efficient tone mapping algorithm propose by David Alleyson, Sabine Susstruck and Laurence Meylan's work, please cite: + ** This class is based on image processing tools of the author and already used within the Retina class (this is the same code as method retina::applyFastToneMapping, but in an independent class, it is light from a memory requirement point of view). It implements an adaptation of the efficient tone mapping algorithm propose by David Alleyson, Sabine Susstruck and Laurence Meylan's work, please cite: ** -> Meylan L., Alleysson D., and Susstrunk S., A Model of Retinal Local Adaptation for the Tone Mapping of Color Filter Array Images, Journal of Optical Society of America, A, Vol. 24, N 9, September, 1st, 2007, pp. 2807-2816 ** ** 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 index 525ce0f9a97..c5cda3bc0fc 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -196,6 +196,7 @@ public class opencv_calib3d extends org.bytedeco.opencv.presets.opencv_calib3d { // #include "opencv2/core/types.hpp" // #include "opencv2/features2d.hpp" // #include "opencv2/core/affine.hpp" +// #include "opencv2/core/utils/logger.hpp" /** \defgroup calib3d Camera Calibration and 3D Reconstruction @@ -580,8 +581,6 @@ and pincushion distortion ({@code 1 + k_1 r^2 + k_2 r^4 + k_3 r^6 } monotonical

Summary: Generic camera model \cite Kannala2006 with perspective projection and without distortion correction -

- \defgroup calib3d_c C API

\} */ @@ -838,8 +837,8 @@ Regardless of the method, robust or not, the computed homography matrix is refin noise is rather small, use the default method (method=0).

The function is used to find initial intrinsic and extrinsic matrices. Homography matrix is -determined up to a scale. Thus, it is normalized so that {@code h_{33}=1}. Note that whenever an {@code H} matrix -cannot be estimated, an empty one will be returned. +determined up to a scale. If {@code h_{33}} is non-zero, the matrix is normalized so that {@code h_{33}=1}. +\note Whenever an {@code H} matrix cannot be estimated, an empty one will be returned.

@see getAffineTransform, estimateAffine2D, estimateAffinePartial2D, getPerspectiveTransform, warpPerspective, @@ -3339,13 +3338,13 @@ of confidence (probability) that the estimated matrix is correct.

@param points1 Array of N (N \>= 5) 2D points from the first image. The point coordinates should be floating-point (single or double precision). -@param points2 Array of the second image points of the same size and format as points1 . +@param points2 Array of the second image points of the same size and format as points1. @param cameraMatrix Camera intrinsic matrix {@code \cameramatrix{A}} . Note that this function assumes that points1 and points2 are feature points from cameras with the -same camera intrinsic matrix. If this assumption does not hold for your use case, use -#undistortPoints with {@code P = cv::NoArray()} for both cameras to transform image points -to normalized image coordinates, which are valid for the identity camera intrinsic matrix. When -passing these coordinates, pass the identity matrix for this parameter. +same camera intrinsic matrix. If this assumption does not hold for your use case, use another +function overload or #undistortPoints with {@code P = cv::NoArray()} for both cameras to transform image +points to normalized image coordinates, which are valid for the identity camera intrinsic matrix. +When passing these coordinates, pass the identity matrix for this parameter. @param method Method for computing an essential matrix. - \ref RANSAC for the RANSAC algorithm. - \ref LMEDS for the LMedS algorithm. @@ -3504,23 +3503,13 @@ of confidence (probability) that the estimated matrix is correct.

@param points1 Array of N (N \>= 5) 2D points from the first image. The point coordinates should be floating-point (single or double precision). -@param points2 Array of the second image points of the same size and format as points1 . -@param cameraMatrix1 Camera matrix {@code K = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}} . -Note that this function assumes that points1 and points2 are feature points from cameras with the -same camera matrix. If this assumption does not hold for your use case, use -#undistortPoints with {@code P = cv::NoArray()} for both cameras to transform image points -to normalized image coordinates, which are valid for the identity camera matrix. When -passing these coordinates, pass the identity matrix for this parameter. -@param cameraMatrix2 Camera matrix {@code K = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}} . -Note that this function assumes that points1 and points2 are feature points from cameras with the -same camera matrix. If this assumption does not hold for your use case, use -#undistortPoints with {@code P = cv::NoArray()} for both cameras to transform image points -to normalized image coordinates, which are valid for the identity camera matrix. When -passing these coordinates, pass the identity matrix for this parameter. -@param distCoeffs1 Input vector of distortion coefficients +@param points2 Array of the second image points of the same size and format as points1. +@param cameraMatrix1 Camera matrix for the first camera {@code K = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}} . +@param cameraMatrix2 Camera matrix for the second camera {@code K = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}} . +@param distCoeffs1 Input vector of distortion coefficients for the first camera {@code (k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6[, s_1, s_2, s_3, s_4[, \tau_x, \tau_y]]]])} of 4, 5, 8, 12 or 14 elements. If the vector is NULL/empty, the zero distortion coefficients are assumed. -@param distCoeffs2 Input vector of distortion coefficients +@param distCoeffs2 Input vector of distortion coefficients for the second camera {@code (k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6[, s_1, s_2, s_3, s_4[, \tau_x, \tau_y]]]])} of 4, 5, 8, 12 or 14 elements. If the vector is NULL/empty, the zero distortion coefficients are assumed. @param method Method for computing an essential matrix. @@ -4026,7 +4015,7 @@ surface. That is, for each pixel (x,y) and the corresponding disparity d=dispari x \\ y \\ \texttt{disparity} (x,y) \\ -z +1 \end{bmatrix}.\]}

@see @@ -5309,6 +5298,57 @@ of previous output parameter ( rvecs ). /** \overload */ + /** + \brief Finds an object pose from 3D-2D point correspondences for fisheye camera moodel. +

+ @param objectPoints Array of object points in the object coordinate space, Nx3 1-channel or + 1xN/Nx1 3-channel, where N is the number of points. vector\ can be also passed here. + @param imagePoints Array of corresponding image points, Nx2 1-channel or 1xN/Nx1 2-channel, + where N is the number of points. vector\ can be also passed here. + @param cameraMatrix Input camera intrinsic matrix {@code \cameramatrix{A}} . + @param distCoeffs Input vector of distortion coefficients (4x1/1x4). + @param rvec Output rotation vector (see \ref Rodrigues ) that, together with tvec, brings points from + the model coordinate system to the camera coordinate system. + @param tvec Output translation vector. + @param useExtrinsicGuess Parameter used for #SOLVEPNP_ITERATIVE. If true (1), the function uses + the provided rvec and tvec values as initial approximations of the rotation and translation + vectors, respectively, and further optimizes them. + @param flags Method for solving a PnP problem: see \ref calib3d_solvePnP_flags + This function returns the rotation and the translation vectors that transform a 3D point expressed in the object + coordinate frame to the camera coordinate frame, using different methods: + - P3P methods (\ref SOLVEPNP_P3P, \ref SOLVEPNP_AP3P): need 4 input points to return a unique solution. + - \ref SOLVEPNP_IPPE Input points must be >= 4 and object points must be coplanar. + - \ref SOLVEPNP_IPPE_SQUARE Special case suitable for marker pose estimation. + Number of input points must be 4. Object points must be defined in the following order: + - point 0: [-squareLength / 2, squareLength / 2, 0] + - point 1: [ squareLength / 2, squareLength / 2, 0] + - point 2: [ squareLength / 2, -squareLength / 2, 0] + - point 3: [-squareLength / 2, -squareLength / 2, 0] + - for all the other flags, number of input points must be >= 4 and object points can be in any configuration. + @param criteria Termination criteria for internal undistortPoints call. + The function interally undistorts points with \ref undistortPoints and call \ref cv::solvePnP, + thus the input are very similar. Check there and Perspective-n-Points is described in \ref calib3d_solvePnP + for more information. + */ + @Namespace("cv::fisheye") public static native @Cast("bool") boolean solvePnP( @ByVal Mat objectPoints, @ByVal Mat imagePoints, + @ByVal Mat cameraMatrix, @ByVal Mat distCoeffs, + @ByVal Mat rvec, @ByVal Mat tvec, + @Cast("bool") boolean useExtrinsicGuess/*=false*/, int flags/*=cv::SOLVEPNP_ITERATIVE*/, + @ByVal(nullValue = "cv::TermCriteria(cv::TermCriteria::MAX_ITER + cv::TermCriteria::EPS, 10, 1e-8)") TermCriteria criteria + ); + @Namespace("cv::fisheye") public static native @Cast("bool") boolean solvePnP( @ByVal UMat objectPoints, @ByVal UMat imagePoints, + @ByVal UMat cameraMatrix, @ByVal UMat distCoeffs, + @ByVal UMat rvec, @ByVal UMat tvec, + @Cast("bool") boolean useExtrinsicGuess/*=false*/, int flags/*=cv::SOLVEPNP_ITERATIVE*/, + @ByVal(nullValue = "cv::TermCriteria(cv::TermCriteria::MAX_ITER + cv::TermCriteria::EPS, 10, 1e-8)") TermCriteria criteria + ); + @Namespace("cv::fisheye") public static native @Cast("bool") boolean solvePnP( @ByVal GpuMat objectPoints, @ByVal GpuMat imagePoints, + @ByVal GpuMat cameraMatrix, @ByVal GpuMat distCoeffs, + @ByVal GpuMat rvec, @ByVal GpuMat tvec, + @Cast("bool") boolean useExtrinsicGuess/*=false*/, int flags/*=cv::SOLVEPNP_ITERATIVE*/, + @ByVal(nullValue = "cv::TermCriteria(cv::TermCriteria::MAX_ITER + cv::TermCriteria::EPS, 10, 1e-8)") TermCriteria criteria + ); + /** \} calib3d_fisheye */ // end namespace fisheye 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 index e73fb886467..d26d3d235fc 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -472,6 +472,14 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { // #elif defined __INTEL_COMPILER // #endif +// #if defined _WIN32 +// # define CV_CDECL __cdecl +// # define CV_STDCALL __stdcall +// #else +// # define CV_CDECL +// # define CV_STDCALL +// #endif + // #ifndef CV_INLINE // # if defined __cplusplus // # define CV_INLINE static inline @@ -728,11 +736,14 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { // #define CV_WRAP_MAPPABLE(mappable) // #define CV_WRAP_PHANTOM(phantom_header) // #define CV_WRAP_DEFAULT(val) +/* Indicates that the function parameter has filesystem path semantic */ +// #define CV_WRAP_FILE_PATH /****************************************************************************************\ * Matrix type (Mat) * \****************************************************************************************/ +public static final int CV_MAX_DIM = 32; public static final int CV_MAT_CN_MASK = ((CV_CN_MAX - 1) << CV_CN_SHIFT); public static native int CV_MAT_CN(int flags); public static final int CV_MAT_TYPE_MASK = (CV_DEPTH_MAX*CV_CN_MAX - 1); @@ -759,6 +770,13 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { // # define MAX(a,b) ((a) < (b) ? (b) : (a)) // #endif +/** min & max without jumps */ +// #define CV_IMIN(a, b) ((a) ^ (((a)^(b)) & (((a) < (b)) - 1))) +// #define CV_IMAX(a, b) ((a) ^ (((a)^(b)) & (((a) > (b)) - 1))) +// #define CV_SWAP(a,b,t) ((t) = (a), (a) = (b), (b) = (t)) +// #define CV_CMP(a,b) (((a) > (b)) - ((a) < (b))) +// #define CV_SIGN(a) CV_CMP((a),0) + ///////////////////////////////////////// Enum operators /////////////////////////////////////// /** @@ -988,86 +1006,52 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { // #endif -/****************************************************************************************\ -* CV_NODISCARD attribute (deprecated, GCC only) * -* DONT USE: use instead the standard CV_NODISCARD_STD macro above * -* this legacy method silently fails to issue warning until some version * -* after gcc 6.3.0. Yet with gcc 7+ you can use the above standard method * -* which makes this method useless. Don't use it. * -* @deprecated use instead CV_NODISCARD_STD * -\****************************************************************************************/ -// #ifndef CV_NODISCARD -// # if defined(__GNUC__) -// # elif defined(__clang__) && defined(__has_attribute) -// # if __has_attribute(__warn_unused_result__) -// # define CV_NODISCARD __attribute__((__warn_unused_result__)) -// # endif -// # endif -// #endif -// #ifndef CV_NODISCARD -// # define CV_NODISCARD /* nothing by default */ -// #endif - - /****************************************************************************************\ * C++ 11 * \****************************************************************************************/ -// #ifndef CV_CXX11 -// # if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1800) +// #ifdef __cplusplus +// MSVC was stuck at __cplusplus == 199711L for a long time, even where it supports C++11, +// so check _MSC_VER instead. See: +// +// # if defined(_MSC_VER) +// # elif __cplusplus < 201103L +// # error "OpenCV 4.x+ requires enabled C++11 support" // # endif -// #else // #endif + // #ifndef CV_CXX11 -// # error "OpenCV 4.x+ requires enabled C++11 support" +public static native @MemberGetter int CV_CXX11(); +public static final int CV_CXX11 = CV_CXX11(); // #endif -public static final int CV_CXX_MOVE_SEMANTICS = 1; -// #define CV_CXX_MOVE(x) std::move(x) -public static final int CV_CXX_STD_ARRAY = 1; -// #include // #ifndef CV_OVERRIDE // # define CV_OVERRIDE override // #endif + // #ifndef CV_FINAL // # define CV_FINAL final // #endif // #ifndef CV_NOEXCEPT -// # if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/) -// # define CV_NOEXCEPT noexcept -// # endif -// #endif -// #ifndef CV_NOEXCEPT -// # define CV_NOEXCEPT +// # define CV_NOEXCEPT noexcept // #endif // #ifndef CV_CONSTEXPR -// # if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/) -// # define CV_CONSTEXPR constexpr -// # endif -// #endif -// #ifndef CV_CONSTEXPR -// # define CV_CONSTEXPR +// # define CV_CONSTEXPR constexpr // #endif // Integer types portability -// #ifdef OPENCV_STDINT_HEADER -// #include OPENCV_STDINT_HEADER -// #elif defined(__cplusplus) -// #if defined(_MSC_VER) && _MSC_VER < 1600 /* MSVS 2010 */ - -// #elif defined(_MSC_VER) || __cplusplus >= 201103L +// #ifdef __cplusplus // #include -// #else -// #include +// Targeting ../opencv_core/hfloat.java + -// #endif -// #else // pure C -// #include -// Targeting ../opencv_core/float16_t.java +@Namespace("cv") public static native @ByVal hfloat hfloatFromBits(@Cast("ushort") short w); +// #if !defined(__OPENCV_BUILD) && !(defined __STDCPP_FLOAT16_T__) && !(defined __ARM_NEON) +// #endif // #endif @@ -1235,6 +1219,12 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { @Namespace("cv::hal") public static native void log64f(@Const DoubleBuffer src, DoubleBuffer dst, int n); @Namespace("cv::hal") public static native void log64f(@Const double[] src, double[] dst, int n); +@Namespace("cv::hal") public static native void cartToPolar32f(@Const FloatPointer x, @Const FloatPointer y, FloatPointer mag, FloatPointer angle, int n, @Cast("bool") boolean angleInDegrees); +@Namespace("cv::hal") public static native void cartToPolar32f(@Const FloatBuffer x, @Const FloatBuffer y, FloatBuffer mag, FloatBuffer angle, int n, @Cast("bool") boolean angleInDegrees); +@Namespace("cv::hal") public static native void cartToPolar32f(@Const float[] x, @Const float[] y, float[] mag, float[] angle, int n, @Cast("bool") boolean angleInDegrees); +@Namespace("cv::hal") public static native void cartToPolar64f(@Const DoublePointer x, @Const DoublePointer y, DoublePointer mag, DoublePointer angle, int n, @Cast("bool") boolean angleInDegrees); +@Namespace("cv::hal") public static native void cartToPolar64f(@Const DoubleBuffer x, @Const DoubleBuffer y, DoubleBuffer mag, DoubleBuffer angle, int n, @Cast("bool") boolean angleInDegrees); +@Namespace("cv::hal") public static native void cartToPolar64f(@Const double[] x, @Const double[] y, double[] mag, double[] angle, int n, @Cast("bool") boolean angleInDegrees); @Namespace("cv::hal") public static native void fastAtan32f(@Const FloatPointer y, @Const FloatPointer x, FloatPointer dst, int n, @Cast("bool") boolean angleInDegrees); @Namespace("cv::hal") public static native void fastAtan32f(@Const FloatBuffer y, @Const FloatBuffer x, FloatBuffer dst, int n, @Cast("bool") boolean angleInDegrees); @Namespace("cv::hal") public static native void fastAtan32f(@Const float[] y, @Const float[] x, float[] dst, int n, @Cast("bool") boolean angleInDegrees); @@ -1247,6 +1237,8 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { @Namespace("cv::hal") public static native void magnitude64f(@Const DoublePointer x, @Const DoublePointer y, DoublePointer dst, int n); @Namespace("cv::hal") public static native void magnitude64f(@Const DoubleBuffer x, @Const DoubleBuffer y, DoubleBuffer dst, int n); @Namespace("cv::hal") public static native void magnitude64f(@Const double[] x, @Const double[] y, double[] dst, int n); + + @Namespace("cv::hal") public static native void sqrt32f(@Const FloatPointer src, FloatPointer dst, int len); @Namespace("cv::hal") public static native void sqrt32f(@Const FloatBuffer src, FloatBuffer dst, int len); @Namespace("cv::hal") public static native void sqrt32f(@Const float[] src, float[] dst, int len); @@ -1527,12 +1519,12 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { @Namespace("cv::hal") public static native void addWeighted64f( @Const DoubleBuffer src1, @Cast("size_t") long step1, @Const DoubleBuffer src2, @Cast("size_t") long step2, DoubleBuffer dst, @Cast("size_t") long step, int width, int height, Pointer scalars ); @Namespace("cv::hal") public static native void addWeighted64f( @Const double[] src1, @Cast("size_t") long step1, @Const double[] src2, @Cast("size_t") long step2, double[] dst, @Cast("size_t") long step, int width, int height, Pointer scalars ); -@Namespace("cv::hal") public static native void cvt16f32f( @Const float16_t src, FloatPointer dst, int len ); -@Namespace("cv::hal") public static native void cvt16f32f( @Const float16_t src, FloatBuffer dst, int len ); -@Namespace("cv::hal") public static native void cvt16f32f( @Const float16_t src, float[] dst, int len ); -@Namespace("cv::hal") public static native void cvt32f16f( @Const FloatPointer src, float16_t dst, int len ); -@Namespace("cv::hal") public static native void cvt32f16f( @Const FloatBuffer src, float16_t dst, int len ); -@Namespace("cv::hal") public static native void cvt32f16f( @Const float[] src, float16_t dst, int len ); +@Namespace("cv::hal") public static native void cvt16f32f( @Const hfloat src, FloatPointer dst, int len ); +@Namespace("cv::hal") public static native void cvt16f32f( @Const hfloat src, FloatBuffer dst, int len ); +@Namespace("cv::hal") public static native void cvt16f32f( @Const hfloat src, float[] dst, int len ); +@Namespace("cv::hal") public static native void cvt32f16f( @Const FloatPointer src, hfloat dst, int len ); +@Namespace("cv::hal") public static native void cvt32f16f( @Const FloatBuffer src, hfloat dst, int len ); +@Namespace("cv::hal") public static native void cvt32f16f( @Const float[] src, hfloat dst, int len ); @Namespace("cv::hal") public static native void addRNGBias32f( FloatPointer arr, @Const FloatPointer scaleBiasPairs, int len ); @Namespace("cv::hal") public static native void addRNGBias32f( FloatBuffer arr, @Const FloatBuffer scaleBiasPairs, int len ); @@ -1695,7 +1687,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { // #if defined(CV_INLINE_ROUND_FLT) // user-specified version // CV_INLINE_ROUND_DBL should be defined too -// #elif defined __GNUC__ && defined __arm__ && (defined __ARM_PCS_VFP || defined __ARM_VFPV3__ || defined __ARM_NEON__) && !defined __SOFTFP__ +// #elif defined __GNUC__ && defined __arm__ && (defined __ARM_PCS_VFP || defined __ARM_VFPV3__ || defined __ARM_NEON) && !defined __SOFTFP__ // 1. general scheme // #define ARM_ROUND(_value, _asm_string) // int res; @@ -1925,7 +1917,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast") int unsignedSaturateCast(@Cast("uchar") byte v); @Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast") long uint64SaturateCast(@Cast("uchar") byte v); @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast") long int64SaturateCast(@Cast("uchar") byte v); -@Namespace("cv") public static native @ByVal @Name("saturate_cast") float16_t float16SaturateCast(@Cast("uchar") byte v); +@Namespace("cv") public static native @ByVal @Name("saturate_cast") hfloat float16SaturateCast(@Cast("uchar") byte v); /** \overload */ /** \overload */ @Namespace("cv") public static native @Cast("uchar") @Name("saturate_cast") byte ucharSaturateCast(@Cast("ushort") short v); @@ -1936,7 +1928,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast") int unsignedSaturateCast(@Cast("ushort") short v); @Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast") long uint64SaturateCast(@Cast("ushort") short v); @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast") long int64SaturateCast(@Cast("ushort") short v); -@Namespace("cv") public static native @ByVal @Name("saturate_cast") float16_t float16SaturateCast(@Cast("ushort") short v); +@Namespace("cv") public static native @ByVal @Name("saturate_cast") hfloat float16SaturateCast(@Cast("ushort") short v); /** \overload */ /** \overload */ @Namespace("cv") public static native @Cast("uchar") @Name("saturate_cast") byte ucharSaturateCast(@Cast("unsigned") int v); @@ -1947,7 +1939,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast") int unsignedSaturateCast(@Cast("unsigned") int v); @Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast") long uint64SaturateCast(@Cast("unsigned") int v); @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast") long int64SaturateCast(@Cast("unsigned") int v); -@Namespace("cv") public static native @ByVal @Name("saturate_cast") float16_t float16SaturateCast(@Cast("unsigned") int v); +@Namespace("cv") public static native @ByVal @Name("saturate_cast") hfloat float16SaturateCast(@Cast("unsigned") int v); /** \overload */ /** \overload */ @Namespace("cv") public static native @Cast("uchar") @Name("saturate_cast") byte ucharSaturateCast(float v); @@ -1958,7 +1950,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast") int unsignedSaturateCast(float v); @Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast") long uint64SaturateCast(float v); @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast") long int64SaturateCast(float v); -@Namespace("cv") public static native @ByVal @Name("saturate_cast") float16_t float16SaturateCast(float v); +@Namespace("cv") public static native @ByVal @Name("saturate_cast") hfloat float16SaturateCast(float v); /** \overload */ @Namespace("cv") public static native @Cast("uchar") @Name("saturate_cast") byte ucharSaturateCast(double v); @Namespace("cv") public static native @Cast("schar") @Name("saturate_cast") byte scharSaturateCast(double v); @@ -1968,7 +1960,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast") int unsignedSaturateCast(double v); @Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast") long uint64SaturateCast(double v); @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast") long int64SaturateCast(double v); -@Namespace("cv") public static native @ByVal @Name("saturate_cast") float16_t float16SaturateCast(double v); +@Namespace("cv") public static native @ByVal @Name("saturate_cast") hfloat float16SaturateCast(double v); /** \overload */ @Namespace("cv") public static native @Cast("uchar") @Name("saturate_cast") byte ucharSaturateCast(@Cast("int64") long v); @Namespace("cv") public static native @Cast("schar") @Name("saturate_cast") byte scharSaturateCast(@Cast("int64") long v); @@ -1978,20 +1970,20 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { @Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast") int unsignedSaturateCast(@Cast("int64") long v); @Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast") long uint64SaturateCast(@Cast("int64") long v); @Namespace("cv") public static native @Cast("int64") @Name("saturate_cast") long int64SaturateCast(@Cast("int64") long v); -@Namespace("cv") public static native @ByVal @Name("saturate_cast") float16_t float16SaturateCast(@Cast("int64") long v); +@Namespace("cv") public static native @ByVal @Name("saturate_cast") hfloat float16SaturateCast(@Cast("int64") long v); /** \overload */ // we intentionally do not clip negative numbers, to make -1 become 0xffffffff etc. /** \overload */ -@Namespace("cv") public static native @Cast("uchar") @Name("saturate_cast") byte ucharSaturateCast(@ByVal float16_t v); -@Namespace("cv") public static native @Cast("schar") @Name("saturate_cast") byte scharSaturateCast(@ByVal float16_t v); -@Namespace("cv") public static native @Cast("ushort") @Name("saturate_cast") short ushortSaturateCast(@ByVal float16_t v); -@Namespace("cv") public static native @Name("saturate_cast") short shortSaturateCast(@ByVal float16_t v); -@Namespace("cv") public static native @Name("saturate_cast") int intSaturate(@ByVal float16_t v); -@Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast") int unsignedSaturateCast(@ByVal float16_t v); -@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast") long uint64SaturateCast(@ByVal float16_t v); -@Namespace("cv") public static native @Cast("int64") @Name("saturate_cast") long int64SaturateCast(@ByVal float16_t v); -@Namespace("cv") public static native @ByVal @Name("saturate_cast") float16_t float16SaturateCast(@ByVal float16_t v); +@Namespace("cv") public static native @Cast("uchar") @Name("saturate_cast") byte ucharSaturateCast(@ByVal hfloat v); +@Namespace("cv") public static native @Cast("schar") @Name("saturate_cast") byte scharSaturateCast(@ByVal hfloat v); +@Namespace("cv") public static native @Cast("ushort") @Name("saturate_cast") short ushortSaturateCast(@ByVal hfloat v); +@Namespace("cv") public static native @Name("saturate_cast") short shortSaturateCast(@ByVal hfloat v); +@Namespace("cv") public static native @Name("saturate_cast") int intSaturate(@ByVal hfloat v); +@Namespace("cv") public static native @Cast("unsigned") @Name("saturate_cast") int unsignedSaturateCast(@ByVal hfloat v); +@Namespace("cv") public static native @Cast("uint64") @Name("saturate_cast") long uint64SaturateCast(@ByVal hfloat v); +@Namespace("cv") public static native @Cast("int64") @Name("saturate_cast") long int64SaturateCast(@ByVal hfloat v); +@Namespace("cv") public static native @ByVal @Name("saturate_cast") hfloat float16SaturateCast(@ByVal hfloat v); // in theory, we could use a LUT for 8u/8s->16f conversion, // but with hardware support for FP32->FP16 conversion the current approach is preferable @@ -2013,7 +2005,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { // #define OPENCV_VERSION_HPP public static final int CV_VERSION_MAJOR = 4; -public static final int CV_VERSION_MINOR = 9; +public static final int CV_VERSION_MINOR = 10; public static final int CV_VERSION_REVISION = 0; public static final String CV_VERSION_STATUS = ""; @@ -2374,14 +2366,14 @@ decrease the overhead (which is sometimes several times larger than the processi BORDER_WRAP = 3, /** {@code gfedcb|abcdefgh|gfedcba} */ BORDER_REFLECT_101 = 4, - /** {@code uvwxyz|abcdefgh|ijklmno} */ + /** {@code uvwxyz|abcdefgh|ijklmno} - Treats outliers as transparent. */ BORDER_TRANSPARENT = 5, /** same as BORDER_REFLECT_101 */ BORDER_REFLECT101 = BORDER_REFLECT_101, /** same as BORDER_REFLECT_101 */ BORDER_DEFAULT = BORDER_REFLECT_101, - /** do not look outside of ROI */ + /** Interpolation restricted within the ROI boundaries. */ BORDER_ISOLATED = 16; /** \} core_array @@ -2650,7 +2642,6 @@ It is possible to alternate error processing by using redirectError(). /** \} core_utils

- * \endcond

* \addtogroup core_basic * \{ @@ -3118,7 +3109,7 @@ or not (onoff=false). The keys parameter is a string containing several blocks, each one is enclosed in curly braces and describes one argument. Each argument contains three parts separated by the {@code |} symbol:

--# argument names is a space-separated list of option synonyms (to mark argument as positional, prefix it with the {@code @} symbol) +-# argument names is a list of option synonyms separated by standard space characters ' ' (to mark argument as positional, prefix it with the {@code @} symbol) -# default value will be used if the argument was not provided (can be empty) -# help message (can be empty)

@@ -3141,6 +3132,8 @@ or not (onoff=false). Note that there are no default values for {@code help} and {@code timestamp} so we can check their presence using the {@code has()} method. Arguments with default values are considered to be always present. Use the {@code get()} method in these cases to check their actual value instead. +Note that whitespace characters other than standard spaces are considered part of the string. +Additionally, leading and trailing standard spaces around the help messages are ignored.

String keys like {@code get("@image1")} return the empty string {@code ""} by default - even with an empty default value. Use the special {@code } default value to enforce that the returned string must not be empty. (like in {@code get("@image2")}) @@ -3460,13 +3453,7 @@ General usage is to add OpenCV modules name ({@code /modules/ // #endif // SKIP_INCLUDES -// #if defined _WIN32 -// # define CV_CDECL __cdecl -// # define CV_STDCALL __stdcall -// #else -// # define CV_CDECL -// # define CV_STDCALL -// #endif + // #ifndef CV_DEFAULT // # ifdef __cplusplus @@ -3614,20 +3601,12 @@ General usage is to add OpenCV modules name ({@code /modules/ (b)) - 1))) - /** absolute value without jumps */ // #ifndef __cplusplus // #else // # define CV_IABS(a) abs(a) // #endif -// #define CV_CMP(a,b) (((a) > (b)) - ((a) < (b))) -// #define CV_SIGN(a) CV_CMP((a),0) + // #define cvInvSqrt(value) ((float)(1./sqrt(value))) // #define cvSqrt(value) ((float)sqrt(value)) @@ -3872,8 +3851,6 @@ state. It is similar to the rand() function from the C runtime library, except t public static final int CV_MATND_MAGIC_VAL = 0x42430000; public static final String CV_TYPE_NAME_MATND = "opencv-nd-matrix"; -public static final int CV_MAX_DIM = 32; - // #ifdef __cplusplus public static native @ByVal CvMatND cvMatND(@Const @ByRef Mat m); // Targeting ../opencv_core/CvMatND.java @@ -7454,10 +7431,6 @@ CV_CALL macro calls CV (or IPL) function, checks error status and \defgroup core Core functionality \{ \defgroup core_basic Basic structures - \defgroup core_c C structures and operations - \{ - \defgroup core_c_glue Connections with C++ - \} \defgroup core_array Operations on arrays \defgroup core_async Asynchronous API \defgroup core_xml XML/YAML Persistence @@ -7623,7 +7596,7 @@ covariance matrix is not scaled ( scale=1 ).*/ The function computes and returns the coordinate of a donor pixel corresponding to the specified extrapolated pixel when using the specified extrapolation border mode. For example, if you use cv::BORDER_WRAP mode in the horizontal direction, cv::BORDER_REFLECT_101 in the vertical direction and -want to compute value of the "virtual" pixel Point(-5, 100) in a floating-point image img , it +want to compute value of the "virtual" pixel Point(-5, 100) in a floating-point image img, it looks like:

{@code {.cpp}
     float val = img.at(borderInterpolate(100, img.rows, cv::BORDER_REFLECT_101),
@@ -7634,7 +7607,7 @@ covariance matrix is not scaled ( scale=1 ).*/
 @param p 0-based coordinate of the extrapolated pixel along one of the axes, likely \<0 or \>= len
 @param len Length of the array along the corresponding axis.
 @param borderType Border type, one of the #BorderTypes, except for #BORDER_TRANSPARENT and
-#BORDER_ISOLATED . When borderType==#BORDER_CONSTANT , the function always returns -1, regardless
+#BORDER_ISOLATED. When borderType==#BORDER_CONSTANT, the function always returns -1, regardless
 of p and len.
 

@see copyMakeBorder @@ -8002,6 +7975,8 @@ There are two use modes (src -> dst): CV_32F -> CV_16S and CV_16S -> CV_32F. The

@param src input array. @param dst output array. +

+@deprecated Use Mat::convertTo with CV_16F instead. */ @Namespace("cv") public static native void convertFp16(@ByVal Mat src, @ByVal Mat dst); @Namespace("cv") public static native void convertFp16(@ByVal UMat src, @ByVal UMat dst); @@ -8039,8 +8014,18 @@ either have a single channel (in this case the same table is used for all channe /** \brief Checks for the presence of at least one non-zero array element.

The function returns whether there are non-zero elements in src +

+The function do not work with multi-channel arrays. If you need to check non-zero array +elements across all the channels, use Mat::reshape first to reinterpret the array as +single-channel. Or you may extract the particular channel using either extractImageCOI, or +mixChannels, or split. +

+\note +- If the location of non-zero array elements is important, \ref findNonZero is helpful. +- If the count of non-zero array elements is important, \ref countNonZero is helpful. @param src single-channel array. @see mean, meanStdDev, norm, minMaxLoc, calcCovarMatrix +@see findNonZero, countNonZero */ @Namespace("cv") public static native @Cast("bool") boolean hasNonZero( @ByVal Mat src ); @Namespace("cv") public static native @Cast("bool") boolean hasNonZero( @ByVal UMat src ); @@ -8050,8 +8035,18 @@ either have a single channel (in this case the same table is used for all channe

The function returns the number of non-zero elements in src :

{@code \[\sum _{I: \; \texttt{src} (I) \ne0 } 1\]}
+

+The function do not work with multi-channel arrays. If you need to count non-zero array +elements across all the channels, use Mat::reshape first to reinterpret the array as +single-channel. Or you may extract the particular channel using either extractImageCOI, or +mixChannels, or split. +

+\note +- If only whether there are non-zero elements is important, \ref hasNonZero is helpful. +- If the location of non-zero array elements is important, \ref findNonZero is helpful. @param src single-channel array. @see mean, meanStdDev, norm, minMaxLoc, calcCovarMatrix +@see findNonZero, hasNonZero */ @Namespace("cv") public static native int countNonZero( @ByVal Mat src ); @Namespace("cv") public static native int countNonZero( @ByVal UMat src ); @@ -8080,8 +8075,18 @@ as threshold(), compare(), >, ==, etc, return all of // access pixel coordinates Point pnt = locations[i]; }

+

+The function do not work with multi-channel arrays. If you need to find non-zero +elements across all the channels, use Mat::reshape first to reinterpret the array as +single-channel. Or you may extract the particular channel using either extractImageCOI, or +mixChannels, or split. +

+\note +- If only count of non-zero array elements is important, \ref countNonZero is helpful. +- If only whether there are non-zero elements is important, \ref hasNonZero is helpful. @param src single-channel array @param idx the output array, type of cv::Mat or std::vector, corresponding to non-zero indices in the input +@see countNonZero, hasNonZero */ @Namespace("cv") public static native void findNonZero( @ByVal Mat src, @ByVal Mat idx ); @Namespace("cv") public static native void findNonZero( @ByVal UMat src, @ByVal UMat idx ); @@ -8342,8 +8347,8 @@ where R is the maximum integer value of depth (e.g. 255 in the case of CV_8U dat

The function do not work with multi-channel arrays. If you need to find minimum or maximum elements across all the channels, use Mat::reshape first to reinterpret the array as -single-channel. Or you may extract the particular channel using either extractImageCOI , or -mixChannels , or split . +single-channel. Or you may extract the particular channel using either extractImageCOI, or +mixChannels, or split. @param src input single-channel array. @param minVal pointer to the returned minimum value; NULL is used if not required. @param maxVal pointer to the returned maximum value; NULL is used if not required. @@ -8437,11 +8442,8 @@ where R is the maximum integer value of depth (e.g. 255 in the case of CV_8U dat

The function cv::minMaxIdx finds the minimum and maximum element values and their positions. The extremums are searched across the whole array or, if mask is not an empty array, in the specified -array region. The function does not work with multi-channel arrays. If you need to find minimum or -maximum elements across all the channels, use Mat::reshape first to reinterpret the array as -single-channel. Or you may extract the particular channel using either extractImageCOI , or -mixChannels , or split . In case of a sparse matrix, the minimum is found among non-zero elements -only. +array region. In case of a sparse matrix, the minimum is found among non-zero elements +only. Multi-channel input is supported without mask and extremums indexes (should be nullptr). \note When minIdx is not NULL, it must have at least 2 elements (as well as maxIdx), even if src is a single-row or single-column matrix. In OpenCV (following MATLAB) each array has at least 2 dimensions, i.e. single-column matrix is Mx1 matrix (and therefore minIdx/maxIdx will be @@ -8511,8 +8513,8 @@ where R is the maximum integer value of depth (e.g. 255 in the case of CV_8U dat The function #reduce reduces the matrix to a vector by treating the matrix rows/columns as a set of 1D vectors and performing the specified operation on the vectors until a single row/column is obtained. For example, the function can be used to compute horizontal and vertical projections of a -raster image. In case of #REDUCE_MAX and #REDUCE_MIN , the output image should have the same type as the source one. -In case of #REDUCE_SUM, #REDUCE_SUM2 and #REDUCE_AVG , the output may have a larger element bit-depth to preserve accuracy. +raster image. In case of #REDUCE_MAX and #REDUCE_MIN, the output image should have the same type as the source one. +In case of #REDUCE_SUM, #REDUCE_SUM2 and #REDUCE_AVG, the output may have a larger element bit-depth to preserve accuracy. And multi-channel arrays are also supported in these two reduction modes.

The following code demonstrates its usage for a single channel matrix. @@ -8581,7 +8583,7 @@ otherwise, its type will be CV_MAKE_TYPE(CV_MAT_DEPTH(dtype), src.channels()). The function cv::split splits a multi-channel array into separate single-channel arrays:

{@code \[\texttt{mv} [c](I) =  \texttt{src} (I)_c\]}
If you need to extract a single channel or do some other sophisticated channel permutation, use -mixChannels . +mixChannels.

The following example demonstrates how to split a 3-channel matrix into 3 single channel matrices. \snippet snippets/core_split.cpp example @@ -8746,7 +8748,7 @@ otherwise, its type will be CV_MAKE_TYPE(CV_MAT_DEPTH(dtype), src.channels()). flipping around the x-axis and positive value (for example, 1) means flipping around y-axis. Negative value (for example, -1) means flipping around both axes. -@see transpose , repeat , completeSymm +@see transpose, repeat, completeSymm */ @Namespace("cv") public static native void flip(@ByVal Mat src, @ByVal Mat dst, int flipCode); @Namespace("cv") public static native void flip(@ByVal UMat src, @ByVal UMat dst, int flipCode); @@ -8787,7 +8789,7 @@ otherwise, its type will be CV_MAKE_TYPE(CV_MAT_DEPTH(dtype), src.channels()). @param dst output array of the same type as src. The size is the same with ROTATE_180, and the rows and cols are switched for ROTATE_90_CLOCKWISE and ROTATE_90_COUNTERCLOCKWISE. @param rotateCode an enum to specify how to rotate the array; see the enum #RotateFlags -@see transpose , repeat , completeSymm, flip, RotateFlags +@see transpose, repeat, completeSymm, flip, RotateFlags */ @Namespace("cv") public static native void rotate(@ByVal Mat src, @ByVal Mat dst, int rotateCode); @Namespace("cv") public static native void rotate(@ByVal UMat src, @ByVal UMat dst, int rotateCode); @@ -9300,7 +9302,7 @@ converts denormalized values to zeros on output. Special values (NaN, Inf) are not handled. @param src input array. @param dst output array of the same size and type as src. -@see log , cartToPolar , polarToCart , phase , pow , sqrt , magnitude +@see log, cartToPolar, polarToCart, phase, pow, sqrt, magnitude */ @Namespace("cv") public static native void exp(@ByVal Mat src, @ByVal Mat dst); @Namespace("cv") public static native void exp(@ByVal UMat src, @ByVal UMat dst); @@ -9491,7 +9493,7 @@ In case of complex (two-channel) data, performed a complex matrix @param dst output matrix; it has the proper size and the same type as input matrices. @param flags operation flags (cv::GemmFlags) -@see mulTransposed , transform +@see mulTransposed, transform */ @Namespace("cv") public static native void gemm(@ByVal Mat src1, @ByVal Mat src2, double alpha, @ByVal Mat src3, double beta, @ByVal Mat dst, int flags/*=0*/); @@ -9511,7 +9513,7 @@ In case of complex (two-channel) data, performed a complex matrix The function cv::mulTransposed calculates the product of src and its transposition:

{@code \[\texttt{dst} = \texttt{scale} ( \texttt{src} - \texttt{delta} )^T ( \texttt{src} - \texttt{delta} )\]}
-if aTa=true , and +if aTa=true, and
{@code \[\texttt{dst} = \texttt{scale} ( \texttt{src} - \texttt{delta} ) ( \texttt{src} - \texttt{delta} )^T\]}
otherwise. The function is used to calculate the covariance matrix. With zero delta, it can be used as a faster substitute for general matrix @@ -9524,7 +9526,7 @@ In case of complex (two-channel) data, performed a complex matrix @param delta Optional delta matrix subtracted from src before the multiplication. When the matrix is empty ( delta=noArray() ), it is assumed to be zero, that is, nothing is subtracted. If it has the same -size as src , it is simply subtracted. Otherwise, it is "repeated" (see +size as src, it is simply subtracted. Otherwise, it is "repeated" (see repeat ) to cover the full src and then subtracted. Type of the delta matrix, when it is not empty, must be the same as the type of created output matrix. See the dtype parameter description below. @@ -9565,7 +9567,7 @@ multiplication. When the matrix is empty ( delta=noArray() ), it is * \note Input should be continuous single-channel matrix. * @param src input array. * @param order a permutation of [0,1,..,N-1] where N is the number of axes of src. - * The i’th axis of dst will correspond to the axis numbered order[i] of the input. + * The i'th axis of dst will correspond to the axis numbered order[i] of the input. * @param dst output array of the same type as src. */ @Namespace("cv") public static native void transposeND(@ByVal Mat src, @StdVector IntPointer order, @ByVal Mat dst); @@ -9861,7 +9863,7 @@ condition number of src (the ratio of the smallest singular value to the @param eigenvectors output matrix of eigenvectors; it has the same size and type as src; the eigenvectors are stored as subsequent matrix rows, in the same order as the corresponding eigenvalues. -@see eigenNonSymmetric, completeSymm , PCA +@see eigenNonSymmetric, completeSymm, PCA */ @Namespace("cv") public static native @Cast("bool") boolean eigen(@ByVal Mat src, @ByVal Mat eigenvalues, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") Mat eigenvectors); @@ -10075,7 +10077,7 @@ In case of real (single-channel) data, the output spectrum of the forward Fourie

If #DFT_SCALE is set, the scaling is done after the transformation.

-Unlike dct , the function supports arrays of arbitrary size. But only those arrays are processed +Unlike dct, the function supports arrays of arbitrary size. But only those arrays are processed efficiently, whose sizes can be factorized in a product of small prime numbers (2, 3, and 5 in the current implementation). Such an efficient DFT size can be calculated using the getOptimalDFTSize method. @@ -10158,8 +10160,8 @@ nonzeroRows rows of the input array (#DFT_INVERSE is not set) or only the first output array (#DFT_INVERSE is set) contain non-zeros, thus, the function can handle the rest of the rows more efficiently and save some time; this technique is very useful for calculating array cross-correlation or convolution using DFT. -@see dct , getOptimalDFTSize , mulSpectrums, filter2D , matchTemplate , flip , cartToPolar , -magnitude , phase +@see dct, getOptimalDFTSize, mulSpectrums, filter2D, matchTemplate, flip, cartToPolar, +magnitude, phase */ @Namespace("cv") public static native void dft(@ByVal Mat src, @ByVal Mat dst, int flags/*=0*/, int nonzeroRows/*=0*/); @Namespace("cv") public static native void dft(@ByVal Mat src, @ByVal Mat dst); @@ -10206,9 +10208,9 @@ output array (#DFT_INVERSE is set) contain non-zeros, thus, the function can han

{@code \[X =  \left (C^{(N)} \right )^T  \cdot X  \cdot C^{(N)}\]}

The function chooses the mode of operation by looking at the flags and size of the input array: -- If (flags & #DCT_INVERSE) == 0 , the function does a forward 1D or 2D transform. Otherwise, it +- If (flags & #DCT_INVERSE) == 0, the function does a forward 1D or 2D transform. Otherwise, it is an inverse 1D or 2D transform. -- If (flags & #DCT_ROWS) != 0 , the function performs a 1D transform of each row. +- If (flags & #DCT_ROWS) != 0, the function performs a 1D transform of each row. - If the array is a single column or a single row, the function performs a 1D transform. - If none of the above is true, the function performs a 2D transform.

@@ -10224,7 +10226,7 @@ Also, the function performance depends very much, and not monotonically, on the @param src input floating-point array. @param dst output array of the same size and type as src . @param flags transformation flags as a combination of cv::DftFlags (DCT_*) -@see dft , getOptimalDFTSize , idct +@see dft, getOptimalDFTSize, idct */ @Namespace("cv") public static native void dct(@ByVal Mat src, @ByVal Mat dst, int flags/*=0*/); @Namespace("cv") public static native void dct(@ByVal Mat src, @ByVal Mat dst); @@ -10253,7 +10255,7 @@ Also, the function performance depends very much, and not monotonically, on the The function cv::mulSpectrums performs the per-element multiplication of the two CCS-packed or complex matrices that are results of a real or complex Fourier transform.

-The function, together with dft and idft , may be used to calculate convolution (pass conjB=false ) +The function, together with dft and idft, may be used to calculate convolution (pass conjB=false ) or correlation (pass conjB=true ) of two arrays rapidly. When the arrays are complex, they are simply multiplied (per element) with an optional conjugation of the second-array elements. When the arrays are real, they are assumed to be CCS-packed (see dft for details). @@ -10297,7 +10299,7 @@ The function returns a negative number if vecsize is too large (very close to IN (since the current DCT implementation supports only even-size vectors), it can be easily processed as getOptimalDFTSize((vecsize+1)/2)\*2. @param vecsize vector size. -@see dft , dct , idft , idct , mulSpectrums +@see dft, dct, idft, idct, mulSpectrums */ @Namespace("cv") public static native int getOptimalDFTSize(int vecsize); @@ -11363,6 +11365,7 @@ instance of the class that has the method bool operator()(const _Tp& a, const _T // #include "opencv2/core/bufferpool.hpp" +// #include // #include /** \addtogroup core_basic @@ -12136,10 +12139,7 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) /** \} core_xml

-/////////////////// XML & YAML I/O implementation ////////////////// -

- * \relates cv::FileStorage - * \{ */ +/////////////////// XML & YAML I/O implementation ////////////////// */ @Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, int value ); @Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, int value ); @@ -12166,11 +12166,6 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) @Namespace("cv") public static native void writeScalar( @ByRef FileStorage fs, @Str BytePointer value ); @Namespace("cv") public static native void writeScalar( @ByRef FileStorage fs, @Str String value ); -/** \} -

- * \relates cv::FileNode - * \{ */ - @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef IntPointer value, int default_value); @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef IntBuffer value, int default_value); @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef int[] value, int default_value); @@ -12207,10 +12202,7 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef Range value, @Const @ByRef Range default_value); -/** \} -

/** \brief Writes string to a file storage. -\relates cv::FileStorage */ @Namespace("cv") public static native @ByRef @Name("operator <<") FileStorage shiftLeft(@ByRef FileStorage fs, @Str BytePointer str); @Namespace("cv") public static native @ByRef @Name("operator <<") FileStorage shiftLeft(@ByRef FileStorage fs, @Str String str); @@ -12220,10 +12212,7 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) // internal -/** \endcond -

- * \relates cv::FileStorage - * \{ */ +/** \endcond */ @Namespace("cv") public static native void write(@ByRef FileStorage fs, int value); @@ -12339,10 +12328,6 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) @Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef DMatchVector vec); // #endif -/** \} FileStorage -

- * \relates cv::FileNode - * \{ */ @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @Cast("bool*") @ByRef BoolPointer value, @Cast("bool") boolean default_value); @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @Cast("bool*") @ByRef boolean[] value, @Cast("bool") boolean default_value); @@ -12375,11 +12360,6 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) @Namespace("cv") public static native void read( @Const @ByRef FileNode node, @ByRef DMatchVector vec, @Const @ByRef DMatchVector default_value ); -/** \} FileNode -

- * \relates cv::FileStorage - * \{ -

/** \brief Writes data to a file storage. */ @@ -12391,22 +12371,12 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) @Namespace("cv") public static native @ByRef @Name("operator <<") FileStorage shiftLeft(@ByRef FileStorage fs, @Cast("char*") ByteBuffer value); @Namespace("cv") public static native @ByRef @Name("operator <<") FileStorage shiftLeft(@ByRef FileStorage fs, @Cast("char*") byte[] value); -/** \} FileStorage -

- * \relates cv::FileNodeIterator - * \{ -

/** \brief Reads data from a file storage. */ /** \brief Reads data from a file storage. */ -/** \} FileNodeIterator -

- * \relates cv::FileNode - * \{ -

/** \brief Reads data from a file storage. */ @@ -12428,11 +12398,6 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) //It needs special handling because it contains two types of fields, int & float. @Namespace("cv") public static native @Name("operator >>") void shiftRight(@Const @ByRef FileNode n, @ByRef DMatch m); -/** \} FileNode -

- * \relates cv::FileNodeIterator - * \{ */ - @Namespace("cv") public static native @Cast("bool") @Name("operator ==") boolean equals(@Const @ByRef FileNodeIterator it1, @Const @ByRef FileNodeIterator it2); @Namespace("cv") public static native @Cast("bool") @Name("operator !=") boolean notEquals(@Const @ByRef FileNodeIterator it1, @Const @ByRef FileNodeIterator it2); @@ -12440,8 +12405,6 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) @Namespace("cv") public static native @Cast("bool") @Name("operator <") boolean lessThan(@Const @ByRef FileNodeIterator it1, @Const @ByRef FileNodeIterator it2); -/** \} FileNodeIterator */ - // cv // #endif // OPENCV_CORE_PERSISTENCE_HPP @@ -12577,8 +12540,8 @@ efficiently. Although it is not optimal in theoretical sense (there exist algori // #include -// #ifdef CV_CXX11 -// #endif +//#include +// #include // Targeting ../opencv_core/AsyncArray.java diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaarithm.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaarithm.java index 0372fba88a8..ddc8220d7d0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaarithm.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaarithm.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudabgsegm.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudabgsegm.java index 61e0f96cccd..4bca4c2bf52 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudabgsegm.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudabgsegm.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudacodec.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudacodec.java index bc13bf80172..dae1403c624 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudacodec.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudacodec.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudafeatures2d.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudafeatures2d.java index f8db604fd9e..ab06a3b401a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudafeatures2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudafeatures2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudafilters.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudafilters.java index 1c81cb009bb..911cfcd1d5f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudafilters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudafilters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaimgproc.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaimgproc.java index c8358fd7e44..299c956edea 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaimgproc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaimgproc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -758,10 +758,21 @@ is an image where each Connected Component is assigned a unique label (integer v @param order Order of largest moments to calculate with lower order moments requiring less computation. @return number of image moments.

-@see cuda::moments, cuda::spatialMoments, cuda::MomentsOrder +@see cuda::spatialMoments, cuda::moments, cuda::MomentsOrder */ @Namespace("cv::cuda") public static native int numMoments(@Cast("const cv::cuda::MomentsOrder") int order); +/** \brief Converts the spatial image moments returned from cuda::spatialMoments to cv::Moments. +@param spatialMoments Spatial moments returned from cuda::spatialMoments. +@param order Order used when calculating image moments with cuda::spatialMoments. +@param momentsType Precision used when calculating image moments with cuda::spatialMoments. +

+@return cv::Moments. +

+@see cuda::spatialMoments, cuda::moments, cuda::convertSpatialMoments, cuda::numMoments, cuda::MomentsOrder + */ +@Namespace("cv::cuda") public static native @ByVal Moments convertSpatialMoments(@ByVal Mat spatialMoments, @Cast("const cv::cuda::MomentsOrder") int order, int momentsType); + /** \brief Calculates all of the spatial moments up to the 3rd order of a rasterized shape.

Asynchronous version of cuda::moments() which only calculates the spatial (not centralized or normalized) moments, up to the 3rd order, of a rasterized shape. @@ -771,24 +782,24 @@ is an image where each Connected Component is assigned a unique label (integer v @param moments [out] 1D array with each column entry containing a spatial image moment. @param binaryImage If it is true, all non-zero image pixels are treated as 1's. @param order Order of largest moments to calculate with lower order moments requiring less computation. -@param momentsType Precision to use when calculating moments. Available types are {@code CV_32F} and {@code CV_64F} with the performance of {@code CV_32F} an order of magnitude greater than {@code CV_64F}. If the image is small the accuracy from {@code CV_32F} can be equal or very close to {@code CV_64F}. +@param momentsType Precision to use when calculating moments. Available types are \ref CV_32F and \ref CV_64F with the performance of \ref CV_32F an order of magnitude greater than \ref CV_64F. If the image is small the accuracy from \ref CV_32F can be equal or very close to \ref CV_64F. @param stream Stream for the asynchronous version.

-\note For maximum performance pre-allocate a 1D GpuMat for \a moments of the correct type and size large enough to store the all the image moments of up to the desired \a order. e.g. With \a order === MomentsOrder::SECOND_ORDER_MOMENTS and \a momentsType == {@code CV_32F} \a moments can be allocated as +\note For maximum performance pre-allocate a 1D GpuMat for \a moments of the correct type and size large enough to store the all the image moments of up to the desired \a order. e.g. With \a order === MomentsOrder::SECOND_ORDER_MOMENTS and \a momentsType == \ref CV_32F \a moments can be allocated as

{@code
 GpuMat momentsDevice(1,numMoments(MomentsOrder::SECOND_ORDER_MOMENTS),CV_32F)
 }
-The central and normalized moments can easily be calculated on the host by downloading the \a moments array and using the cv::Moments constructor. e.g. +The central and normalized moments can easily be calculated on the host by downloading the \a moments array and using the cuda::convertSpatialMoments helper function. e.g.
{@code
-HostMem momentsHostMem(1, numMoments(MomentsOrder::SECOND_ORDER_MOMENTS), CV_32F);
-momentsDevice.download(momentsHostMem, stream);
+HostMem spatialMomentsHostMem(1, numMoments(MomentsOrder::SECOND_ORDER_MOMENTS), CV_32F);
+spatialMomentsDevice.download(spatialMomentsHostMem, stream);
 stream.waitForCompletion();
-Mat momentsMat = momentsHostMem.createMatHeader();
-cv::Moments cvMoments(momentsMat.at(0), momentsMat.at(1), momentsMat.at(2), momentsMat.at(3), momentsMat.at(4), momentsMat.at(5), momentsMat.at(6), momentsMat.at(7), momentsMat.at(8), momentsMat.at(9));
+Mat spatialMoments = spatialMomentsHostMem.createMatHeader();
+cv::Moments cvMoments = convertSpatialMoments(spatialMoments, order);
 }
+

see the \a CUDA_TEST_P(Moments, Async) test inside opencv_contrib_source_code/modules/cudaimgproc/test/test_moments.cpp for an example. -@return cv::Moments. -@see cuda::moments +@see cuda::moments, cuda::convertSpatialMoments, cuda::numMoments, cuda::MomentsOrder */ @Namespace("cv::cuda") public static native void spatialMoments(@ByVal Mat src, @ByVal Mat moments, @Cast("const bool") boolean binaryImage/*=false*/, @Cast("const cv::cuda::MomentsOrder") int order/*=cv::cuda::MomentsOrder::THIRD_ORDER_MOMENTS*/, int momentsType/*=CV_64F*/, @ByRef(nullValue = "cv::cuda::Stream::Null()") Stream stream); @Namespace("cv::cuda") public static native void spatialMoments(@ByVal Mat src, @ByVal Mat moments); @@ -805,7 +816,7 @@ GpuMat momentsDevice(1,numMoments(MomentsOrder::SECOND_ORDER_MOMENTS),CV_32F) @param src Raster image (single-channel 2D array). @param binaryImage If it is true, all non-zero image pixels are treated as 1's. @param order Order of largest moments to calculate with lower order moments requiring less computation. - @param momentsType Precision to use when calculating moments. Available types are {@code CV_32F} and {@code CV_64F} with the performance of {@code CV_32F} an order of magnitude greater than {@code CV_64F}. If the image is small the accuracy from {@code CV_32F} can be equal or very close to {@code CV_64F}. + @param momentsType Precision to use when calculating moments. Available types are \ref CV_32F and \ref CV_64F with the performance of \ref CV_32F an order of magnitude greater than \ref CV_64F. If the image is small the accuracy from \ref CV_32F can be equal or very close to \ref CV_64F.

\note For maximum performance use the asynchronous version cuda::spatialMoments() as this version interally allocates and deallocates both GpuMat and HostMem to respectively perform the calculation on the device and download the result to the host. The costly HostMem allocation cannot be avoided however the GpuMat device allocation can be by using BufferPool, e.g. @@ -815,7 +826,7 @@ GpuMat momentsDevice(1,numMoments(MomentsOrder::SECOND_ORDER_MOMENTS),CV_32F) } see the \a CUDA_TEST_P(Moments, Accuracy) test inside opencv_contrib_source_code/modules/cudaimgproc/test/test_moments.cpp for an example. @return cv::Moments. -@see cuda::spatialMoments +@see cuda::spatialMoments, cuda::convertSpatialMoments, cuda::numMoments, cuda::MomentsOrder */ @Namespace("cv::cuda") public static native @ByVal Moments moments(@ByVal Mat src, @Cast("const bool") boolean binaryImage/*=false*/, @Cast("const cv::cuda::MomentsOrder") int order/*=cv::cuda::MomentsOrder::THIRD_ORDER_MOMENTS*/, int momentsType/*=CV_64F*/); @Namespace("cv::cuda") public static native @ByVal Moments moments(@ByVal Mat src); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaobjdetect.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaobjdetect.java index 202bb7ae0c3..97ca9156c6b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaobjdetect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaobjdetect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaoptflow.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaoptflow.java index 816099dfd14..a40c2c56aa8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaoptflow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaoptflow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudastereo.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudastereo.java index 098080c7149..1cfe3478b58 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudastereo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudastereo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudawarping.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudawarping.java index c29185feb2d..64b58352c8c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudawarping.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudawarping.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; 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 index 6a96eccc736..fb1ffed14e3 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -126,7 +126,7 @@ Functionality of this module is designed only for forward pass computations (i.e // #define OPENCV_DNN_VERSION_HPP /** Use with major OpenCV version only. */ -public static final int OPENCV_DNN_API_VERSION = 20231225; +public static final int OPENCV_DNN_API_VERSION = 20240521; // #if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_INLINE_NS // #define CV__DNN_INLINE_NS __CV_CAT(dnn4_v, OPENCV_DNN_API_VERSION) @@ -588,6 +588,9 @@ Functionality of this module is designed only for forward pass computations (i.e // Targeting ../opencv_dnn/AttentionLayer.java +// Targeting ../opencv_dnn/GroupNormLayer.java + + /** \} * \} */ 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 index 9d5383f1417..64d032ac6e4 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 index 06bdb868a9b..08564e6b3b6 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -228,12 +228,6 @@ or tort (including negligence or otherwise) arising in any way out of // #ifndef __OPENCV_FACELANDMARK_HPP__ // #define __OPENCV_FACELANDMARK_HPP__ -/** -\defgroup face Face Analysis -- \ref tutorial_table_of_content_facemark -- The Facemark API -*/ - // #include "opencv2/core.hpp" // #include // Targeting ../opencv_face/Facemark.java @@ -250,6 +244,7 @@ or tort (including negligence or otherwise) arising in any way out of /** construct a Kazemi facemark detector */ @Namespace("cv::face") public static native @Ptr Facemark createFacemarkKazemi(); +/** \} */ // face // cv @@ -273,12 +268,6 @@ or tort (including negligence or otherwise) arising in any way out of // #ifndef __OPENCV_FACELANDMARKTRAIN_HPP__ // #define __OPENCV_FACELANDMARKTRAIN_HPP__ -/** -\defgroup face Face Analysis -- \ref tutorial_table_of_content_facemark -- The Facemark API -*/ - // #include "opencv2/face/facemark.hpp" // #include "opencv2/objdetect.hpp" // #include 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 index 4b8b3842695..c676ca8aec7 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -85,16 +85,16 @@ public class opencv_features2d extends org.bytedeco.opencv.presets.opencv_featur \{ \defgroup features2d_main Feature Detection and Description \defgroup features2d_match Descriptor Matchers -

-Matchers of keypoint descriptors in OpenCV have wrappers with a common interface that enables you to -easily switch between different algorithms solving the same problem. This section is devoted to -matching descriptors that are represented as vectors in a multidimensional space. All objects that -implement vector descriptor matchers inherit the DescriptorMatcher interface. +

+ Matchers of keypoint descriptors in OpenCV have wrappers with a common interface that enables + you to easily switch between different algorithms solving the same problem. This section is + devoted to matching descriptors that are represented as vectors in a multidimensional space. + All objects that implement vector descriptor matchers inherit the DescriptorMatcher interface.

\defgroup features2d_draw Drawing Function of Keypoints and Matches \defgroup features2d_category Object Categorization -

-This section describes approaches based on local 2D features and used to categorize objects. +

+ This section describes approaches based on local 2D features and used to categorize objects.

\defgroup feature2d_hal Hardware Acceleration Layer \{ @@ -230,8 +230,7 @@ public class opencv_features2d extends org.bytedeco.opencv.presets.opencv_featur -/** \} features2d_main -

+ /****************************************************************************************\ * Distance * \****************************************************************************************/ @@ -513,6 +512,9 @@ connecting two keypoints (circles). See cv::DrawMatchesFlags. * Functions to evaluate the feature detectors and [generic] descriptor extractors * \****************************************************************************************/ +/** \addtogroup features2d_main +/** \{ */ + @Namespace("cv") public static native void evaluateFeatureDetector( @Const @ByRef Mat img1, @Const @ByRef Mat img2, @Const @ByRef Mat H1to2, KeyPointVector keypoints1, KeyPointVector keypoints2, @ByRef FloatPointer repeatability, @ByRef IntPointer correspCount, @@ -551,9 +553,7 @@ connecting two keypoints (circles). See cv::DrawMatchesFlags. -/** \} features2d_category -

- * \} features2d */ +/** \} features2d_category */ /* namespace cv */ 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 index c05c52bc408..d2a5790dfe0 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 index d331ef6c75c..bfd66070f9b 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -484,50 +484,8 @@ rich UI frameworks (such as Qt\*, WinForms\*, or Cocoa\*) or without any UI at a created. Then, a new button is attached to it.

See below the example used to generate the figure: -

{@code
-        int main(int argc, char *argv[])
-        {
-
-            int value = 50;
-            int value2 = 0;
-
-
-            namedWindow("main1",WINDOW_NORMAL);
-            namedWindow("main2",WINDOW_AUTOSIZE | WINDOW_GUI_NORMAL);
-            createTrackbar( "track1", "main1", &value, 255,  NULL);
-
-            String nameb1 = "button1";
-            String nameb2 = "button2";
-
-            createButton(nameb1,callbackButton,&nameb1,QT_CHECKBOX,1);
-            createButton(nameb2,callbackButton,NULL,QT_CHECKBOX,0);
-            createTrackbar( "track2", NULL, &value2, 255, NULL);
-            createButton("button5",callbackButton1,NULL,QT_RADIOBOX,0);
-            createButton("button6",callbackButton2,NULL,QT_RADIOBOX,1);
-
-            setMouseCallback( "main2",on_mouse,NULL );
-
-            Mat img1 = imread("files/flower.jpg");
-            VideoCapture video;
-            video.open("files/hockey.avi");
-
-            Mat img2,img3;
-
-            while( waitKey(33) != 27 )
-            {
-                img1.convertTo(img2,-1,1,value);
-                video >> img3;
-
-                imshow("main1",img2);
-                imshow("main2",img3);
-            }
-
-            destroyAllWindows();
-
-            return 0;
-        }
-    }

+ \include highgui_qt.cpp

\defgroup highgui_winrt WinRT support

@@ -538,36 +496,34 @@ int main(int argc, char *argv[])

See below the example used to generate the figure:

{@code
-        void sample_app::MainPage::ShowWindow()
+    void sample_app::MainPage::ShowWindow()
+    {
+        static cv::String windowName("sample");
+        cv::winrt_initContainer(this->cvContainer);
+        cv::namedWindow(windowName); // not required
+
+        cv::Mat image = cv::imread("Assets/sample.jpg");
+        cv::Mat converted = cv::Mat(image.rows, image.cols, CV_8UC4);
+        cv::cvtColor(image, converted, COLOR_BGR2BGRA);
+        cv::imshow(windowName, converted); // this will create window if it hasn't been created before
+
+        int state = 42;
+        cv::TrackbarCallback callback = [](int pos, void* userdata)
         {
-            static cv::String windowName("sample");
-            cv::winrt_initContainer(this->cvContainer);
-            cv::namedWindow(windowName); // not required
-
-            cv::Mat image = cv::imread("Assets/sample.jpg");
-            cv::Mat converted = cv::Mat(image.rows, image.cols, CV_8UC4);
-            cv::cvtColor(image, converted, COLOR_BGR2BGRA);
-            cv::imshow(windowName, converted); // this will create window if it hasn't been created before
-
-            int state = 42;
-            cv::TrackbarCallback callback = [](int pos, void* userdata)
-            {
-                if (pos == 0) {
-                    cv::destroyWindow(windowName);
-                }
-            };
-            cv::TrackbarCallback callbackTwin = [](int pos, void* userdata)
-            {
-                if (pos >= 70) {
-                    cv::destroyAllWindows();
-                }
-            };
-            cv::createTrackbar("Sample trackbar", windowName, &state, 100, callback);
-            cv::createTrackbar("Twin brother", windowName, &state, 100, callbackTwin);
-        }
+            if (pos == 0) {
+                cv::destroyWindow(windowName);
+            }
+        };
+        cv::TrackbarCallback callbackTwin = [](int pos, void* userdata)
+        {
+            if (pos >= 70) {
+                cv::destroyAllWindows();
+            }
+        };
+        cv::createTrackbar("Sample trackbar", windowName, &state, 100, callback);
+        cv::createTrackbar("Twin brother", windowName, &state, 100, callbackTwin);
+    }
     }
-

- \defgroup highgui_c C API \} */ @@ -759,6 +715,15 @@ displayed image (see imshow ), and you cannot change the window size manually. */ @Namespace("cv") public static native void destroyAllWindows(); + +/** \brief HighGUI backend used. +

+The function returns HighGUI backend name used: could be COCOA, GTK2/3, QT, WAYLAND or WIN32. +Returns empty string if there is no available UI backend. + */ +@Namespace("cv") public static native @StdString BytePointer currentUIFramework(); + + @Namespace("cv") public static native int startWindowThread(); /** \brief Similar to #waitKey, but returns full key code. @@ -833,6 +798,11 @@ If you need to show an image that is bigger than the screen resolution, you will press (suitable for displaying a video frame-by-frame). To remove the window, use cv::destroyWindow.

\note [__Windows Backend Only__] Pressing Ctrl+C will copy the image to the clipboard. Pressing Ctrl+S will show a dialog to save the image. +\note [__Wayland Backend Only__] Supoorting format is extended. +- If the image is 8-bit signed, the pixels are biased by 128. That is, the + value range [-128,127] is mapped to [0,255]. +- If the image is 16-bit signed, the pixels are divided by 256 and biased by 128. That is, the + value range [-32768,32767] is mapped to [0,255].

@param winname Name of the window. @param mat Image to be shown. @@ -868,6 +838,8 @@ If you need to show an image that is bigger than the screen resolution, you will @param winname Name of the window. @param x The new x-coordinate of the window. @param y The new y-coordinate of the window. +

+\note [__Wayland Backend Only__] This function is not supported by the Wayland protocol limitation. */ @Namespace("cv") public static native void moveWindow(@Str BytePointer winname, int x, int y); @Namespace("cv") public static native void moveWindow(@Str String winname, int x, int y); @@ -879,6 +851,8 @@ If you need to show an image that is bigger than the screen resolution, you will @param winname Name of the window. @param prop_id Window property to edit. The supported operation flags are: (cv::WindowPropertyFlags) @param prop_value New value of the window property. The supported flags are: (cv::WindowFlags) +

+\note [__Wayland Backend Only__] This function is not supported. */ @Namespace("cv") public static native void setWindowProperty(@Str BytePointer winname, int prop_id, double prop_value); @Namespace("cv") public static native void setWindowProperty(@Str String winname, int prop_id, double prop_value); @@ -898,6 +872,8 @@ If you need to show an image that is bigger than the screen resolution, you will @param prop_id Window property to retrieve. The following operation flags are available: (cv::WindowPropertyFlags)

@see setWindowProperty +

+\note [__Wayland Backend Only__] This function is not supported. */ @Namespace("cv") public static native double getWindowProperty(@Str BytePointer winname, int prop_id); @Namespace("cv") public static native double getWindowProperty(@Str String winname, int prop_id); @@ -909,6 +885,8 @@ If you need to show an image that is bigger than the screen resolution, you will @param winname Name of the window.

@see resizeWindow moveWindow +

+\note [__Wayland Backend Only__] This function is not supported by the Wayland protocol limitation. */ @Namespace("cv") public static native @ByVal Rect getWindowImageRect(@Str BytePointer winname); @Namespace("cv") public static native @ByVal Rect getWindowImageRect(@Str String winname); 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 index fab6601cd16..b4bc0a90ed6 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 index bc3b09c4096..53c73578ab3 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -69,7 +69,6 @@ public class opencv_imgcodecs extends org.bytedeco.opencv.helper.opencv_imgcodec /** \defgroup imgcodecs Image file reading and writing \{ - \defgroup imgcodecs_c C API \defgroup imgcodecs_flags Flags used for image file reading and writing \defgroup imgcodecs_ios iOS glue \defgroup imgcodecs_macosx MacOS(OSX) glue @@ -125,9 +124,9 @@ public class opencv_imgcodecs extends org.bytedeco.opencv.helper.opencv_imgcodec IMWRITE_JPEG_OPTIMIZE = 3, /** JPEG restart interval, 0 - 65535, default is 0 - no restart. */ IMWRITE_JPEG_RST_INTERVAL = 4, - /** Separate luma quality level, 0 - 100, default is -1 - don't use. */ + /** Separate luma quality level, 0 - 100, default is -1 - don't use. If JPEG_LIB_VERSION < 70, Not supported. */ IMWRITE_JPEG_LUMA_QUALITY = 5, - /** Separate chroma quality level, 0 - 100, default is -1 - don't use. */ + /** Separate chroma quality level, 0 - 100, default is -1 - don't use. If JPEG_LIB_VERSION < 70, Not supported. */ IMWRITE_JPEG_CHROMA_QUALITY = 6, /** For JPEG, set sampling factor. See cv::ImwriteJPEGSamplingFactorParams. */ IMWRITE_JPEG_SAMPLING_FACTOR = 7, @@ -157,8 +156,12 @@ public class opencv_imgcodecs extends org.bytedeco.opencv.helper.opencv_imgcodec IMWRITE_TIFF_XDPI = 257, /** For TIFF, use to specify the Y direction DPI */ IMWRITE_TIFF_YDPI = 258, - /** For TIFF, use to specify the image compression scheme. See libtiff for integer constants corresponding to compression formats. Note, for images whose depth is CV_32F, only libtiff's SGILOG compression scheme is used. For other supported depths, the compression scheme can be specified by this flag; LZW compression is the default. */ + /** For TIFF, use to specify the image compression scheme. See cv::ImwriteTiffCompressionFlags. Note, for images whose depth is CV_32F, only libtiff's SGILOG compression scheme is used. For other supported depths, the compression scheme can be specified by this flag; LZW compression is the default. */ IMWRITE_TIFF_COMPRESSION = 259, + /** For TIFF, use to specify the number of rows per strip. */ + IMWRITE_TIFF_ROWSPERSTRIP = 278, + /** For TIFF, use to specify predictor. See cv::ImwriteTiffPredictorFlags. */ + IMWRITE_TIFF_PREDICTOR = 317, /** For JPEG2000, use to specify the target compression rate (multiplied by 1000). The value can be from 0 to 1000. Default is 1000. */ IMWRITE_JPEG2000_COMPRESSION_X1000 = 272, /** For AVIF, it can be a quality between 0 and 100 (the higher the better). Default is 95. */ @@ -181,6 +184,83 @@ public class opencv_imgcodecs extends org.bytedeco.opencv.helper.opencv_imgcodec /** 1x1,1x1,1x1(No subsampling) */ IMWRITE_JPEG_SAMPLING_FACTOR_444 = 0x111111; +/** enum cv::ImwriteTiffCompressionFlags */ +public static final int + /** dump mode */ + IMWRITE_TIFF_COMPRESSION_NONE = 1, + /** CCITT modified Huffman RLE */ + IMWRITE_TIFF_COMPRESSION_CCITTRLE = 2, + /** CCITT Group 3 fax encoding */ + IMWRITE_TIFF_COMPRESSION_CCITTFAX3 = 3, + /** CCITT T.4 (TIFF 6 name) */ + IMWRITE_TIFF_COMPRESSION_CCITT_T4 = 3, + /** CCITT Group 4 fax encoding */ + IMWRITE_TIFF_COMPRESSION_CCITTFAX4 = 4, + /** CCITT T.6 (TIFF 6 name) */ + IMWRITE_TIFF_COMPRESSION_CCITT_T6 = 4, + /** Lempel-Ziv & Welch */ + IMWRITE_TIFF_COMPRESSION_LZW = 5, + /** !6.0 JPEG */ + IMWRITE_TIFF_COMPRESSION_OJPEG = 6, + /** %JPEG DCT compression */ + IMWRITE_TIFF_COMPRESSION_JPEG = 7, + /** !TIFF/FX T.85 JBIG compression */ + IMWRITE_TIFF_COMPRESSION_T85 = 9, + /** !TIFF/FX T.43 colour by layered JBIG compression */ + IMWRITE_TIFF_COMPRESSION_T43 = 10, + /** NeXT 2-bit RLE */ + IMWRITE_TIFF_COMPRESSION_NEXT = 32766, + /** #1 w/ word alignment */ + IMWRITE_TIFF_COMPRESSION_CCITTRLEW = 32771, + /** Macintosh RLE */ + IMWRITE_TIFF_COMPRESSION_PACKBITS = 32773, + /** ThunderScan RLE */ + IMWRITE_TIFF_COMPRESSION_THUNDERSCAN = 32809, + /** IT8 CT w/padding */ + IMWRITE_TIFF_COMPRESSION_IT8CTPAD = 32895, + /** IT8 Linework RLE */ + IMWRITE_TIFF_COMPRESSION_IT8LW = 32896, + /** IT8 Monochrome picture */ + IMWRITE_TIFF_COMPRESSION_IT8MP = 32897, + /** IT8 Binary line art */ + IMWRITE_TIFF_COMPRESSION_IT8BL = 32898, + /** Pixar companded 10bit LZW */ + IMWRITE_TIFF_COMPRESSION_PIXARFILM = 32908, + /** Pixar companded 11bit ZIP */ + IMWRITE_TIFF_COMPRESSION_PIXARLOG = 32909, + /** Deflate compression, legacy tag */ + IMWRITE_TIFF_COMPRESSION_DEFLATE = 32946, + /** Deflate compression, as recognized by Adobe */ + IMWRITE_TIFF_COMPRESSION_ADOBE_DEFLATE = 8, + /** Kodak DCS encoding */ + IMWRITE_TIFF_COMPRESSION_DCS = 32947, + /** ISO JBIG */ + IMWRITE_TIFF_COMPRESSION_JBIG = 34661, + /** SGI Log Luminance RLE */ + IMWRITE_TIFF_COMPRESSION_SGILOG = 34676, + /** SGI Log 24-bit packed */ + IMWRITE_TIFF_COMPRESSION_SGILOG24 = 34677, + /** Leadtools JPEG2000 */ + IMWRITE_TIFF_COMPRESSION_JP2000 = 34712, + /** ESRI Lerc codec: https://github.com/Esri/lerc */ + IMWRITE_TIFF_COMPRESSION_LERC = 34887, + /** LZMA2 */ + IMWRITE_TIFF_COMPRESSION_LZMA = 34925, + /** ZSTD: WARNING not registered in Adobe-maintained registry */ + IMWRITE_TIFF_COMPRESSION_ZSTD = 50000, + /** WEBP: WARNING not registered in Adobe-maintained registry */ + IMWRITE_TIFF_COMPRESSION_WEBP = 50001, + /** JPEGXL: WARNING not registered in Adobe-maintained registry */ + IMWRITE_TIFF_COMPRESSION_JXL = 50002; + +/** enum cv::ImwriteTiffPredictorFlags */ +public static final int + /** no prediction scheme used */ + IMWRITE_TIFF_PREDICTOR_NONE = 1, + /** horizontal differencing */ + IMWRITE_TIFF_PREDICTOR_HORIZONTAL = 2, + /** floating point predictor */ + IMWRITE_TIFF_PREDICTOR_FLOATINGPOINT = 3; /** enum cv::ImwriteEXRTypeFlags */ public static final int @@ -309,6 +389,28 @@ codecs supplied with an OS image. Install the relevant packages (do not forget t @Namespace("cv") public static native @ByVal Mat imread( @Str String filename, int flags/*=cv::IMREAD_COLOR*/ ); @Namespace("cv") public static native @ByVal Mat imread( @Str String filename ); +/** \brief Loads an image from a file. +

+This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts and the return value. +@param filename Name of file to be loaded. +@param dst object in which the image will be loaded. +@param flags Flag that can take values of cv::ImreadModes +\note +The image passing through the img parameter can be pre-allocated. The memory is reused if the shape and the type match with the load image. + */ +@Namespace("cv") public static native void imread( @Str BytePointer filename, @ByVal Mat dst, int flags/*=cv::IMREAD_COLOR*/ ); +@Namespace("cv") public static native void imread( @Str BytePointer filename, @ByVal Mat dst ); +@Namespace("cv") public static native void imread( @Str String filename, @ByVal Mat dst, int flags/*=cv::IMREAD_COLOR*/ ); +@Namespace("cv") public static native void imread( @Str String filename, @ByVal Mat dst ); +@Namespace("cv") public static native void imread( @Str String filename, @ByVal UMat dst, int flags/*=cv::IMREAD_COLOR*/ ); +@Namespace("cv") public static native void imread( @Str String filename, @ByVal UMat dst ); +@Namespace("cv") public static native void imread( @Str BytePointer filename, @ByVal UMat dst, int flags/*=cv::IMREAD_COLOR*/ ); +@Namespace("cv") public static native void imread( @Str BytePointer filename, @ByVal UMat dst ); +@Namespace("cv") public static native void imread( @Str BytePointer filename, @ByVal GpuMat dst, int flags/*=cv::IMREAD_COLOR*/ ); +@Namespace("cv") public static native void imread( @Str BytePointer filename, @ByVal GpuMat dst ); +@Namespace("cv") public static native void imread( @Str String filename, @ByVal GpuMat dst, int flags/*=cv::IMREAD_COLOR*/ ); +@Namespace("cv") public static native void imread( @Str String filename, @ByVal GpuMat dst ); + /** \brief Loads a multi-page image from a file.

The function imreadmulti loads a multi-page image from the specified file into a vector of Mat objects. @@ -428,7 +530,7 @@ using the LogLuv high dynamic range encoding (4 bytes per pixel) @Namespace("cv") public static native @Cast("bool") boolean imwrite( @Str String filename, @ByVal GpuMat img, @StdVector int[] params/*=std::vector()*/); -/** \overload multi-image overload for bindings */ +/** \brief multi-image overload for bindings */ @Namespace("cv") public static native @Cast("bool") boolean imwritemulti(@Str BytePointer filename, @ByVal MatVector img, @StdVector IntPointer params/*=std::vector()*/); @Namespace("cv") public static native @Cast("bool") boolean imwritemulti(@Str BytePointer filename, @ByVal MatVector img); @@ -467,7 +569,8 @@ contains invalid data, the function returns an empty matrix ( Mat::data==NULL ). @param buf Input array or vector of bytes. @param flags The same flags as in cv::imread, see cv::ImreadModes. @param dst The optional output placeholder for the decoded matrix. It can save the image -reallocations when the function is called repeatedly for images of the same size. +reallocations when the function is called repeatedly for images of the same size. In case of decoder +failure the function returns empty cv::Mat object, but does not release user-provided dst buffer. */ @Namespace("cv") public static native @ByVal Mat imdecode( @ByVal Mat buf, int flags, Mat dst); @Namespace("cv") public static native @ByVal Mat imdecode( @ByVal UMat buf, int flags, Mat dst); 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 index f1b80e3f89f..607cccf193c 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -394,7 +394,8 @@ public class opencv_imgproc extends org.bytedeco.opencv.helper.opencv_imgproc { /** enum */ public static final int CV_WARP_FILL_OUTLIERS = 8, - CV_WARP_INVERSE_MAP = 16; + CV_WARP_INVERSE_MAP = 16, + CV_WARP_RELATIVE_MAP = 32; /** Shapes of a structuring element for morphological operations @see cv::MorphShapes, cv::getStructuringElement @@ -2301,143 +2302,143 @@ public static native void cvDrawContours( CvArr img, CvSeq contour, // #include "opencv2/core.hpp" /** - \defgroup imgproc Image Processing +\defgroup imgproc Image Processing

This module includes image-processing functions. -

- \{ - \defgroup imgproc_filter Image Filtering

-Functions and classes described in this section are used to perform various linear or non-linear -filtering operations on 2D images (represented as Mat's). It means that for each pixel location -{@code (x,y)} in the source image (normally, rectangular), its neighborhood is considered and used to -compute the response. In case of a linear filter, it is a weighted sum of pixel values. In case of -morphological operations, it is the minimum or maximum values, and so on. The computed response is -stored in the destination image at the same location {@code (x,y)}. It means that the output image -will be of the same size as the input image. Normally, the functions support multi-channel arrays, -in which case every channel is processed independently. Therefore, the output image will also have -the same number of channels as the input one. -

-Another common feature of the functions and classes described in this section is that, unlike -simple arithmetic functions, they need to extrapolate values of some non-existing pixels. For -example, if you want to smooth an image using a Gaussian {@code 3 \times 3} filter, then, when -processing the left-most pixels in each row, you need pixels to the left of them, that is, outside -of the image. You can let these pixels be the same as the left-most image pixels ("replicated -border" extrapolation method), or assume that all the non-existing pixels are zeros ("constant -border" extrapolation method), and so on. OpenCV enables you to specify the extrapolation method. -For details, see #BorderTypes -

-\anchor filter_depths -### Depth combinations -Input depth (src.depth()) | Output depth (ddepth) ---------------------------|---------------------- -CV_8U | -1/CV_16S/CV_32F/CV_64F -CV_16U/CV_16S | -1/CV_32F/CV_64F -CV_32F | -1/CV_32F -CV_64F | -1/CV_64F -

-\note when ddepth=-1, the output image will have the same depth as the source. -

-\note if you need double floating-point accuracy and using single floating-point input data -(CV_32F input and CV_64F output depth combination), you can use \ref Mat.convertTo to convert -the input data to the desired precision. +\{ + \defgroup imgproc_filter Image Filtering +

+ Functions and classes described in this section are used to perform various linear or non-linear + filtering operations on 2D images (represented as Mat's). It means that for each pixel location + {@code (x,y)} in the source image (normally, rectangular), its neighborhood is considered and used to + compute the response. In case of a linear filter, it is a weighted sum of pixel values. In case of + morphological operations, it is the minimum or maximum values, and so on. The computed response is + stored in the destination image at the same location {@code (x,y)}. It means that the output image + will be of the same size as the input image. Normally, the functions support multi-channel arrays, + in which case every channel is processed independently. Therefore, the output image will also have + the same number of channels as the input one. +

+ Another common feature of the functions and classes described in this section is that, unlike + simple arithmetic functions, they need to extrapolate values of some non-existing pixels. For + example, if you want to smooth an image using a Gaussian {@code 3 \times 3} filter, then, when + processing the left-most pixels in each row, you need pixels to the left of them, that is, outside + of the image. You can let these pixels be the same as the left-most image pixels ("replicated + border" extrapolation method), or assume that all the non-existing pixels are zeros ("constant + border" extrapolation method), and so on. OpenCV enables you to specify the extrapolation method. + For details, see #BorderTypes +

+ \anchor filter_depths + ### Depth combinations + Input depth (src.depth()) | Output depth (ddepth) + --------------------------|---------------------- + CV_8U | -1/CV_16S/CV_32F/CV_64F + CV_16U/CV_16S | -1/CV_32F/CV_64F + CV_32F | -1/CV_32F + CV_64F | -1/CV_64F +

+ \note when ddepth=-1, the output image will have the same depth as the source. +

+ \note if you need double floating-point accuracy and using single floating-point input data + (CV_32F input and CV_64F output depth combination), you can use \ref Mat.convertTo to convert + the input data to the desired precision.

\defgroup imgproc_transform Geometric Image Transformations -

-The functions in this section perform various geometrical transformations of 2D images. They do not -change the image content but deform the pixel grid and map this deformed grid to the destination -image. In fact, to avoid sampling artifacts, the mapping is done in the reverse order, from -destination to the source. That is, for each pixel {@code (x, y)} of the destination image, the -functions compute coordinates of the corresponding "donor" pixel in the source image and copy the -pixel value: -

-

{@code \[\texttt{dst} (x,y)= \texttt{src} (f_x(x,y), f_y(x,y))\]}
-

-In case when you specify the forward mapping {@code \left: \texttt{src} \rightarrow -\texttt{dst}}, the OpenCV functions first compute the corresponding inverse mapping -{@code \left: \texttt{dst} \rightarrow \texttt{src}} and then use the above formula. -

-The actual implementations of the geometrical transformations, from the most generic remap and to -the simplest and the fastest resize, need to solve two main problems with the above formula: -

-- Extrapolation of non-existing pixels. Similarly to the filtering functions described in the -previous section, for some {@code (x,y)}, either one of {@code f_x(x,y)}, or {@code f_y(x,y)}, or both -of them may fall outside of the image. In this case, an extrapolation method needs to be used. -OpenCV provides the same selection of extrapolation methods as in the filtering functions. In -addition, it provides the method #BORDER_TRANSPARENT. This means that the corresponding pixels in -the destination image will not be modified at all. -

-- Interpolation of pixel values. Usually {@code f_x(x,y)} and {@code f_y(x,y)} are floating-point -numbers. This means that {@code \left} can be either an affine or perspective -transformation, or radial lens distortion correction, and so on. So, a pixel value at fractional -coordinates needs to be retrieved. In the simplest case, the coordinates can be just rounded to the -nearest integer coordinates and the corresponding pixel can be used. This is called a -nearest-neighbor interpolation. However, a better result can be achieved by using more -sophisticated [interpolation methods](http://en.wikipedia.org/wiki/Multivariate_interpolation) , -where a polynomial function is fit into some neighborhood of the computed pixel {@code (f_x(x,y), -f_y(x,y))}, and then the value of the polynomial at {@code (f_x(x,y), f_y(x,y))} is taken as the -interpolated pixel value. In OpenCV, you can choose between several interpolation methods. See -#resize for details. -

-\note The geometrical transformations do not work with {@code CV_8S} or {@code CV_32S} images. +

+ The functions in this section perform various geometrical transformations of 2D images. They do not + change the image content but deform the pixel grid and map this deformed grid to the destination + image. In fact, to avoid sampling artifacts, the mapping is done in the reverse order, from + destination to the source. That is, for each pixel {@code (x, y)} of the destination image, the + functions compute coordinates of the corresponding "donor" pixel in the source image and copy the + pixel value: +

+

{@code \[\texttt{dst} (x,y)= \texttt{src} (f_x(x,y), f_y(x,y))\]}
+

+ In case when you specify the forward mapping {@code \left: \texttt{src} \rightarrow + \texttt{dst}}, the OpenCV functions first compute the corresponding inverse mapping + {@code \left: \texttt{dst} \rightarrow \texttt{src}} and then use the above formula. +

+ The actual implementations of the geometrical transformations, from the most generic remap and to + the simplest and the fastest resize, need to solve two main problems with the above formula: +

+ - Extrapolation of non-existing pixels. Similarly to the filtering functions described in the + previous section, for some {@code (x,y)}, either one of {@code f_x(x,y)}, or {@code f_y(x,y)}, or both + of them may fall outside of the image. In this case, an extrapolation method needs to be used. + OpenCV provides the same selection of extrapolation methods as in the filtering functions. In + addition, it provides the method #BORDER_TRANSPARENT. This means that the corresponding pixels in + the destination image will not be modified at all. +

+ - Interpolation of pixel values. Usually {@code f_x(x,y)} and {@code f_y(x,y)} are floating-point + numbers. This means that {@code \left} can be either an affine or perspective + transformation, or radial lens distortion correction, and so on. So, a pixel value at fractional + coordinates needs to be retrieved. In the simplest case, the coordinates can be just rounded to the + nearest integer coordinates and the corresponding pixel can be used. This is called a + nearest-neighbor interpolation. However, a better result can be achieved by using more + sophisticated [interpolation methods](http://en.wikipedia.org/wiki/Multivariate_interpolation) , + where a polynomial function is fit into some neighborhood of the computed pixel {@code (f_x(x,y), + f_y(x,y))}, and then the value of the polynomial at {@code (f_x(x,y), f_y(x,y))} is taken as the + interpolated pixel value. In OpenCV, you can choose between several interpolation methods. See + #resize for details. +

+ \note The geometrical transformations do not work with {@code CV_8S} or {@code CV_32S} images.

\defgroup imgproc_misc Miscellaneous Image Transformations \defgroup imgproc_draw Drawing Functions -

-Drawing functions work with matrices/images of arbitrary depth. The boundaries of the shapes can be -rendered with antialiasing (implemented only for 8-bit images for now). All the functions include -the parameter color that uses an RGB value (that may be constructed with the Scalar constructor ) -for color images and brightness for grayscale images. For color images, the channel ordering is -normally *Blue, Green, Red*. This is what imshow, imread, and imwrite expect. So, if you form a -color using the Scalar constructor, it should look like: -

-

{@code \[\texttt{Scalar} (blue \_ component, green \_ component, red \_ component[, alpha \_ component])\]}
-

-If you are using your own image rendering and I/O functions, you can use any channel ordering. The -drawing functions process each channel independently and do not depend on the channel order or even -on the used color space. The whole image can be converted from BGR to RGB or to a different color -space using cvtColor . -

-If a drawn figure is partially or completely outside the image, the drawing functions clip it. Also, -many drawing functions can handle pixel coordinates specified with sub-pixel accuracy. This means -that the coordinates can be passed as fixed-point numbers encoded as integers. The number of -fractional bits is specified by the shift parameter and the real point coordinates are calculated as -{@code \texttt{Point}(x,y)\rightarrow\texttt{Point2f}(x*2^{-shift},y*2^{-shift})} . This feature is -especially effective when rendering antialiased shapes. -

-\note The functions do not support alpha-transparency when the target image is 4-channel. In this -case, the color[3] is simply copied to the repainted pixels. Thus, if you want to paint -semi-transparent shapes, you can paint them in a separate buffer and then blend it with the main -image. +

+ Drawing functions work with matrices/images of arbitrary depth. The boundaries of the shapes can be + rendered with antialiasing (implemented only for 8-bit images for now). All the functions include + the parameter color that uses an RGB value (that may be constructed with the Scalar constructor ) + for color images and brightness for grayscale images. For color images, the channel ordering is + normally *Blue, Green, Red*. This is what imshow, imread, and imwrite expect. So, if you form a + color using the Scalar constructor, it should look like: +

+

{@code \[\texttt{Scalar} (blue \_ component, green \_ component, red \_ component[, alpha \_ component])\]}
+

+ If you are using your own image rendering and I/O functions, you can use any channel ordering. The + drawing functions process each channel independently and do not depend on the channel order or even + on the used color space. The whole image can be converted from BGR to RGB or to a different color + space using cvtColor . +

+ If a drawn figure is partially or completely outside the image, the drawing functions clip it. Also, + many drawing functions can handle pixel coordinates specified with sub-pixel accuracy. This means + that the coordinates can be passed as fixed-point numbers encoded as integers. The number of + fractional bits is specified by the shift parameter and the real point coordinates are calculated as + {@code \texttt{Point}(x,y)\rightarrow\texttt{Point2f}(x*2^{-shift},y*2^{-shift})} . This feature is + especially effective when rendering antialiased shapes. +

+ \note The functions do not support alpha-transparency when the target image is 4-channel. In this + case, the color[3] is simply copied to the repainted pixels. Thus, if you want to paint + semi-transparent shapes, you can paint them in a separate buffer and then blend it with the main + image.

\defgroup imgproc_color_conversions Color Space Conversions \defgroup imgproc_colormap ColorMaps in OpenCV -

-The human perception isn't built for observing fine changes in grayscale images. Human eyes are more -sensitive to observing changes between colors, so you often need to recolor your grayscale images to -get a clue about them. OpenCV now comes with various colormaps to enhance the visualization in your -computer vision application. -

-In OpenCV you only need applyColorMap to apply a colormap on a given image. The following sample -code reads the path to an image from command line, applies a Jet colormap on it and shows the -result: -

-\include snippets/imgproc_applyColorMap.cpp -

-@see #ColormapTypes +

+ The human perception isn't built for observing fine changes in grayscale images. Human eyes are more + sensitive to observing changes between colors, so you often need to recolor your grayscale images to + get a clue about them. OpenCV now comes with various colormaps to enhance the visualization in your + computer vision application. +

+ In OpenCV you only need applyColorMap to apply a colormap on a given image. The following sample + code reads the path to an image from command line, applies a Jet colormap on it and shows the + result: +

+ \include snippets/imgproc_applyColorMap.cpp +

+ @see #ColormapTypes

\defgroup imgproc_subdiv2d Planar Subdivision -

-The Subdiv2D class described in this section is used to perform various planar subdivision on -a set of 2D points (represented as vector of Point2f). OpenCV subdivides a plane into triangles -using the Delaunay's algorithm, which corresponds to the dual graph of the Voronoi diagram. -In the figure below, the Delaunay's triangulation is marked with black lines and the Voronoi -diagram with red lines. -

-![Delaunay triangulation (black) and Voronoi (red)](pics/delaunay_voronoi.png) -

-The subdivisions can be used for the 3D piece-wise transformation of a plane, morphing, fast -location of points on the plane, building special graphs (such as NNG,RNG), and so forth. +

+ The Subdiv2D class described in this section is used to perform various planar subdivision on + a set of 2D points (represented as vector of Point2f). OpenCV subdivides a plane into triangles + using the Delaunay's algorithm, which corresponds to the dual graph of the Voronoi diagram. + In the figure below, the Delaunay's triangulation is marked with black lines and the Voronoi + diagram with red lines. +

+ ![Delaunay triangulation (black) and Voronoi (red)](pics/delaunay_voronoi.png) +

+ The subdivisions can be used for the 3D piece-wise transformation of a plane, morphing, fast + location of points on the plane, building special graphs (such as NNG,RNG), and so forth.

\defgroup imgproc_hist Histograms \defgroup imgproc_shape Structural Analysis and Shape Descriptors @@ -2445,7 +2446,6 @@ location of points on the plane, building special graphs (such as NNG,RNG), and \defgroup imgproc_feature Feature Detection \defgroup imgproc_object Object Detection \defgroup imgproc_segmentation Image Segmentation - \defgroup imgproc_c C API \defgroup imgproc_hal Hardware Acceleration Layer \{ \defgroup imgproc_hal_functions Functions @@ -2539,7 +2539,8 @@ location of points on the plane, building special graphs (such as NNG,RNG), and - flag is __not__ set: {@code dst( \rho , \phi ) = src(x,y)} - flag is set: {@code dst(x,y) = src( \rho , \phi )} */ - WARP_INVERSE_MAP = 16; + WARP_INVERSE_MAP = 16, + WARP_RELATIVE_MAP = 32; /** \brief Specify the polar mapping mode @see warpPolar @@ -2972,111 +2973,191 @@ represented by starting and ending points, and the matrix must be (the created s COLOR_YUV2BGR = 84, COLOR_YUV2RGB = 85, - /** YUV 4:2:0 family to RGB */ + /** convert between 4:2:0-subsampled YUV NV12 and RGB, two planes (in one or separate arrays): Y and U/V interleaved, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGB_NV12 = 90, + /** convert between 4:2:0-subsampled YUV NV12 and BGR, two planes (in one or separate arrays): Y and U/V interleaved, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGR_NV12 = 91, + /** convert between 4:2:0-subsampled YUV NV21 and RGB, two planes (in one or separate arrays): Y and V/U interleaved, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGB_NV21 = 92, + /** convert between 4:2:0-subsampled YUV NV21 and BGR, two planes (in one or separate arrays): Y and V/U interleaved, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGR_NV21 = 93, + /** synonym to NV21 */ COLOR_YUV420sp2RGB = COLOR_YUV2RGB_NV21, + /** synonym to NV21 */ COLOR_YUV420sp2BGR = COLOR_YUV2BGR_NV21, + /** convert between 4:2:0-subsampled YUV NV12 and RGBA, two planes (in one or separate arrays): Y and U/V interleaved, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGBA_NV12 = 94, + /** convert between 4:2:0-subsampled YUV NV12 and BGRA, two planes (in one or separate arrays): Y and U/V interleaved, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGRA_NV12 = 95, + /** convert between 4:2:0-subsampled YUV NV21 and RGBA, two planes (in one or separate arrays): Y and V/U interleaved, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGBA_NV21 = 96, + /** convert between 4:2:0-subsampled YUV NV21 and BGRA, two planes (in one or separate arrays): Y and V/U interleaved, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGRA_NV21 = 97, + /** synonym to NV21 */ COLOR_YUV420sp2RGBA = COLOR_YUV2RGBA_NV21, + /** synonym to NV21 */ COLOR_YUV420sp2BGRA = COLOR_YUV2BGRA_NV21, + /** convert between 4:2:0-subsampled YUV YV12 and RGB, three planes in one array: Y, V and U, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGB_YV12 = 98, + /** convert between 4:2:0-subsampled YUV YV12 and BGR, three planes in one array: Y, V and U, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGR_YV12 = 99, + /** convert between 4:2:0-subsampled YUV IYUV and RGB, three planes in one array: Y, U and V, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGB_IYUV = 100, + /** convert between 4:2:0-subsampled YUV IYUV and BGR, three planes in one array: Y, U and V, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGR_IYUV = 101, + /** synonym to IYUV */ COLOR_YUV2RGB_I420 = COLOR_YUV2RGB_IYUV, + /** synonym to IYUV */ COLOR_YUV2BGR_I420 = COLOR_YUV2BGR_IYUV, + /** synonym to YV12 */ COLOR_YUV420p2RGB = COLOR_YUV2RGB_YV12, + /** synonym to YV12 */ COLOR_YUV420p2BGR = COLOR_YUV2BGR_YV12, + /** convert between 4:2:0-subsampled YUV YV12 and RGBA, three planes in one array: Y, V and U, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGBA_YV12 = 102, + /** convert between 4:2:0-subsampled YUV YV12 and BGRA, three planes in one array: Y, V and U, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGRA_YV12 = 103, + /** convert between 4:2:0-subsampled YUV YV12 and RGBA, three planes in one array: Y, U and V, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGBA_IYUV = 104, + /** convert between 4:2:0-subsampled YUV YV12 and BGRA, three planes in one array: Y, U and V, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGRA_IYUV = 105, + /** synonym to IYUV */ COLOR_YUV2RGBA_I420 = COLOR_YUV2RGBA_IYUV, + /** synonym to IYUV */ COLOR_YUV2BGRA_I420 = COLOR_YUV2BGRA_IYUV, + /** synonym to YV12 */ COLOR_YUV420p2RGBA = COLOR_YUV2RGBA_YV12, + /** synonym to YV12 */ COLOR_YUV420p2BGRA = COLOR_YUV2BGRA_YV12, + /** extract Y channel from YUV 4:2:0 image */ COLOR_YUV2GRAY_420 = 106, + /** synonym to COLOR_YUV2GRAY_420 */ COLOR_YUV2GRAY_NV21 = COLOR_YUV2GRAY_420, + /** synonym to COLOR_YUV2GRAY_420 */ COLOR_YUV2GRAY_NV12 = COLOR_YUV2GRAY_420, + /** synonym to COLOR_YUV2GRAY_420 */ COLOR_YUV2GRAY_YV12 = COLOR_YUV2GRAY_420, + /** synonym to COLOR_YUV2GRAY_420 */ COLOR_YUV2GRAY_IYUV = COLOR_YUV2GRAY_420, + /** synonym to COLOR_YUV2GRAY_420 */ COLOR_YUV2GRAY_I420 = COLOR_YUV2GRAY_420, + /** synonym to COLOR_YUV2GRAY_420 */ COLOR_YUV420sp2GRAY = COLOR_YUV2GRAY_420, + /** synonym to COLOR_YUV2GRAY_420 */ COLOR_YUV420p2GRAY = COLOR_YUV2GRAY_420, - /** YUV 4:2:2 family to RGB */ + /** convert between YUV UYVY and RGB, YUV is 4:2:2-subsampled and interleaved as U/Y1/V/Y2, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGB_UYVY = 107, + /** convert between YUV UYVY and BGR, YUV is 4:2:2-subsampled and interleaved as U/Y1/V/Y2, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGR_UYVY = 108, - //COLOR_YUV2RGB_VYUY = 109, - //COLOR_YUV2BGR_VYUY = 110, + //COLOR_YUV2RGB_VYUY = 109, //!< convert between YUV VYUY and RGB, YUV is 4:2:2-subsampled and interleaved as V/Y1/U/Y2, see @ref color_convert_rgb_yuv_42x + //COLOR_YUV2BGR_VYUY = 110, //!< convert between YUV VYUY and BGR, YUV is 4:2:2-subsampled and interleaved as V/Y1/U/Y2, see @ref color_convert_rgb_yuv_42x + /** synonym to UYVY */ COLOR_YUV2RGB_Y422 = COLOR_YUV2RGB_UYVY, + /** synonym to UYVY */ COLOR_YUV2BGR_Y422 = COLOR_YUV2BGR_UYVY, + /** synonym to UYVY */ COLOR_YUV2RGB_UYNV = COLOR_YUV2RGB_UYVY, + /** synonym to UYVY */ COLOR_YUV2BGR_UYNV = COLOR_YUV2BGR_UYVY, + /** convert between YUV UYVY and RGBA, YUV is 4:2:2-subsampled and interleaved as U/Y1/V/Y2, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGBA_UYVY = 111, + /** convert between YUV UYVY and BGRA, YUV is 4:2:2-subsampled and interleaved as U/Y1/V/Y2, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGRA_UYVY = 112, - //COLOR_YUV2RGBA_VYUY = 113, - //COLOR_YUV2BGRA_VYUY = 114, + //COLOR_YUV2RGBA_VYUY = 113, //!< convert between YUV VYUY and RGBA, YUV is 4:2:2-subsampled and interleaved as V/Y1/U/Y2, see @ref color_convert_rgb_yuv_42x + //COLOR_YUV2BGRA_VYUY = 114, //!< convert between YUV VYUY and BGRA, YUV is 4:2:2-subsampled and interleaved as V/Y1/U/Y2, see @ref color_convert_rgb_yuv_42x + /** synonym to UYVY */ COLOR_YUV2RGBA_Y422 = COLOR_YUV2RGBA_UYVY, + /** synonym to UYVY */ COLOR_YUV2BGRA_Y422 = COLOR_YUV2BGRA_UYVY, + /** synonym to UYVY */ COLOR_YUV2RGBA_UYNV = COLOR_YUV2RGBA_UYVY, + /** synonym to UYVY */ COLOR_YUV2BGRA_UYNV = COLOR_YUV2BGRA_UYVY, + /** convert between YUV YUY2 and RGB, YUV is 4:2:2-subsampled and interleaved as Y1/U/Y2/V, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGB_YUY2 = 115, + /** convert between YUV YUY2 and BGR, YUV is 4:2:2-subsampled and interleaved as Y1/U/Y2/V, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGR_YUY2 = 116, + /** convert between YUV YVYU and RGB, YUV is 4:2:2-subsampled and interleaved as Y1/V/Y2/U, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGB_YVYU = 117, + /** convert between YUV YVYU and BGR, YUV is 4:2:2-subsampled and interleaved as Y1/V/Y2/U, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGR_YVYU = 118, + /** synonym to YUY2 */ COLOR_YUV2RGB_YUYV = COLOR_YUV2RGB_YUY2, + /** synonym to YUY2 */ COLOR_YUV2BGR_YUYV = COLOR_YUV2BGR_YUY2, + /** synonym to YUY2 */ COLOR_YUV2RGB_YUNV = COLOR_YUV2RGB_YUY2, + /** synonym to YUY2 */ COLOR_YUV2BGR_YUNV = COLOR_YUV2BGR_YUY2, + /** convert between YUV YUY2 and RGBA, YUV is 4:2:2-subsampled and interleaved as Y1/U/Y2/V, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGBA_YUY2 = 119, + /** convert between YUV YUY2 and BGRA, YUV is 4:2:2-subsampled and interleaved as Y1/U/Y2/V, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGRA_YUY2 = 120, + /** convert between YUV YVYU and RGBA, YUV is 4:2:2-subsampled and interleaved as Y1/V/Y2/U, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2RGBA_YVYU = 121, + /** convert between YUV YVYU and BGRA, YUV is 4:2:2-subsampled and interleaved as Y1/V/Y2/U, see \ref color_convert_rgb_yuv_42x */ COLOR_YUV2BGRA_YVYU = 122, + /** synonym to YUY2 */ COLOR_YUV2RGBA_YUYV = COLOR_YUV2RGBA_YUY2, + /** synonym to YUY2 */ COLOR_YUV2BGRA_YUYV = COLOR_YUV2BGRA_YUY2, + /** synonym to YUY2 */ COLOR_YUV2RGBA_YUNV = COLOR_YUV2RGBA_YUY2, + /** synonym to YUY2 */ COLOR_YUV2BGRA_YUNV = COLOR_YUV2BGRA_YUY2, + /** extract Y channel from YUV 4:2:2 image */ COLOR_YUV2GRAY_UYVY = 123, + /** extract Y channel from YUV 4:2:2 image */ COLOR_YUV2GRAY_YUY2 = 124, - //CV_YUV2GRAY_VYUY = CV_YUV2GRAY_UYVY, + //CV_YUV2GRAY_VYUY = CV_YUV2GRAY_UYVY, //!< synonym to COLOR_YUV2GRAY_UYVY + /** synonym to COLOR_YUV2GRAY_UYVY */ COLOR_YUV2GRAY_Y422 = COLOR_YUV2GRAY_UYVY, + /** synonym to COLOR_YUV2GRAY_UYVY */ COLOR_YUV2GRAY_UYNV = COLOR_YUV2GRAY_UYVY, + /** synonym to COLOR_YUV2GRAY_YUY2 */ COLOR_YUV2GRAY_YVYU = COLOR_YUV2GRAY_YUY2, + /** synonym to COLOR_YUV2GRAY_YUY2 */ COLOR_YUV2GRAY_YUYV = COLOR_YUV2GRAY_YUY2, + /** synonym to COLOR_YUV2GRAY_YUY2 */ COLOR_YUV2GRAY_YUNV = COLOR_YUV2GRAY_YUY2, /** alpha premultiplication */ COLOR_RGBA2mRGBA = 125, COLOR_mRGBA2RGBA = 126, - /** RGB to YUV 4:2:0 family */ + /** convert between RGB and 4:2:0-subsampled YUV I420, three planes in one array: Y, U and V, see \ref color_convert_rgb_yuv_42x */ COLOR_RGB2YUV_I420 = 127, + /** convert between BGR and 4:2:0-subsampled YUV I420, three planes in one array: Y, U and V, see \ref color_convert_rgb_yuv_42x */ COLOR_BGR2YUV_I420 = 128, + /** synonym to I420 */ COLOR_RGB2YUV_IYUV = COLOR_RGB2YUV_I420, + /** synonym to I420 */ COLOR_BGR2YUV_IYUV = COLOR_BGR2YUV_I420, + /** convert between RGBA and 4:2:0-subsampled YUV I420, three planes in one array: Y, U and V, see \ref color_convert_rgb_yuv_42x */ COLOR_RGBA2YUV_I420 = 129, + /** convert between BGRA and 4:2:0-subsampled YUV I420, three planes in one array: Y, U and V, see \ref color_convert_rgb_yuv_42x */ COLOR_BGRA2YUV_I420 = 130, + /** synonym to I420 */ COLOR_RGBA2YUV_IYUV = COLOR_RGBA2YUV_I420, + /** synonym to I420 */ COLOR_BGRA2YUV_IYUV = COLOR_BGRA2YUV_I420, + /** convert between RGB and 4:2:0-subsampled YUV YV12, three planes in one array: Y, V and U, see \ref color_convert_rgb_yuv_42x */ COLOR_RGB2YUV_YV12 = 131, + /** convert between BGR and 4:2:0-subsampled YUV YV12, three planes in one array: Y, V and U, see \ref color_convert_rgb_yuv_42x */ COLOR_BGR2YUV_YV12 = 132, + /** convert between RGBA and 4:2:0-subsampled YUV YV12, three planes in one array: Y, V and U, see \ref color_convert_rgb_yuv_42x */ COLOR_RGBA2YUV_YV12 = 133, + /** convert between BGRA and 4:2:0-subsampled YUV YV12, three planes in one array: Y, V and U, see \ref color_convert_rgb_yuv_42x */ COLOR_BGRA2YUV_YV12 = 134, /** Demosaicing, see \ref color_convert_bayer "color conversions" for additional information */ @@ -3209,38 +3290,64 @@ represented by starting and ending points, and the matrix must be (the created s /** equivalent to GBRG Bayer pattern */ COLOR_BayerGR2RGBA = COLOR_BayerGB2BGRA, - /** RGB to YUV 4:2:2 family */ - + /** convert between RGB and YUV UYVU, YUV is 4:2:2 and interleaved as U/Y1/V/Y2, see \ref color_convert_rgb_yuv_42x */ COLOR_RGB2YUV_UYVY = 143, + /** convert between BGR and YUV UYVU, YUV is 4:2:2 and interleaved as U/Y1/V/Y2, see \ref color_convert_rgb_yuv_42x */ COLOR_BGR2YUV_UYVY = 144, + /** synonym to UYVY */ COLOR_RGB2YUV_Y422 = COLOR_RGB2YUV_UYVY, + /** synonym to UYVY */ COLOR_BGR2YUV_Y422 = COLOR_BGR2YUV_UYVY, + /** synonym to UYVY */ COLOR_RGB2YUV_UYNV = COLOR_RGB2YUV_UYVY, + /** synonym to UYVY */ COLOR_BGR2YUV_UYNV = COLOR_BGR2YUV_UYVY, + /** convert between RGBA and YUV UYVU, YUV is 4:2:2 and interleaved as U/Y1/V/Y2, see \ref color_convert_rgb_yuv_42x */ COLOR_RGBA2YUV_UYVY = 145, + /** convert between BGRA and YUV UYVU, YUV is 4:2:2 and interleaved as U/Y1/V/Y2, see \ref color_convert_rgb_yuv_42x */ COLOR_BGRA2YUV_UYVY = 146, + /** synonym to UYVY */ COLOR_RGBA2YUV_Y422 = COLOR_RGBA2YUV_UYVY, + /** synonym to UYVY */ COLOR_BGRA2YUV_Y422 = COLOR_BGRA2YUV_UYVY, + /** synonym to UYVY */ COLOR_RGBA2YUV_UYNV = COLOR_RGBA2YUV_UYVY, + /** synonym to UYVY */ COLOR_BGRA2YUV_UYNV = COLOR_BGRA2YUV_UYVY, + /** convert between RGB and YUV YUY2, YUV is 4:2:2 and interleaved as Y1/U/Y2/V, see \ref color_convert_rgb_yuv_42x */ COLOR_RGB2YUV_YUY2 = 147, + /** convert between BGR and YUV YUY2, YUV is 4:2:2 and interleaved as Y1/U/Y2/V, see \ref color_convert_rgb_yuv_42x */ COLOR_BGR2YUV_YUY2 = 148, + /** convert between RGB and YUV YVYU, YUV is 4:2:2 and interleaved as Y1/V/Y2/U, see \ref color_convert_rgb_yuv_42x */ COLOR_RGB2YUV_YVYU = 149, + /** convert between BGR and YUV YVYU, YUV is 4:2:2 and interleaved as Y1/V/Y2/U, see \ref color_convert_rgb_yuv_42x */ COLOR_BGR2YUV_YVYU = 150, + /** synonym to YUY2 */ COLOR_RGB2YUV_YUYV = COLOR_RGB2YUV_YUY2, + /** synonym to YUY2 */ COLOR_BGR2YUV_YUYV = COLOR_BGR2YUV_YUY2, + /** synonym to YUY2 */ COLOR_RGB2YUV_YUNV = COLOR_RGB2YUV_YUY2, + /** synonym to YUY2 */ COLOR_BGR2YUV_YUNV = COLOR_BGR2YUV_YUY2, + /** convert between RGBA and YUV YUY2, YUV is 4:2:2 and interleaved as Y1/U/Y2/V, see \ref color_convert_rgb_yuv_42x */ COLOR_RGBA2YUV_YUY2 = 151, + /** convert between BGRA and YUV YUY2, YUV is 4:2:2 and interleaved as Y1/U/Y2/V, see \ref color_convert_rgb_yuv_42x */ COLOR_BGRA2YUV_YUY2 = 152, + /** convert between RGBA and YUV YVYU, YUV is 4:2:2 and interleaved as Y1/V/Y2/U, see \ref color_convert_rgb_yuv_42x */ COLOR_RGBA2YUV_YVYU = 153, + /** convert between BGRA and YUV YVYU, YUV is 4:2:2 and interleaved as Y1/V/Y2/U, see \ref color_convert_rgb_yuv_42x */ COLOR_BGRA2YUV_YVYU = 154, + /** synonym to YUY2 */ COLOR_RGBA2YUV_YUYV = COLOR_RGBA2YUV_YUY2, + /** synonym to YUY2 */ COLOR_BGRA2YUV_YUYV = COLOR_BGRA2YUV_YUY2, + /** synonym to YUY2 */ COLOR_RGBA2YUV_YUNV = COLOR_RGBA2YUV_YUY2, + /** synonym to YUY2 */ COLOR_BGRA2YUV_YUNV = COLOR_BGRA2YUV_YUY2, COLOR_COLORCVT_MAX = 155; @@ -4811,6 +4918,7 @@ For instance, an opening operation (#MORPH_OPEN) with two iterations is equivale The function remap transforms the source image using the specified map:

{@code \[\texttt{dst} (x,y) =  \texttt{src} (map_x(x,y),map_y(x,y))\]}
+
{@code \[\texttt{dst} (x,y) =  \texttt{src} (x+map_x(x,y),y+map_y(x,y))\]}
with WARP_RELATIVE_MAP

where values of pixels with non-integer coordinates are computed using one of available interpolation methods. {@code map_x} and {@code map_y} can be encoded as separate floating-point maps @@ -4830,7 +4938,9 @@ For instance, an opening operation (#MORPH_OPEN) with two iterations is equivale @param map2 The second map of y values having the type CV_16UC1, CV_32FC1, or none (empty map if map1 is (x,y) points), respectively. @param interpolation Interpolation method (see #InterpolationFlags). The methods #INTER_AREA -and #INTER_LINEAR_EXACT are not supported by this function. +#INTER_LINEAR_EXACT and #INTER_NEAREST_EXACT are not supported by this function. +The extra flag WARP_RELATIVE_MAP that can be ORed to the interpolation method +(e.g. INTER_LINEAR | WARP_RELATIVE_MAP) @param borderMode Pixel extrapolation method (see #BorderTypes). When borderMode=#BORDER_TRANSPARENT, it means that the pixels in the destination image that corresponds to the "outliers" in the source image are not modified by the function. @@ -6056,7 +6166,7 @@ histogram is uniform ( uniform =true), then for each dimension i it is enough to size and depth as images[0] . @param ranges Array of arrays of the histogram bin boundaries in each dimension. See #calcHist . @param scale Optional scale factor for the output back projection. -@param uniform Flag indicating whether the histogram is uniform or not (see above). +@param uniform Flag indicating whether the histogram is uniform or not (see #calcHist).

@see calcHist, compareHist */ @@ -6847,8 +6957,8 @@ sixth bytes would then be the second pixel (Blue, then Green, then Red), and so The function computes moments, up to the 3rd order, of a vector shape or a rasterized shape. The results are returned in the structure cv::Moments.

-@param array Raster image (single-channel, 8-bit or floating-point 2D array) or an array ( -{@code 1 \times N} or {@code N \times 1} ) of 2D points (Point or Point2f ). +@param array Single chanel raster image (CV_8U, CV_16U, CV_16S, CV_32F, CV_64F) or an array ( +{@code 1 \times N} or {@code N \times 1} ) of 2D points (Point or Point2f). @param binaryImage If it is true, all non-zero image pixels are treated as 1's. The parameter is used for images only. @return moments. @@ -7186,6 +7296,8 @@ accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data t int method); /** \overload */ + +//! @Namespace("cv") public static native void findContours( @ByVal Mat image, @ByVal MatVector contours, int mode, int method, @ByVal(nullValue = "cv::Point()") Point offset); @Namespace("cv") public static native void findContours( @ByVal Mat image, @ByVal MatVector contours, @@ -7223,15 +7335,34 @@ accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data t @Namespace("cv") public static native void findContours( @ByVal GpuMat image, @ByVal GpuMatVector contours, int mode, int method); -/** \example samples/cpp/squares.cpp -A program using pyramid scaling, Canny, contours and contour simplification to find -squares in a list of images (pic1-6.png). Returns sequence of squares detected on the image. -*/ +/** \brief Find contours using link runs algorithm + * + * This function implements an algorithm different from cv::findContours: + * - doesn't allocate temporary image internally, thus it has reduced memory consumption + * - supports CV_8UC1 images only + * - outputs 2-level hierarhy only (RETR_CCOMP mode) + * - doesn't support approximation change other than CHAIN_APPROX_SIMPLE + * In all other aspects this function is compatible with cv::findContours. */ +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal Mat image, @ByVal MatVector contours, @ByVal Mat hierarchy); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal Mat image, @ByVal UMatVector contours, @ByVal Mat hierarchy); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal Mat image, @ByVal GpuMatVector contours, @ByVal Mat hierarchy); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal UMat image, @ByVal MatVector contours, @ByVal UMat hierarchy); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal UMat image, @ByVal UMatVector contours, @ByVal UMat hierarchy); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal UMat image, @ByVal GpuMatVector contours, @ByVal UMat hierarchy); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal GpuMat image, @ByVal MatVector contours, @ByVal GpuMat hierarchy); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal GpuMat image, @ByVal UMatVector contours, @ByVal GpuMat hierarchy); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal GpuMat image, @ByVal GpuMatVector contours, @ByVal GpuMat hierarchy); -/** \example samples/tapi/squares.cpp -A program using pyramid scaling, Canny, contours and contour simplification to find -squares in the input image. -*/ +/** \overload */ +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal Mat image, @ByVal MatVector contours); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal Mat image, @ByVal UMatVector contours); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal Mat image, @ByVal GpuMatVector contours); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal UMat image, @ByVal MatVector contours); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal UMat image, @ByVal UMatVector contours); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal UMat image, @ByVal GpuMatVector contours); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal GpuMat image, @ByVal MatVector contours); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal GpuMat image, @ByVal UMatVector contours); +@Namespace("cv") public static native void findContoursLinkRuns(@ByVal GpuMat image, @ByVal GpuMatVector contours); /** \brief Approximates a polygonal curve(s) with the specified precision.

@@ -7763,7 +7894,7 @@ The function determines whether the point is inside a contour, outside, or lies /** \brief Applies a GNU Octave/MATLAB equivalent colormap on a given image.

-@param src The source image, grayscale or colored of type CV_8UC1 or CV_8UC3. +@param src The source image, grayscale or colored of type CV_8UC1 or CV_8UC3. If CV_8UC3, then the CV_8UC1 image is generated internally using cv::COLOR_BGR2GRAY. @param dst The result is the colormapped source image. Note: Mat::create is called on dst. @param colormap The colormap to apply, see #ColormapTypes */ @@ -7773,8 +7904,8 @@ The function determines whether the point is inside a contour, outside, or lies /** \brief Applies a user colormap on a given image.

-@param src The source image, grayscale or colored of type CV_8UC1 or CV_8UC3. -@param dst The result is the colormapped source image. Note: Mat::create is called on dst. +@param src The source image, grayscale or colored of type CV_8UC1 or CV_8UC3. If CV_8UC3, then the CV_8UC1 image is generated internally using cv::COLOR_BGR2GRAY. +@param dst The result is the colormapped source image of the same number of channels as userColor. Note: Mat::create is called on dst. @param userColor The colormap to apply of type CV_8UC1 or CV_8UC3 and size 256 */ @Namespace("cv") public static native void applyColorMap(@ByVal Mat src, @ByVal Mat dst, @ByVal Mat userColor); 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 index a86ed3d274b..5802e7acf2e 100644 --- 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.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_mcc.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_mcc.java index ddd87ff7e2a..c74b5ec5218 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_mcc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_mcc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_ml.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_ml.java index f280b280c38..267c2881ee6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_ml.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_ml.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_objdetect.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_objdetect.java index eb1a9afa38b..75db1283a9a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_objdetect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_objdetect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -220,6 +220,7 @@ public class opencv_objdetect extends org.bytedeco.opencv.presets.opencv_objdete // #endif + // Parsed from // This file is part of OpenCV project. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_optflow.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_optflow.java index 3054d14068c..c062dccdd74 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_optflow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_optflow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_phase_unwrapping.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_phase_unwrapping.java index 654ec8393ff..95c7f3904dd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_phase_unwrapping.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_phase_unwrapping.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_photo.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_photo.java index 101e21af0be..a30018d595b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_photo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_photo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -77,31 +77,30 @@ public class opencv_photo extends org.bytedeco.opencv.presets.opencv_photo { \defgroup photo_inpaint Inpainting \defgroup photo_denoise Denoising \defgroup photo_hdr HDR imaging -

-This section describes high dynamic range imaging algorithms namely tonemapping, exposure alignment, -camera calibration with multiple exposures and exposure fusion. +

+ This section describes high dynamic range imaging algorithms namely tonemapping, exposure alignment, + camera calibration with multiple exposures and exposure fusion.

\defgroup photo_decolor Contrast Preserving Decolorization -

-Useful links: -

-http://www.cse.cuhk.edu.hk/leojia/projects/color2gray/index.html +

+ Useful links: +

+ http://www.cse.cuhk.edu.hk/leojia/projects/color2gray/index.html

\defgroup photo_clone Seamless Cloning -

-Useful links: -

-https://www.learnopencv.com/seamless-cloning-using-opencv-python-cpp +

+ Useful links: +

+ https://www.learnopencv.com/seamless-cloning-using-opencv-python-cpp

\defgroup photo_render Non-Photorealistic Rendering -

-Useful links: -

-http://www.inf.ufrgs.br/~eslgastal/DomainTransform -

-https://www.learnopencv.com/non-photorealistic-rendering-using-opencv-python-c/

- \defgroup photo_c C API + Useful links: +

+ http://www.inf.ufrgs.br/~eslgastal/DomainTransform +

+ https://www.learnopencv.com/non-photorealistic-rendering-using-opencv-python-c/ +

\} */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_plot.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_plot.java index 942b8033aac..2cb30960824 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_plot.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_plot.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_quality.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_quality.java index 78beda42b02..84d9adf4726 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_quality.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_quality.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_rapid.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_rapid.java index 23023e6ebca..85fd199a729 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_rapid.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_rapid.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_saliency.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_saliency.java index 20f3db9dc6e..6ec96eafd93 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_saliency.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_saliency.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_shape.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_shape.java index a440a8177ca..55bd1008582 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_shape.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_shape.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_signal.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_signal.java new file mode 100644 index 00000000000..1d8320588db --- /dev/null +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_signal.java @@ -0,0 +1,74 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.opencv.global; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.opencv.opencv_core.*; +import static org.bytedeco.opencv.global.opencv_core.*; + +public class opencv_signal extends org.bytedeco.opencv.presets.opencv_signal { + static { Loader.load(); } + +// Parsed from + +// This file is part of OpenCV project. +// It is subject to the license terms in the LICENSE file found in the top-level directory +// of this distribution and at http://opencv.org/license.html +// #ifndef OPENCV_SIGNAL_HPP +// #define OPENCV_SIGNAL_HPP + +/** +* \defgroup signal Signal Processing +* \{ +* This module includes signal processing algorithms. +* \} +*/ + +// #include "opencv2/core.hpp" +// #include "opencv2/signal/signal_resample.hpp" + +// #endif + + +// Parsed from + +// This file is part of OpenCV project. +// It is subject to the license terms in the LICENSE file found in the top-level directory +// of this distribution and at http://opencv.org/license.html +// #ifndef OPENCV_SIGNAL_SIGNAL_RESAMPLE_HPP +// #define OPENCV_SIGNAL_SIGNAL_RESAMPLE_HPP + +// #include + +/** \addtogroup signal + * \{ +

+/** \brief Signal resampling + * + * @param inputSignal [in] Array with input signal. + * @param outSignal [out] Array with output signal + * @param inFreq [in] Input signal frequency. + * @param outFreq [in] Output signal frequency. + * Signal resampling implemented a cubic interpolation function and a filtering function based on Kaiser window and Bessel function, used to construct a FIR filter. + * Result is similar to {@code scipy.signal.resample}. +

+Detail: https://en.wikipedia.org/wiki/Sample-rate_conversion +*/ +@Namespace("cv::signal") public static native void resampleSignal(@ByVal Mat inputSignal, @ByVal Mat outSignal, int inFreq, int outFreq); +@Namespace("cv::signal") public static native void resampleSignal(@ByVal UMat inputSignal, @ByVal UMat outSignal, int inFreq, int outFreq); +@Namespace("cv::signal") public static native void resampleSignal(@ByVal GpuMat inputSignal, @ByVal GpuMat outSignal, int inFreq, int outFreq); + +/** \} */ + + + +// #endif + + +} diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_stitching.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_stitching.java index 3824457a112..9217888f93e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_stitching.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_stitching.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_structured_light.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_structured_light.java index 10b9caefccf..5e34c7e7e20 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_structured_light.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_structured_light.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_superres.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_superres.java index 68b2c4271a0..b6dc00262c5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_superres.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_superres.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_text.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_text.java index 40cda1bcbaa..76970d1d94f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_text.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_text.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -106,50 +106,50 @@ or tort (including negligence or otherwise) arising in any way out of

\{ \defgroup text_detect Scene Text Detection -

-Class-specific Extremal Regions for Scene Text Detection --------------------------------------------------------- -

-The scene text detection algorithm described below has been initially proposed by Lukás Neumann & -Jiri Matas \cite Neumann11. The main idea behind Class-specific Extremal Regions is similar to the MSER -in that suitable Extremal Regions (ERs) are selected from the whole component tree of the image. -However, this technique differs from MSER in that selection of suitable ERs is done by a sequential -classifier trained for character detection, i.e. dropping the stability requirement of MSERs and -selecting class-specific (not necessarily stable) regions. -

-The component tree of an image is constructed by thresholding by an increasing value step-by-step -from 0 to 255 and then linking the obtained connected components from successive levels in a -hierarchy by their inclusion relation: -

-![image](pics/component_tree.png) -

-The component tree may contain a huge number of regions even for a very simple image as shown in -the previous image. This number can easily reach the order of 1 x 10\^6 regions for an average 1 -Megapixel image. In order to efficiently select suitable regions among all the ERs the algorithm -make use of a sequential classifier with two differentiated stages. -

-In the first stage incrementally computable descriptors (area, perimeter, bounding box, and Euler's -number) are computed (in O(1)) for each region r and used as features for a classifier which -estimates the class-conditional probability p(r|character). Only the ERs which correspond to local -maximum of the probability p(r|character) are selected (if their probability is above a global limit -p_min and the difference between local maximum and local minimum is greater than a delta_min -value). -

-In the second stage, the ERs that passed the first stage are classified into character and -non-character classes using more informative but also more computationally expensive features. (Hole -area ratio, convex hull ratio, and the number of outer boundary inflexion points). -

-This ER filtering process is done in different single-channel projections of the input image in -order to increase the character localization recall. -

-After the ER filtering is done on each input channel, character candidates must be grouped in -high-level text blocks (i.e. words, text lines, paragraphs, ...). The opencv_text module implements -two different grouping algorithms: the Exhaustive Search algorithm proposed in \cite Neumann12 for -grouping horizontally aligned text, and the method proposed by Lluis Gomez and Dimosthenis Karatzas -in \cite Gomez13 \cite Gomez14 for grouping arbitrary oriented text (see erGrouping). -

-To see the text detector at work, have a look at the textdetection demo: - +

+ Class-specific Extremal Regions for Scene Text Detection + -------------------------------------------------------- +

+ The scene text detection algorithm described below has been initially proposed by Lukás Neumann & + Jiri Matas \cite Neumann11. The main idea behind Class-specific Extremal Regions is similar to the MSER + in that suitable Extremal Regions (ERs) are selected from the whole component tree of the image. + However, this technique differs from MSER in that selection of suitable ERs is done by a sequential + classifier trained for character detection, i.e. dropping the stability requirement of MSERs and + selecting class-specific (not necessarily stable) regions. +

+ The component tree of an image is constructed by thresholding by an increasing value step-by-step + from 0 to 255 and then linking the obtained connected components from successive levels in a + hierarchy by their inclusion relation: +

+ ![image](pics/component_tree.png) +

+ The component tree may contain a huge number of regions even for a very simple image as shown in + the previous image. This number can easily reach the order of 1 x 10\^6 regions for an average 1 + Megapixel image. In order to efficiently select suitable regions among all the ERs the algorithm + make use of a sequential classifier with two differentiated stages. +

+ In the first stage incrementally computable descriptors (area, perimeter, bounding box, and Euler's + number) are computed (in O(1)) for each region r and used as features for a classifier which + estimates the class-conditional probability p(r|character). Only the ERs which correspond to local + maximum of the probability p(r|character) are selected (if their probability is above a global limit + p_min and the difference between local maximum and local minimum is greater than a delta_min + value). +

+ In the second stage, the ERs that passed the first stage are classified into character and + non-character classes using more informative but also more computationally expensive features. (Hole + area ratio, convex hull ratio, and the number of outer boundary inflexion points). +

+ This ER filtering process is done in different single-channel projections of the input image in + order to increase the character localization recall. +

+ After the ER filtering is done on each input channel, character candidates must be grouped in + high-level text blocks (i.e. words, text lines, paragraphs, ...). The opencv_text module implements + two different grouping algorithms: the Exhaustive Search algorithm proposed in \cite Neumann12 for + grouping horizontally aligned text, and the method proposed by Lluis Gomez and Dimosthenis Karatzas + in \cite Gomez13 \cite Gomez14 for grouping arbitrary oriented text (see erGrouping). +

+ To see the text detector at work, have a look at the textdetection demo: +

\defgroup text_recognize Scene Text Recognition \} @@ -831,8 +831,7 @@ two vectors of ERStats. This is because MSER() output contains both MSER+ and MS */ @Namespace("cv::text") public static native @Ptr OCRHMMDecoder.ClassifierCallback loadOCRHMMClassifier(@Str BytePointer filename, int classifier); @Namespace("cv::text") public static native @Ptr OCRHMMDecoder.ClassifierCallback loadOCRHMMClassifier(@Str String filename, int classifier); -/** \} -

+ /** \brief Utility function to create a tailored language model transitions table from a given list of words (lexicon). * * @param vocabulary The language vocabulary (chars when ASCII English text). diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_tracking.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_tracking.java index 7ec9d22ef6b..18c336454fc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_tracking.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_tracking.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_video.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_video.java index 37b9947c1c2..721e3cb9bd9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_video.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_video.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -85,7 +85,6 @@ public class opencv_video extends org.bytedeco.opencv.presets.opencv_video { \{ \defgroup video_motion Motion Analysis \defgroup video_track Object Tracking - \defgroup video_c C API \} */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videoio.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videoio.java index 03b78c4d759..51f1b57a797 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videoio.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videoio.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -167,7 +167,7 @@ public class opencv_videoio extends org.bytedeco.opencv.presets.opencv_videoio { CAP_XINE = 2400, /** uEye Camera API */ CAP_UEYE = 2500, - /** For Orbbec 3D-Sensor device/module (Astra+, Femto, Astra2, Gemini2, Gemini2L, Gemini2XL, Femto Mega) attention: Astra2, Gemini2, and Gemini2L cameras currently only support Windows and Linux kernel versions no higher than 4.15, and higher versions of Linux kernel may have exceptions. */ + /** For Orbbec 3D-Sensor device/module (Astra+, Femto, Astra2, Gemini2, Gemini2L, Gemini2XL, Femto Mega) attention: Astra2 cameras currently only support Windows and Linux kernel versions no higher than 4.15, and higher versions of Linux kernel may have exceptions. */ CAP_OBSENSOR = 2600; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videostab.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videostab.java index a4d364c8482..0ae27f4b9ce 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videostab.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videostab.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -1175,7 +1175,7 @@ public class opencv_videostab extends org.bytedeco.opencv.presets.opencv_videost // #define OPENCV_VIDEOSTAB_HPP /** - \defgroup videostab Video Stabilization +\defgroup videostab Video Stabilization

The video stabilization module contains a set of functions and classes that can be used to solve the problem of video stabilization. There are a few methods implemented, most of them are described in @@ -1183,27 +1183,25 @@ public class opencv_videostab extends org.bytedeco.opencv.presets.opencv_videost paper methods.

### References -

- 1. "Full-Frame Video Stabilization with Motion Inpainting" - Yasuyuki Matsushita, Eyal Ofek, Weina Ge, Xiaoou Tang, Senior Member, and Heung-Yeung Shum - 2. "Auto-Directed Video Stabilization with Robust L1 Optimal Camera Paths" - Matthias Grundmann, Vivek Kwatra, Irfan Essa -

- \{ - \defgroup videostab_motion Global Motion Estimation

-The video stabilization module contains a set of functions and classes for global motion estimation -between point clouds or between images. In the last case features are extracted and matched -internally. For the sake of convenience the motion estimation functions are wrapped into classes. -Both the functions and the classes are available. -

- \defgroup videostab_marching Fast Marching Method -

-The Fast Marching Method \cite Telea04 is used in of the video stabilization routines to do motion and -color inpainting. The method is implemented is a flexible way and it's made public for other users. -

- \} +1. "Full-Frame Video Stabilization with Motion Inpainting" + Yasuyuki Matsushita, Eyal Ofek, Weina Ge, Xiaoou Tang, Senior Member, and Heung-Yeung Shum +2. "Auto-Directed Video Stabilization with Robust L1 Optimal Camera Paths" + Matthias Grundmann, Vivek Kwatra, Irfan Essa

+\{ + \defgroup videostab_motion Global Motion Estimation +

+ The video stabilization module contains a set of functions and classes for global motion estimation + between point clouds or between images. In the last case features are extracted and matched + internally. For the sake of convenience the motion estimation functions are wrapped into classes. + Both the functions and the classes are available. +

+ \defgroup videostab_marching Fast Marching Method +

+ The Fast Marching Method \cite Telea04 is used in of the video stabilization routines to do motion and + color inpainting. The method is implemented is a flexible way and it's made public for other users. +\} */ // #include "opencv2/videostab/stabilizer.hpp" diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_wechat_qrcode.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_wechat_qrcode.java index 028764dba99..0c7acc30d16 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_wechat_qrcode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_wechat_qrcode.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_xfeatures2d.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_xfeatures2d.java index 18aa0f57959..7ebff47ec12 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_xfeatures2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_xfeatures2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -83,20 +83,19 @@ or tort (including negligence or otherwise) arising in any way out of /** \defgroup xfeatures2d Extra 2D Features Framework \{ \defgroup xfeatures2d_experiment Experimental 2D Features Algorithms -

-This section describes experimental algorithms for 2d feature detection. +

+ This section describes experimental algorithms for 2d feature detection.

\defgroup xfeatures2d_nonfree Non-free 2D Features Algorithms -

-This section describes two popular algorithms for 2d feature detection, SIFT and SURF, that are -known to be patented. You need to set the OPENCV_ENABLE_NONFREE option in cmake to use those. Use them at your own risk. +

+ This section describes two popular algorithms for 2d feature detection, SIFT and SURF, that are + known to be patented. You need to set the OPENCV_ENABLE_NONFREE option in cmake to use those. Use them at your own risk.

\defgroup xfeatures2d_match Experimental 2D Features Matching Algorithm -

-This section describes the following matching strategies: - - GMS: Grid-based Motion Statistics, \cite Bian2017gms - - LOGOS: Local geometric support for high-outlier spatial verification, \cite Lowry2018LOGOSLG -

+

+ This section describes the following matching strategies: + - GMS: Grid-based Motion Statistics, \cite Bian2017gms + - LOGOS: Local geometric support for high-outlier spatial verification, \cite Lowry2018LOGOSLG \} */ // Targeting ../opencv_xfeatures2d/FREAK.java diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_ximgproc.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_ximgproc.java index 5b38b6c5ce9..5af5ff4effe 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_ximgproc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_ximgproc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; @@ -103,12 +103,13 @@ public class opencv_ximgproc extends org.bytedeco.opencv.presets.opencv_ximgproc // #include "ximgproc/find_ellipses.hpp" -/** \defgroup ximgproc Extended Image Processing - \{ +/** +\defgroup ximgproc Extended Image Processing +\{ \defgroup ximgproc_edge Structured forests for fast edge detection -

-This module contains implementations of modern structured edge detection algorithms, -i.e. algorithms which somehow takes into account pixel affinities in natural images. +

+ This module contains implementations of modern structured edge detection algorithms, + i.e. algorithms which somehow takes into account pixel affinities in natural images.

\defgroup ximgproc_edgeboxes EdgeBoxes

@@ -121,17 +122,17 @@ public class opencv_ximgproc extends org.bytedeco.opencv.presets.opencv_ximgproc \defgroup ximgproc_fast_line_detector Fast line detector

\defgroup ximgproc_edge_drawing EdgeDrawing -

-EDGE DRAWING LIBRARY FOR GEOMETRIC FEATURE EXTRACTION AND VALIDATION -

-Edge Drawing (ED) algorithm is an proactive approach on edge detection problem. In contrast to many other existing edge detection algorithms which follow a subtractive -approach (i.e. after applying gradient filters onto an image eliminating pixels w.r.t. several rules, e.g. non-maximal suppression and hysteresis in Canny), ED algorithm -works via an additive strategy, i.e. it picks edge pixels one by one, hence the name Edge Drawing. Then we process those random shaped edge segments to extract higher level -edge features, i.e. lines, circles, ellipses, etc. The popular method of extraction edge pixels from the thresholded gradient magnitudes is non-maximal supression that tests -every pixel whether it has the maximum gradient response along its gradient direction and eliminates if it does not. However, this method does not check status of the -neighboring pixels, and therefore might result low quality (in terms of edge continuity, smoothness, thinness, localization) edge segments. Instead of non-maximal supression, -ED points a set of edge pixels and join them by maximizing the total gradient response of edge segments. Therefore it can extract high quality edge segments without need for -an additional hysteresis step. +

+ EDGE DRAWING LIBRARY FOR GEOMETRIC FEATURE EXTRACTION AND VALIDATION +

+ Edge Drawing (ED) algorithm is an proactive approach on edge detection problem. In contrast to many other existing edge detection algorithms which follow a subtractive + approach (i.e. after applying gradient filters onto an image eliminating pixels w.r.t. several rules, e.g. non-maximal suppression and hysteresis in Canny), ED algorithm + works via an additive strategy, i.e. it picks edge pixels one by one, hence the name Edge Drawing. Then we process those random shaped edge segments to extract higher level + edge features, i.e. lines, circles, ellipses, etc. The popular method of extraction edge pixels from the thresholded gradient magnitudes is non-maximal supression that tests + every pixel whether it has the maximum gradient response along its gradient direction and eliminates if it does not. However, this method does not check status of the + neighboring pixels, and therefore might result low quality (in terms of edge continuity, smoothness, thinness, localization) edge segments. Instead of non-maximal supression, + ED points a set of edge pixels and join them by maximizing the total gradient response of edge segments. Therefore it can extract high quality edge segments without need for + an additional hysteresis step.

\defgroup ximgproc_fourier Fourier descriptors

@@ -153,10 +154,12 @@ the size of the original (not encoded) image. For the runs the following mappin

The size of the original image is required for compatibility with the imgproc functions when the boundary handling requires that pixel outside the image boundary are "on". -

- \} +\} */ +/** \addtogroup ximgproc + * \{ */ + /** enum cv::ximgproc::ThinningTypes */ public static final int THINNING_ZHANGSUEN = 0, // Thinning technique of Zhang-Suen @@ -176,9 +179,6 @@ the size of the original (not encoded) image. For the runs the following mappin /** NICK technique. See \cite Khurshid2009 . */ BINARIZATION_NICK = 3; -/** \addtogroup ximgproc - * \{ -

/** \brief Performs thresholding on input images using Niblack's technique or some of the popular variations it inspired.

@@ -401,13 +401,19 @@ Suggested functions for c(x,y,t) are: @param eps regularization term of Guided Filter. {@code {eps}^2} is similar to the sigma in the color space into bilateralFilter.

-For more details about Guided Filter parameters, see the original article \cite Kaiming10 . +@param scale subsample factor of Fast Guided Filter, use a scale less than 1 to speeds up computation +with almost no visible degradation. (e.g. scale==0.5 shrinks the image by 2x inside the filter) +

+For more details about (Fast) Guided Filter parameters, see the original articles \cite Kaiming10 \cite Kaiming15 . */ +@Namespace("cv::ximgproc") public static native @Ptr GuidedFilter createGuidedFilter(@ByVal Mat guide, int radius, double eps, double scale/*=1.0*/); @Namespace("cv::ximgproc") public static native @Ptr GuidedFilter createGuidedFilter(@ByVal Mat guide, int radius, double eps); +@Namespace("cv::ximgproc") public static native @Ptr GuidedFilter createGuidedFilter(@ByVal UMat guide, int radius, double eps, double scale/*=1.0*/); @Namespace("cv::ximgproc") public static native @Ptr GuidedFilter createGuidedFilter(@ByVal UMat guide, int radius, double eps); +@Namespace("cv::ximgproc") public static native @Ptr GuidedFilter createGuidedFilter(@ByVal GpuMat guide, int radius, double eps, double scale/*=1.0*/); @Namespace("cv::ximgproc") public static native @Ptr GuidedFilter createGuidedFilter(@ByVal GpuMat guide, int radius, double eps); -/** \brief Simple one-line Guided Filter call. +/** \brief Simple one-line (Fast) Guided Filter call.

If you have multiple images to filter with the same guided image then use GuidedFilter interface to avoid extra computations on initialization stage. @@ -426,12 +432,15 @@ Suggested functions for c(x,y,t) are:

@param dDepth optional depth of the output image.

+@param scale subsample factor of Fast Guided Filter, use a scale less than 1 to speeds up computation +with almost no visible degradation. (e.g. scale==0.5 shrinks the image by 2x inside the filter) +

@see bilateralFilter, dtFilter, amFilter */ -@Namespace("cv::ximgproc") public static native void guidedFilter(@ByVal Mat guide, @ByVal Mat src, @ByVal Mat dst, int radius, double eps, int dDepth/*=-1*/); +@Namespace("cv::ximgproc") public static native void guidedFilter(@ByVal Mat guide, @ByVal Mat src, @ByVal Mat dst, int radius, double eps, int dDepth/*=-1*/, double scale/*=1.0*/); @Namespace("cv::ximgproc") public static native void guidedFilter(@ByVal Mat guide, @ByVal Mat src, @ByVal Mat dst, int radius, double eps); -@Namespace("cv::ximgproc") public static native void guidedFilter(@ByVal UMat guide, @ByVal UMat src, @ByVal UMat dst, int radius, double eps, int dDepth/*=-1*/); +@Namespace("cv::ximgproc") public static native void guidedFilter(@ByVal UMat guide, @ByVal UMat src, @ByVal UMat dst, int radius, double eps, int dDepth/*=-1*/, double scale/*=1.0*/); @Namespace("cv::ximgproc") public static native void guidedFilter(@ByVal UMat guide, @ByVal UMat src, @ByVal UMat dst, int radius, double eps); -@Namespace("cv::ximgproc") public static native void guidedFilter(@ByVal GpuMat guide, @ByVal GpuMat src, @ByVal GpuMat dst, int radius, double eps, int dDepth/*=-1*/); +@Namespace("cv::ximgproc") public static native void guidedFilter(@ByVal GpuMat guide, @ByVal GpuMat src, @ByVal GpuMat dst, int radius, double eps, int dDepth/*=-1*/, double scale/*=1.0*/); @Namespace("cv::ximgproc") public static native void guidedFilter(@ByVal GpuMat guide, @ByVal GpuMat src, @ByVal GpuMat dst, int radius, double eps); // Targeting ../opencv_ximgproc/AdaptiveManifoldFilter.java @@ -1429,8 +1438,7 @@ or tort (including negligence or otherwise) arising in any way out of * two operands. Formally, a binary operation {@code f } on a set {@code S } * is a binary relation that maps elements of the Cartesian product * {@code S \times S } to {@code S }: -*

{@code \[ f: S \times S \to S \]}
- * \ingroup MinUtils_MathOper + *
{@code \[ f: S \times S \to S \]}
*/ /** enum cv::ximgproc::HoughOp */ public static final int @@ -1997,6 +2005,8 @@ or tort (including negligence or otherwise) arising in any way out of @Namespace("cv::ximgproc") public static native void GradientPaillouX(@ByVal UMat op, @ByVal UMat _dst, double alpha, double omega); @Namespace("cv::ximgproc") public static native void GradientPaillouX(@ByVal GpuMat op, @ByVal GpuMat _dst, double alpha, double omega); +/** \} */ + // #endif @@ -2116,6 +2126,8 @@ If zero, Canny() is not applied and the input image is taken as an edge image. @Namespace("cv::ximgproc") public static native void GradientDericheX(@ByVal UMat op, @ByVal UMat dst, double alpha,double omega); @Namespace("cv::ximgproc") public static native void GradientDericheX(@ByVal GpuMat op, @ByVal GpuMat dst, double alpha,double omega); +/** \} */ + // #endif @@ -2155,6 +2167,8 @@ If zero, Canny() is not applied and the input image is taken as an edge image. @Namespace("cv::ximgproc") public static native void PeiLinNormalization( @ByVal UMat I, @ByVal UMat T ); @Namespace("cv::ximgproc") public static native void PeiLinNormalization( @ByVal GpuMat I, @ByVal GpuMat T ); + /** \} */ + // namespace // #endif @@ -2456,6 +2470,8 @@ If zero, Canny() is not applied and the input image is taken as an edge image. @Cast("bool") boolean bBoundaryOnForErosion/*=true*/, @ByVal(nullValue = "cv::Point(0,0)") Point anchor); @Namespace("cv::ximgproc::rl") public static native void morphologyEx(@ByVal GpuMat rlSrc, @ByVal GpuMat rlDest, int op, @ByVal GpuMat rlKernel); +/** \} */ + @@ -2492,10 +2508,10 @@ If zero, Canny() is not applied and the input image is taken as an edge image. @Namespace("cv::ximgproc") public static native void edgePreservingFilter( @ByVal UMat src, @ByVal UMat dst, int d, double threshold ); @Namespace("cv::ximgproc") public static native void edgePreservingFilter( @ByVal GpuMat src, @ByVal GpuMat dst, int d, double threshold ); - // namespace - /** \} */ + // namespace + // #endif @@ -2573,6 +2589,8 @@ If zero, Canny() is not applied and the input image is taken as an edge image. @Namespace("cv::ximgproc") public static native void colorMatchTemplate(@ByVal UMat img, @ByVal UMat templ, @ByVal UMat result); @Namespace("cv::ximgproc") public static native void colorMatchTemplate(@ByVal GpuMat img, @ByVal GpuMat templ, @ByVal GpuMat result); +/** \} */ + // #endif diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_xphoto.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_xphoto.java index 0a0b913d6b0..3d8be3fa818 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_xphoto.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_xphoto.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.global; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/EstimateParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/EstimateParameters.java index 922f246b28b..7589b066938 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/EstimateParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/EstimateParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_aruco; @@ -39,7 +39,10 @@ * rvec and tvec values as initial approximations of the rotation and translation vectors, respectively, and further * optimizes them (default false). * @param solvePnPMethod Method for solving a PnP problem: see \ref calib3d_solvePnP_flags (default SOLVEPNP_ITERATIVE). - * @see PatternPositionType, solvePnP(), check tutorial_aruco_detection in aruco contrib + * + * @deprecated Use Board::matchImagePoints and cv::solvePnP + * + * @see PatternPositionType, solvePnP() */ @Namespace("cv::aruco") @NoOffset @Properties(inherit = org.bytedeco.opencv.presets.opencv_aruco.class) public class EstimateParameters extends Pointer { diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorCNT.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorCNT.java index 65c5037380d..9acb54289ad 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorCNT.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorCNT.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bgsegm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGMG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGMG.java index fdbc293eb07..e2074e3f935 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGMG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGMG.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bgsegm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGSOC.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGSOC.java index 800fe5a87dd..dc228c9a5a4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGSOC.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGSOC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bgsegm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBP.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBP.java index 0de7904a181..6bfc7b62048 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBP.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBP.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bgsegm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBPDesc.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBPDesc.java index 38935e23c32..214c7bd7ad3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBPDesc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBPDesc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bgsegm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorMOG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorMOG.java index 9c90f173b5e..141c7c72931 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorMOG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorMOG.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bgsegm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/SyntheticSequenceGenerator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/SyntheticSequenceGenerator.java index 48d08f3db96..1a563d336b6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/SyntheticSequenceGenerator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/SyntheticSequenceGenerator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bgsegm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/Retina.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/Retina.java index 411265d99c8..1f06043ba0d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/Retina.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/Retina.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bioinspired; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaFastToneMapping.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaFastToneMapping.java index de0109f629c..6e8146334dd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaFastToneMapping.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaFastToneMapping.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bioinspired; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaParameters.java index 549becb3260..156dcf001be 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bioinspired; @@ -30,57 +30,12 @@ Here is the default configuration file of the retina module. It gives results such as the first retina output shown on the top of this page.

-

{@code {xml}
-    
-    
-    
-        1
-        1
-        7.5e-01
-        9.0e-01
-        5.3e-01
-        0.01
-        0.5
-        7.
-        7.5e-01
-    
-        1
-        0.
-        0.
-        7.
-        2.0e+00
-        9.5e-01
-        0.
-        7.
-    
-    }
+ \include default_retina_config.xml

Here is the 'realistic" setup used to obtain the second retina output shown on the top of this page.

-

{@code {xml}
-    
-    
-    
-      1
-      1
-      8.9e-01
-      9.0e-01
-      5.3e-01
-      0.3
-      0.5
-      7.
-      8.9e-01
-    
-      1
-      0.
-      0.
-      7.
-      2.0e+00
-      9.5e-01
-      0.
-      7.
-    
-    }
+ \include realistic_retina_config.xml +

*/ @Namespace("cv::bioinspired") @Properties(inherit = org.bytedeco.opencv.presets.opencv_bioinspired.class) public class RetinaParameters extends Pointer { diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/SegmentationParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/SegmentationParameters.java index 8fa40de6386..5aeaecc74d1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/SegmentationParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/SegmentationParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bioinspired; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/TransientAreasSegmentationModule.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/TransientAreasSegmentationModule.java index f0a963d8f0f..c4cedd71027 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/TransientAreasSegmentationModule.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/TransientAreasSegmentationModule.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_bioinspired; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CirclesGridFinderParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CirclesGridFinderParameters.java index e522dc7aafc..98c145dcefa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CirclesGridFinderParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CirclesGridFinderParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_calib3d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CvLevMarq.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CvLevMarq.java index 3667d165bcf..b3447667b50 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CvLevMarq.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CvLevMarq.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_calib3d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/LMSolver.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/LMSolver.java index 16af08b7342..481706f07f7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/LMSolver.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/LMSolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_calib3d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoBM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoBM.java index 9b0a5691480..f529cb5c9b8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoBM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoBM.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_calib3d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoMatcher.java index 22f2ffdc0fa..0528ef6b3a2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoMatcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_calib3d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoSGBM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoSGBM.java index 23de71f134f..e0c6920898b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoSGBM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoSGBM.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_calib3d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/UsacParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/UsacParams.java index 1609c0d1917..14d7ebf68b9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/UsacParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/UsacParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_calib3d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java index 98938cfabb2..e30e1b06acf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Arrays.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Arrays.java index 68461b6a367..f97b0fd6bd2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Arrays.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Arrays.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AsyncArray.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AsyncArray.java index 67fb511e1cc..bcbce9e2ed6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AsyncArray.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AsyncArray.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; @@ -85,7 +85,7 @@ public class AsyncArray extends Pointer { public native @Cast("bool") @NoException boolean valid(); -// #ifdef CV_CXX11 +// #if 0 // #endif diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AutoLock.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AutoLock.java index a8d71ca3cbd..f02ebc4ec1f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AutoLock.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AutoLock.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Buffer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Buffer.java index 52ad9d5a1a9..17b264aea98 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Buffer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Buffer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/BufferPool.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/BufferPool.java index 5b06018e3a4..cd62019123a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/BufferPool.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/BufferPool.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/BufferPoolController.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/BufferPoolController.java index 8dcbf522ef1..6dafb8fa034 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/BufferPoolController.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/BufferPoolController.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ByteVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ByteVectorVector.java index 3bc51863244..1a66cc9353f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ByteVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ByteVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Complexd.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Complexd.java index 772c35124a0..066fef4fe76 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Complexd.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Complexd.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Complexf.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Complexf.java index 32a078d7e00..7257210349a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Complexf.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Complexf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ConjGradSolver.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ConjGradSolver.java index 5ef9fa6ed8f..f4b35f50ce0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ConjGradSolver.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ConjGradSolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Context.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Context.java index 752c2f0ebdf..37ba202ebeb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Context.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Context.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv16suf.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv16suf.java index 6f010fb34bd..bc8762e07e9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv16suf.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv16suf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv32suf.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv32suf.java index 10004ca09ee..7c4ef25430f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv32suf.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv32suf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv64suf.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv64suf.java index 6321964b791..d4a2dd2c87c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv64suf.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv64suf.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvBox2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvBox2D.java index 8a9809f5797..f2894f44fa0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvBox2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvBox2D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvChain.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvChain.java index 78502538239..254641b849f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvChain.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvChain.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvCmpFunc.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvCmpFunc.java index 20ef4c1fba8..8419984bc9d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvCmpFunc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvCmpFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvContour.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvContour.java index 65b5904361d..d059ba6caa7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvContour.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvContour.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvErrorCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvErrorCallback.java index 6d9333e5933..9452d404013 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvErrorCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvErrorCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraph.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraph.java index a54e1092ff5..ed1d18f57c6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraph.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraph.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphEdge.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphEdge.java index 92c08fc884a..25920dc2593 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphEdge.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphEdge.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphScanner.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphScanner.java index e9510698045..af1e0fc1056 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphScanner.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphScanner.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx.java index af79dbd978d..777767dbf2f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx2D.java index d49c225a539..26a0cab78dc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx2D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvHistogram.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvHistogram.java index be5676bfbb4..fb4df93d461 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvHistogram.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvHistogram.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvLineIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvLineIterator.java index 14a145d2ca2..e771d7f6a72 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvLineIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvLineIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMat.java index b1d9c24b8ad..c11240823c5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatND.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatND.java index f51a06305f0..c020692b045 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatND.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatND.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemBlock.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemBlock.java index dd650d5743a..e1183b63f43 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemBlock.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemBlock.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStorage.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStorage.java index bab359b5da6..6ac6d75551d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStorage.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStorage.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStoragePos.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStoragePos.java index 41fd3e46a99..7641f299e6f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStoragePos.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStoragePos.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvNArrayIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvNArrayIterator.java index 0484dfbe6d8..5aa16d964a5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvNArrayIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvNArrayIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint.java index 5fb113250a0..69fdac11e42 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D32f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D32f.java index 3b2c8b36c17..007e0c3f872 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D32f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D32f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D64f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D64f.java index 2160134f04b..d9ab35f46a1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D64f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D64f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D32f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D32f.java index d7e7baba2ab..1dfa30d9275 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D32f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D32f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D64f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D64f.java index 6b2676dc015..8aef0d7b8cb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D64f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D64f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvRect.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvRect.java index b04330eee59..322002c151e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvRect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvRect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvScalar.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvScalar.java index 3ee8c3fb3ec..1d778292f42 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvScalar.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvScalar.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeq.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeq.java index fc645dddcb8..2f820262edb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeq.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeq.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqBlock.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqBlock.java index 3893b223963..2347e8bf6d9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqBlock.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqBlock.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqReader.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqReader.java index 08580014c7e..e9e4fd41d34 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqReader.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqReader.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqWriter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqWriter.java index 86109585e93..2ab825c402b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqWriter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqWriter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSet.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSet.java index ea7ba099499..a853e8c8c5f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSet.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSet.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSetElem.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSetElem.java index 1d7b88f9cca..af2eb97b26f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSetElem.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSetElem.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize.java index 644551493b0..04109d6d41d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize2D32f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize2D32f.java index a29e0ee4e5b..6dd11482542 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize2D32f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize2D32f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSlice.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSlice.java index e771d4db149..aea7c46721a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSlice.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSlice.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMat.java index dc6bef836fa..71c2f020c1e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMatIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMatIterator.java index b16c62cbaa7..70576cd0403 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMatIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMatIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseNode.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseNode.java index 5dc9b0e3b2d..f7847265295 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseNode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseNode.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTermCriteria.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTermCriteria.java index 1a2275141f2..e5b667c97a3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTermCriteria.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTermCriteria.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTreeNodeIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTreeNodeIterator.java index 326d204d90d..349c8295063 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTreeNodeIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTreeNodeIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplAllocateImageData.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplAllocateImageData.java index 9810190cad0..ab14a774282 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplAllocateImageData.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplAllocateImageData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCloneImage.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCloneImage.java index a20c429d249..ddcb923f5f7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCloneImage.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCloneImage.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCreateImageHeader.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCreateImageHeader.java index e12dd7a0af2..57f8ac7a7e1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCreateImageHeader.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCreateImageHeader.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCreateROI.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCreateROI.java index 8148e434bf6..af022d73106 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCreateROI.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplCreateROI.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplDeallocate.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplDeallocate.java index 1e616adce65..85d4210b8c8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplDeallocate.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv_iplDeallocate.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DCT2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DCT2D.java index 22639daa0e7..ef751585dd4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DCT2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DCT2D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DFT1D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DFT1D.java index 35ff436c27a..48a8a485c8b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DFT1D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DFT1D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DFT2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DFT2D.java index 06b88f8fb4b..753bceec1c5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DFT2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DFT2D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatch.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatch.java index eaae930f6c5..277b82e70fa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatch.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatch.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatchVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatchVector.java index 3749b21ce48..37c0520a23e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatchVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatchVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatchVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatchVectorVector.java index 79d3e5e7a32..af02aa55714 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatchVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatchVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Device.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Device.java index 6a5e5b9ce25..7829b2aa3f2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Device.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Device.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; @@ -80,6 +80,11 @@ public class Device extends Pointer { public native int singleFPConfig(); public native int halfFPConfig(); + /** true if 'cl_khr_fp64' extension is available */ + public native @Cast("bool") boolean hasFP64(); + /** true if 'cl_khr_fp16' extension is available */ + public native @Cast("bool") boolean hasFP16(); + public native @Cast("bool") boolean endianLittle(); public native @Cast("bool") boolean errorCorrectionSupport(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DeviceInfo.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DeviceInfo.java index 205d133a771..d757d7daa47 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DeviceInfo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DeviceInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DownhillSolver.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DownhillSolver.java index 74e3af24fda..cc7de16241b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DownhillSolver.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DownhillSolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ErrorCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ErrorCallback.java index 1b15a2ede98..ee938940b19 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ErrorCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ErrorCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Event.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Event.java index 9a4c4a82938..bc17c546214 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Event.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Event.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNode.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNode.java index a4694351181..674cc15f0ef 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNode.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNodeIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNodeIterator.java index d4b6073aed0..33ee332896c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNodeIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNodeIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileStorage.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileStorage.java index 9751f93bce0..9c9e2f4cddc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileStorage.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileStorage.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FloatVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FloatVectorVector.java index 6887e67b12b..5d44dd74d73 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FloatVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FloatVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Formatted.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Formatted.java index a2aa8248974..a89b7375260 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Formatted.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Formatted.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Formatter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Formatter.java index 4db6f5ebbd2..c5526079ee5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Formatter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Formatter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuData.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuData.java index 06ece46f0a7..479c9e9a019 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuData.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMat.java index 3fd91fd9b7a..fb5c16e71c2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatND.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatND.java index 68e88ba5d8c..8900aef7d43 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatND.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatND.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatVector.java index 1e55008b6e4..f51749167ba 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Hamming.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Hamming.java index 4bee3afb98c..c42f04ce6e7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Hamming.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Hamming.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/HostMem.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/HostMem.java index f48bf80d7df..9d37d122efb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/HostMem.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/HostMem.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Image2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Image2D.java index 60c3d70f549..b5a0981369e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Image2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Image2D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/InstrNode.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/InstrNode.java index 9e3f5674704..608f3fe72aa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/InstrNode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/InstrNode.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoubleMap.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoubleMap.java index d0f93083846..e85f91bf675 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoubleMap.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoubleMap.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoublePairVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoublePairVector.java index 8bc431b252d..55f76195125 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoublePairVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoublePairVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntIntPair.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntIntPair.java index bd62fb3ad07..c386466b7f0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntIntPair.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntIntPair.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntIntPairVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntIntPairVector.java index 5619cc64c9d..2e724cb444e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntIntPairVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntIntPairVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntVectorVector.java index d6da934e478..5d2f8565c6d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernel.java index e95e51f464f..a167b4832e6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernelFP.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernelFP.java index 267cbb299dc..bb94d949aef 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernelFP.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernelFP.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplImage.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplImage.java index 5d8df1c827a..860f1764fdd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplImage.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplImage.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplROI.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplROI.java index f9ec30b33da..511f163309a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplROI.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplROI.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplTileInfo.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplTileInfo.java index 8d1fbe13fb6..7939fd82b24 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplTileInfo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplTileInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Kernel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Kernel.java index c0877e7e02d..2e459a602e8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Kernel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Kernel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KernelArg.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KernelArg.java index 419ffadcefe..69f88af1333 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KernelArg.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KernelArg.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPoint.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPoint.java index 989fe27f2bc..f7198fc655c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPoint.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPoint.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPointVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPointVector.java index 9ad61ad1101..f9c6c415412 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPointVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPointVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPointVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPointVectorVector.java index 27babb56960..ac5a4c684e5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPointVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPointVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/LDA.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/LDA.java index 6b2e1011dd7..07c754e4192 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/LDA.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/LDA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mat.java index f0c0ab717f8..b8049ba742d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatAllocator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatAllocator.java index d49633891ea..8efab7a772c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatAllocator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatAllocator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatBytePairVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatBytePairVector.java index 50f5ef97349..24eb0fdb68b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatBytePairVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatBytePairVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatConstIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatConstIterator.java index 816f00dfac0..04ecb0942fc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatConstIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatConstIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatExpr.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatExpr.java index 7554ce8db27..47cbf906100 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatExpr.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatExpr.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatOp.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatOp.java index 7192ee21959..a551f5b750e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatOp.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatOp.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatSize.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatSize.java index 163f10cce01..22a620c775a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatSize.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatSize.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatStep.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatStep.java index 8daa3ce400d..d91988394e3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatStep.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatStep.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatVector.java index 41499058aac..08452a95d85 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatVectorVector.java index 24c056e27c6..c8a2a882c65 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java index e46ef9a62df..388c3491e96 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Moments.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Moments.java index 0132ce880c8..75b9e8ec282 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Moments.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Moments.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mutex.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mutex.java index 2a71aa6ab0e..9d699ab4934 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mutex.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mutex.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NAryMatIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NAryMatIterator.java index 406ef150ab7..a761b137364 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NAryMatIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NAryMatIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeData.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeData.java index bd8dec7dd43..645384be735 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeData.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTls.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTls.java index d430b1875fb..84d61153e86 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTls.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTls.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsData.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsData.java index b6eb43791ee..b5e307b795d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsData.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsVector.java index bfffb0e7d0b..d913170635d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OclPlatform.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OclPlatform.java index be7718bcfdc..81eeadea5d1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OclPlatform.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OclPlatform.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContext.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContext.java index b9fb5a45425..9d6673edc80 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContext.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContextScope.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContextScope.java index ba114af9aa6..c19eb90298e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContextScope.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContextScope.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PCA.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PCA.java index 158810bb029..781e1488fd7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PCA.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PCA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ParallelLoopBody.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ParallelLoopBody.java index d940d0b9dcf..9e192d9446a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ParallelLoopBody.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ParallelLoopBody.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ParallelLoopBodyLambdaWrapper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ParallelLoopBodyLambdaWrapper.java index f968fcc9739..e8307a04f8f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ParallelLoopBodyLambdaWrapper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ParallelLoopBodyLambdaWrapper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PlatformInfo.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PlatformInfo.java index b948cf882f3..b831a4590ac 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PlatformInfo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PlatformInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point.java index 7f74771685c..669f5160f59 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2d.java index 1e9fa298130..0f98b2b3e26 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2dVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2dVector.java index ecf7c8c4871..64913499f2e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2dVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2dVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2dVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2dVectorVector.java index 0e33906f79f..da59b73a81a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2dVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2dVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2f.java index 2df1f033bdb..2b2d16c1ec5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2fVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2fVector.java index 1dda7ba1ab5..0e1fd95db19 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2fVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2fVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2fVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2fVectorVector.java index a8b0eb8c30d..fa66e3d6115 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2fVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2fVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3d.java index c94cd5851cb..50aabecaa39 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3f.java index ede03e91581..585df044c32 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3fVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3fVector.java index 7677c6d4419..52939f1361c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3fVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3fVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3fVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3fVectorVector.java index 911c5175502..0a8a9d7b302 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3fVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3fVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3i.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3i.java index 1813d3aae45..b572bb4c85b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3i.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3i.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3iVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3iVector.java index 2c8efa5713f..3ed9be1b82b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3iVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3iVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PointVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PointVector.java index c7648ba0edd..fc7969ed365 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PointVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PointVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PointVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PointVectorVector.java index 5ef8c57eb95..4ab92edbc2d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PointVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PointVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Program.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Program.java index 0945cc4a105..6f4b23cf90c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Program.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Program.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ProgramSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ProgramSource.java index 0a15a5e4d03..e4be4deb726 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ProgramSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ProgramSource.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Queue.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Queue.java index 85794c8db9a..4329a39f817 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Queue.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Queue.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RNG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RNG.java index d7d5b781b54..9b9c863f4c2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RNG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RNG.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; @@ -77,7 +77,7 @@ public class RNG extends Pointer {

The methods transform the state using the MWC algorithm and return the next random number. The first form is equivalent to RNG::next . The - second form returns the random number modulo N , which means that the + second form returns the random number modulo N, which means that the result is in the range [0, N) . */ public native @Cast("unsigned") @Name("operator ()") int apply(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RNG_MT19937.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RNG_MT19937.java index 38e1c26e927..99ab937b3f0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RNG_MT19937.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RNG_MT19937.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Range.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Range.java index 5bff96ebe0d..377630a3861 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Range.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Range.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RangeVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RangeVector.java index 17df4b414b4..96845b7b80d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RangeVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RangeVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect.java index d1ef9899405..a109df3e979 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2d.java index 945e89ea5c5..5d5ef5d922d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2dVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2dVector.java index 2f24fa7c9b7..94e67b8ceb0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2dVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2dVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2f.java index 7b0205399b8..079cc2b2443 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RectVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RectVector.java index 0e9a58422b4..747d60fff35 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RectVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RectVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RectVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RectVectorVector.java index be9999bbc6a..88f0ce778d0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RectVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RectVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RotatedRect.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RotatedRect.java index 0474b517016..5e0d87f279c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RotatedRect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RotatedRect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SVD.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SVD.java index 410b871b784..3ad24f903aa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SVD.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SVD.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar.java index e2bb19fe0e5..21a9b3e54b6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4f.java index 4d3d3115e8a..bd47a4d82d6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4i.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4i.java index 6e6b1969ec9..1e94ffcc759 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4i.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4i.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ScalarVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ScalarVector.java index 232a3e2019e..323eb5ce21b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ScalarVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ScalarVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size.java index 455d1f28f8b..80cffde71e1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2d.java index 2bcba9f6d2c..9c20f104c3c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2f.java index ed3d29a1597..92fbcfac8cc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2f.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SizeVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SizeVector.java index cce37bf3124..287ba9c7f6c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SizeVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SizeVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMat.java index 4c515557312..602d7b4007a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatConstIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatConstIterator.java index 51d9872a3a5..0f7660a0adc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatConstIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatConstIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatIterator.java index 8dd4da2f858..64873381faa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Stream.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Stream.java index 433c29e7b6f..e7b5a1f6936 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Stream.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Stream.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/StringVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/StringVector.java index 180f597f5fa..06fa16c8484 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/StringVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/StringVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TLSDataContainer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TLSDataContainer.java index 8f5abe17ee7..b4c791f5056 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TLSDataContainer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TLSDataContainer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TargetArchs.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TargetArchs.java index b92612343d3..dfaa7542a4f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TargetArchs.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TargetArchs.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TermCriteria.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TermCriteria.java index c0b474200ad..70dd2a805bb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TermCriteria.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TermCriteria.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Texture2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Texture2D.java index ae1b94e945c..3e6c913d6f8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Texture2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Texture2D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TickMeter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TickMeter.java index f3e55024454..214f3ec50dc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TickMeter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TickMeter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Timer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Timer.java index 7f70d4ce01a..e287d732227 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Timer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Timer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TlsStorage.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TlsStorage.java index 92924577f72..d4e520476db 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TlsStorage.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TlsStorage.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMat.java index 361a7d63f70..3a2350b6790 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatBytePairVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatBytePairVector.java index 6eff7234055..1a65c7d6205 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatBytePairVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatBytePairVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatData.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatData.java index 996577d7a59..72368e0ea34 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatData.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatVector.java index 64064fb4685..345e959b23d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/UMatVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/WriteStructContext.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/WriteStructContext.java index ac17ccab65d..52a19a9afa3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/WriteStructContext.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/WriteStructContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/float16_t.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/hfloat.java similarity index 62% rename from opencv/src/gen/java/org/bytedeco/opencv/opencv_core/float16_t.java rename to opencv/src/gen/java/org/bytedeco/opencv/opencv_core/hfloat.java index 04e7355a802..4586674084f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/float16_t.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/hfloat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_core; @@ -12,27 +12,24 @@ import static org.bytedeco.opencv.global.opencv_core.*; +// #else // pure C // #endif // #ifdef __cplusplus @Namespace("cv") @NoOffset @Properties(inherit = org.bytedeco.opencv.presets.opencv_core.class) -public class float16_t extends Pointer { +public class hfloat extends Pointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public float16_t(Pointer p) { super(p); } + public hfloat(Pointer p) { super(p); } // #if CV_FP16_TYPE // #else - public float16_t() { super((Pointer)null); allocate(); } + public hfloat() { super((Pointer)null); allocate(); } private native void allocate(); - public float16_t(float x) { super((Pointer)null); allocate(x); } + public hfloat(float x) { super((Pointer)null); allocate(x); } private native void allocate(float x); public native @Name("operator float") float asFloat(); - - public static native @ByVal float16_t fromBits(@Cast("ushort") short b); - public static native @ByVal @Name("zero") float16_t _zero(); - public native @Cast("ushort") short bits(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/Convolution.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/Convolution.java index f1cecf4fa48..33a069dac57 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/Convolution.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/Convolution.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaarithm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/DFT.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/DFT.java index ba1eaa72c47..f5a6862b59e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/DFT.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/DFT.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaarithm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/LookUpTable.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/LookUpTable.java index 1c7de4d028a..736f8e3a513 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/LookUpTable.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/LookUpTable.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaarithm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG.java index a502fb8e465..ce20ab253a2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudabgsegm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG2.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG2.java index 844b7ccbb50..8ad6d091fb2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG2.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG2.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudabgsegm; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncodeQp.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncodeQp.java index 8f5d3509b2e..4337e073b57 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncodeQp.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncodeQp.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudacodec; @@ -41,9 +41,9 @@ public class EncodeQp extends Pointer { } /** Specifies QP value for P-frame. */ - public native @Cast("cv::uint32_t") int qpInterP(); public native EncodeQp qpInterP(int setter); + public native @Cast("uint32_t") int qpInterP(); public native EncodeQp qpInterP(int setter); /** Specifies QP value for B-frame. */ - public native @Cast("cv::uint32_t") int qpInterB(); public native EncodeQp qpInterB(int setter); + public native @Cast("uint32_t") int qpInterB(); public native EncodeQp qpInterB(int setter); /** Specifies QP value for Intra Frame. */ - public native @Cast("cv::uint32_t") int qpIntra(); public native EncodeQp qpIntra(int setter); + public native @Cast("uint32_t") int qpIntra(); public native EncodeQp qpIntra(int setter); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderCallback.java index 7d1530f8468..62534297a5a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudacodec; @@ -34,7 +34,7 @@ public class EncoderCallback extends Pointer {

@param vPacket The raw bitstream for one or more frames. */ - public native void onEncoded(@Cast("const std::vector >*") @ByRef ByteVectorVector vPacket); + public native void onEncoded(@Cast("const std::vector >*") @ByRef ByteVectorVector vPacket); /** \brief Callback function to that the encoding has finished. * */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderParams.java index bcc92bf9250..bc837749c73 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudacodec; @@ -51,7 +51,7 @@ public class EncoderParams extends Pointer { /** upper bound on bitrate for \ref ENC_PARAMS_RC_VBR and \ref ENC_PARAMS_RC_CONSTQP. */ public native int maxBitRate(); public native EncoderParams maxBitRate(int setter); /** value 0 - 51 where video quality decreases as targetQuality increases, used with \ref ENC_PARAMS_RC_VBR. */ - public native @Cast("cv::uint8_t") byte targetQuality(); public native EncoderParams targetQuality(byte setter); + public native @Cast("uint8_t") byte targetQuality(); public native EncoderParams targetQuality(byte setter); /** the number of pictures in one GOP, ensuring \ref idrPeriod >= \ref gopLength. */ public native int gopLength(); public native EncoderParams gopLength(int setter); /** IDR interval, ensuring \ref idrPeriod >= \ref gopLength. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/FormatInfo.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/FormatInfo.java index 2abcbf25a44..120664f18dc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/FormatInfo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/FormatInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudacodec; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/RawVideoSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/RawVideoSource.java index 33fe2490afc..e9bff91f31e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/RawVideoSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/RawVideoSource.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudacodec; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReader.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReader.java index 5a359003097..a3ed600923d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReader.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReader.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudacodec; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReaderInitParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReaderInitParams.java index 502062186bb..c13a1ca20d4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReaderInitParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReaderInitParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudacodec; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoWriter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoWriter.java index ec444173c23..9c82d1b7a5e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoWriter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoWriter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudacodec; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/DescriptorMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/DescriptorMatcher.java index 4ca7612cea0..3fe3e61b72e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/DescriptorMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/DescriptorMatcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudafeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/FastFeatureDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/FastFeatureDetector.java index 4b76cbb392c..79900786f35 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/FastFeatureDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/FastFeatureDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudafeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/Feature2DAsync.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/Feature2DAsync.java index dc905ea6b1d..5c33f768f80 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/Feature2DAsync.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/Feature2DAsync.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudafeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/ORB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/ORB.java index 36bbd92047f..7ced82dab46 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/ORB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/ORB.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudafeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafilters/Filter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafilters/Filter.java index 1ec79ea3e91..41c2eb91e0a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafilters/Filter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafilters/Filter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudafilters; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CannyEdgeDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CannyEdgeDetector.java index 9e657eb1338..e093e9733f0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CannyEdgeDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CannyEdgeDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaimgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornernessCriteria.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornernessCriteria.java index d04f7de8d2b..052fc422231 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornernessCriteria.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornernessCriteria.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaimgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornersDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornersDetector.java index 2199b663058..b24b5933339 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornersDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornersDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaimgproc; @@ -51,4 +51,7 @@ public class CornersDetector extends Algorithm { public native void detect(@ByVal UMat image, @ByVal UMat corners); public native void detect(@ByVal GpuMat image, @ByVal GpuMat corners, @ByVal(nullValue = "cv::InputArray(cv::noArray())") GpuMat mask, @ByRef(nullValue = "cv::cuda::Stream::Null()") Stream stream); public native void detect(@ByVal GpuMat image, @ByVal GpuMat corners); + + public native void setMaxCorners(int maxCorners); + public native void setMinDistance(double minDistance); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CudaCLAHE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CudaCLAHE.java index 7a682a42360..b406c370467 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CudaCLAHE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CudaCLAHE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaimgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughCirclesDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughCirclesDetector.java index 67319167fbf..fc27cde4b60 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughCirclesDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughCirclesDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaimgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughLinesDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughLinesDetector.java index dcfc1828e5a..005090c9efc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughLinesDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughLinesDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaimgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughSegmentDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughSegmentDetector.java index 6ad057e0044..f7a51f10e31 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughSegmentDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughSegmentDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaimgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/TemplateMatching.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/TemplateMatching.java index d3cf0b6abf4..da674d6cf7e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/TemplateMatching.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/TemplateMatching.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaimgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/CudaCascadeClassifier.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/CudaCascadeClassifier.java index e112eaa798f..70ebd86d337 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/CudaCascadeClassifier.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/CudaCascadeClassifier.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaobjdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/HOG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/HOG.java index 5dd6e4b4087..694ea2f3366 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/HOG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/HOG.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaobjdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/BroxOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/BroxOpticalFlow.java index 2e18259918e..08fed3782ed 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/BroxOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/BroxOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DenseOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DenseOpticalFlow.java index ffa62d70380..c264dd4e0ef 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DenseOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DenseOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DensePyrLKOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DensePyrLKOpticalFlow.java index a17f4bccba4..64da082f2e6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DensePyrLKOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DensePyrLKOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/FarnebackOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/FarnebackOpticalFlow.java index 19c4bff6628..f7f3f45078d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/FarnebackOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/FarnebackOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaHWOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaHWOpticalFlow.java index 9f9270fe229..909c3892a58 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaHWOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaHWOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_1_0.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_1_0.java index c45c03f0afc..61108fbb538 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_1_0.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_1_0.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_2_0.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_2_0.java index fea7b3ad62b..28d0490f9b3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_2_0.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_2_0.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/OpticalFlowDual_TVL1.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/OpticalFlowDual_TVL1.java index ea531249552..d0c46796c00 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/OpticalFlowDual_TVL1.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/OpticalFlowDual_TVL1.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparseOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparseOpticalFlow.java index 6a655c864dd..774ca316573 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparseOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparseOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparsePyrLKOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparsePyrLKOpticalFlow.java index 29a7b6108ef..d38f3146aee 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparsePyrLKOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparsePyrLKOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudaoptflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/DisparityBilateralFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/DisparityBilateralFilter.java index 57567b96e78..0c141633156 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/DisparityBilateralFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/DisparityBilateralFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudastereo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBM.java index 81995605b03..9492878d640 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBM.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudastereo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBeliefPropagation.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBeliefPropagation.java index 36e4a989da7..1fbf50d63ef 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBeliefPropagation.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBeliefPropagation.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudastereo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoConstantSpaceBP.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoConstantSpaceBP.java index 56f004a001a..7bfb808904f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoConstantSpaceBP.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoConstantSpaceBP.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudastereo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoSGM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoSGM.java index 2a190e7a6fd..df3f12ffd49 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoSGM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoSGM.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_cudastereo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AbsLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AbsLayer.java index aa7b2ac8684..708371c7db0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AbsLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AbsLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AccumLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AccumLayer.java index b3aceae1cac..61311acead6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AccumLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AccumLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AcosLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AcosLayer.java index fb1d3dda969..39995cb646b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AcosLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AcosLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AcoshLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AcoshLayer.java index c0b3b921030..9e043baf2a6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AcoshLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AcoshLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ActivationLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ActivationLayer.java index bed3f96ab2b..086b36e2c89 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ActivationLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ActivationLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; @@ -36,10 +36,10 @@ public native void forwardSlice(@Const IntBuffer src, @Const IntBuffer lut, IntB @Cast("size_t") long outPlaneSize, int cn0, int cn1); public native void forwardSlice(@Const int[] src, @Const int[] lut, int[] dst, int len, @Cast("size_t") long outPlaneSize, int cn0, int cn1); - public native void forwardSlice(@Cast("const cv::int8_t*") BytePointer src, @Cast("const cv::int8_t*") BytePointer lut, @Cast("cv::int8_t*") BytePointer dst, int len, + public native void forwardSlice(@Const BytePointer src, @Const BytePointer lut, BytePointer dst, int len, @Cast("size_t") long outPlaneSize, int cn0, int cn1); - public native void forwardSlice(@Cast("const cv::int8_t*") ByteBuffer src, @Cast("const cv::int8_t*") ByteBuffer lut, @Cast("cv::int8_t*") ByteBuffer dst, int len, + public native void forwardSlice(@Const ByteBuffer src, @Const ByteBuffer lut, ByteBuffer dst, int len, @Cast("size_t") long outPlaneSize, int cn0, int cn1); - public native void forwardSlice(@Cast("const cv::int8_t*") byte[] src, @Cast("const cv::int8_t*") byte[] lut, @Cast("cv::int8_t*") byte[] dst, int len, + public native void forwardSlice(@Const byte[] src, @Const byte[] lut, byte[] dst, int len, @Cast("size_t") long outPlaneSize, int cn0, int cn1); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ActivationLayerInt8.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ActivationLayerInt8.java index 1c40d592a4b..7a3bc51121a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ActivationLayerInt8.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ActivationLayerInt8.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ArgLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ArgLayer.java index 8e6bb0fe45f..55f254f08ff 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ArgLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ArgLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AsinLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AsinLayer.java index 914eaefa3c0..2e9d470e8a8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AsinLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AsinLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AsinhLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AsinhLayer.java index d5b618dbe57..58d407bbe12 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AsinhLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AsinhLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AtanLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AtanLayer.java index abeaa033dc7..2a1e6d1075c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AtanLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AtanLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AtanhLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AtanhLayer.java index 3902a65156d..29b92d46662 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AtanhLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AtanhLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AttentionLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AttentionLayer.java index 4269476d66e..b9d8e84f69f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AttentionLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AttentionLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BNLLLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BNLLLayer.java index bcd8a5d159a..4e12ac9ca60 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BNLLLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BNLLLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BackendNode.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BackendNode.java index 5a1fa5d30f9..b9cdb7715a3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BackendNode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BackendNode.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BackendWrapper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BackendWrapper.java index 15019e39ed7..07050179681 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BackendWrapper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BackendWrapper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BaseConvolutionLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BaseConvolutionLayer.java index cd725d872e4..f9e61fcf305 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BaseConvolutionLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BaseConvolutionLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BatchNormLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BatchNormLayer.java index 95e6693f73d..43dab1163a2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BatchNormLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BatchNormLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BatchNormLayerInt8.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BatchNormLayerInt8.java index 61d2d77c6cd..b78896104b6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BatchNormLayerInt8.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BatchNormLayerInt8.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BlankLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BlankLayer.java index ce06aa29c15..473303d9354 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BlankLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/BlankLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CeilLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CeilLayer.java index 12d694f0729..6f8f82eefe2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CeilLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CeilLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CeluLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CeluLayer.java index 6ea75dfd00f..f99294b3e66 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CeluLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CeluLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ChannelsPReLULayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ChannelsPReLULayer.java index df6ed0ff749..1ec6117c15f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ChannelsPReLULayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ChannelsPReLULayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ClassificationModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ClassificationModel.java index d79955fdf9f..2ed06fdbe40 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ClassificationModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ClassificationModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; @@ -38,7 +38,7 @@ public class ClassificationModel extends Model { return new ClassificationModel((Pointer)this).offsetAddress(i); } - public ClassificationModel() { super((Pointer)null); allocate(); } + @Deprecated public ClassificationModel() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CompareLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CompareLayer.java index 2b5bf0daae9..263912df086 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CompareLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CompareLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConcatLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConcatLayer.java index c1b9a06c1ff..13f6a025ed8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConcatLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConcatLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConstLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConstLayer.java index 62a9b346c33..936db978ee2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConstLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConstLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConvolutionLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConvolutionLayer.java index 6ed05455717..c97a3fcf432 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConvolutionLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConvolutionLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConvolutionLayerInt8.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConvolutionLayerInt8.java index 6900837a64a..ef9908e6949 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConvolutionLayerInt8.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConvolutionLayerInt8.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CorrelationLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CorrelationLayer.java index da19caf2708..fa131935336 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CorrelationLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CorrelationLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CosLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CosLayer.java index 8e8dff09b03..12e87d8e63d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CosLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CosLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CoshLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CoshLayer.java index 17b233b4f4c..ff00a8e64cb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CoshLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CoshLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CropAndResizeLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CropAndResizeLayer.java index 6cf90ae000f..44b66ed7bd9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CropAndResizeLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CropAndResizeLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CropLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CropLayer.java index 5d8617ffb64..762ec516b3d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CropLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CropLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CumSumLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CumSumLayer.java index 44efac4a5e7..20a44fbe5fa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CumSumLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CumSumLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DataAugmentationLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DataAugmentationLayer.java index e85e4b54af4..0a7b898a80a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DataAugmentationLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DataAugmentationLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DeconvolutionLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DeconvolutionLayer.java index a84af18532e..c22523d539e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DeconvolutionLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DeconvolutionLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DequantizeLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DequantizeLayer.java index 78373572d3b..9f83267eba1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DequantizeLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DequantizeLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionModel.java index 7f5df0a841a..7c03eec3d4c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; @@ -61,7 +61,7 @@ public class DetectionModel extends Model { public DetectionModel(@Const @ByRef Net network) { super((Pointer)null); allocate(network); } private native void allocate(@Const @ByRef Net network); - public DetectionModel() { super((Pointer)null); allocate(); } + @Deprecated public DetectionModel() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionOutputLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionOutputLayer.java index 5228e1a57f1..3bde3f1f023 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionOutputLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionOutputLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Dict.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Dict.java index 1ae161dea9f..8b3e58323ff 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Dict.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Dict.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DictValue.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DictValue.java index a84b43153e8..a202df5dce8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DictValue.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DictValue.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DnnNetAccessor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DnnNetAccessor.java index 2c1750cf935..4bea0fb9837 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DnnNetAccessor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DnnNetAccessor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ELULayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ELULayer.java index 509f74bfb55..d0c4d1f42ce 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ELULayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ELULayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EinsumLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EinsumLayer.java index 07d81ef23de..e359d877cba 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EinsumLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EinsumLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EltwiseLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EltwiseLayer.java index 742c1f9f8fa..76b8439fe35 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EltwiseLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EltwiseLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EltwiseLayerInt8.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EltwiseLayerInt8.java index 261ad191a54..5cae0b8a96d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EltwiseLayerInt8.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/EltwiseLayerInt8.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ErfLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ErfLayer.java index 531c0bc7147..2485d6c33d9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ErfLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ErfLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ExpLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ExpLayer.java index d2db8ee8978..2d97a94b899 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ExpLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ExpLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ExpandLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ExpandLayer.java index a654c75cab5..06df4ae629a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ExpandLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ExpandLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlattenLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlattenLayer.java index a4292d7be57..1834f592fc0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlattenLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlattenLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FloorLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FloorLayer.java index cb2056e4367..93ec975110b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FloorLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FloorLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlowWarpLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlowWarpLayer.java index 85e8166c2f9..c5dfb94679a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlowWarpLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlowWarpLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GRULayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GRULayer.java index 0baf2cf287f..5e04d1c8301 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GRULayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GRULayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GatherElementsLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GatherElementsLayer.java index c0d858a3250..2ae0ac8d3ac 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GatherElementsLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GatherElementsLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GatherLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GatherLayer.java index bdd4d440b99..7c07ba10c04 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GatherLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GatherLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GeluApproximationLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GeluApproximationLayer.java index 369c52008d0..a421b202396 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GeluApproximationLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GeluApproximationLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GeluLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GeluLayer.java index d6bba648cb0..8b72c9570b5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GeluLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GeluLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GemmLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GemmLayer.java index 73aecff6be0..a6c745b0bcf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GemmLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GemmLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GroupNormLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GroupNormLayer.java new file mode 100644 index 00000000000..ba203d80860 --- /dev/null +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/GroupNormLayer.java @@ -0,0 +1,39 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.opencv.opencv_dnn; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.opencv.opencv_core.*; +import static org.bytedeco.opencv.global.opencv_core.*; +import org.bytedeco.opencv.opencv_imgproc.*; +import static org.bytedeco.opencv.global.opencv_imgproc.*; + +import static org.bytedeco.opencv.global.opencv_dnn.*; + + + @Namespace("cv::dnn") @Properties(inherit = org.bytedeco.opencv.presets.opencv_dnn.class) +public class GroupNormLayer extends Layer { + static { Loader.load(); } + /** Default native constructor. */ + public GroupNormLayer() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public GroupNormLayer(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public GroupNormLayer(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public GroupNormLayer position(long position) { + return (GroupNormLayer)super.position(position); + } + @Override public GroupNormLayer getPointer(long i) { + return new GroupNormLayer((Pointer)this).offsetAddress(i); + } + + public static native @Ptr GroupNormLayer create(@Const @ByRef LayerParams params); + } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/HardSigmoidLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/HardSigmoidLayer.java index b4f8df62ff9..e98e52735fe 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/HardSigmoidLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/HardSigmoidLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/HardSwishLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/HardSwishLayer.java index b1e4e5ca97b..881636f2b7f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/HardSwishLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/HardSwishLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Image2BlobParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Image2BlobParams.java index 09ba44c6ebe..04f51bca250 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Image2BlobParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Image2BlobParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InnerProductLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InnerProductLayer.java index e044b7c8b1d..9a2e028b096 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InnerProductLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InnerProductLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InnerProductLayerInt8.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InnerProductLayerInt8.java index 8f9d7e33903..a72a6d7ae8a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InnerProductLayerInt8.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InnerProductLayerInt8.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InstanceNormLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InstanceNormLayer.java index 164da22e6c4..0d6bfe57396 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InstanceNormLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InstanceNormLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/IntFloatPair.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/IntFloatPair.java index 0c7f3653c25..3f510720067 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/IntFloatPair.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/IntFloatPair.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InterpLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InterpLayer.java index 80afc8d58a9..814009d191f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InterpLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/InterpLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/KeypointsModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/KeypointsModel.java index 04bc2c3b3a7..74e04ab5205 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/KeypointsModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/KeypointsModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LRNLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LRNLayer.java index 45d5c7c5854..362986ff127 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LRNLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LRNLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LSTMLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LSTMLayer.java index 1f6bcf790f7..6583f34a650 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LSTMLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LSTMLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java index b2775f2571c..6d0fa0baa01 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; @@ -19,7 +19,7 @@ /** \brief This interface class allows to build new Layers - are building blocks of networks. * - * Each class, derived from Layer, must implement allocate() methods to declare own outputs and forward() to compute outputs. + * Each class, derived from Layer, must implement forward() method to compute outputs. * Also before using the new layer into networks you must register your layer by using one of \ref dnnLayerFactory "LayerFactory" macros. */ @Namespace("cv::dnn") @NoOffset @Properties(inherit = org.bytedeco.opencv.presets.opencv_dnn.class) @@ -51,7 +51,7 @@ public class Layer extends Algorithm { * @param input [in] vector of already allocated input blobs * @param output [out] vector of already allocated output blobs * - * If this method is called after network has allocated all memory for input and output blobs + * This method is called after network has allocated all memory for input and output blobs * and before inferencing. */ public native @Deprecated void finalize(@Const @ByRef MatPointerVector input, @ByRef MatVector output); @@ -60,7 +60,7 @@ public class Layer extends Algorithm { * @param inputs [in] vector of already allocated input blobs * @param outputs [out] vector of already allocated output blobs * - * If this method is called after network has allocated all memory for input and output blobs + * This method is called after network has allocated all memory for input and output blobs * and before inferencing. */ public native void finalize(@ByVal MatVector inputs, @ByVal MatVector outputs); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerFactory.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerFactory.java index c1501e36644..4e72d4909b8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerFactory.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerFactory.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerNormLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerNormLayer.java index e0137bbc80b..9d62acf4d05 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerNormLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerNormLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerParams.java index 272bc9441af..3246aa6477f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LogLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LogLayer.java index d4449702b1e..bdef099aed2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LogLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LogLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MVNLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MVNLayer.java index 841530e44e8..8480eed6ba8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MVNLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MVNLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatMulLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatMulLayer.java index f74577d8aec..f9cde9ac37d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatMulLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatMulLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatPointerVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatPointerVector.java index 09eac67fdda..ec9eca11c5f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatPointerVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatPointerVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatShapeVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatShapeVector.java index 0f65ca3915a..47cfc38c5dd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatShapeVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatShapeVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatShapeVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatShapeVectorVector.java index adbf310ac57..9a1e2e786a5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatShapeVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MatShapeVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MaxUnpoolLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MaxUnpoolLayer.java index 651e32c33f8..34cc67ed1d5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MaxUnpoolLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MaxUnpoolLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MishLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MishLayer.java index 174aa8d5254..37bf5e48a42 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MishLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/MishLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Model.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Model.java index be7795b3f93..8a8102ee1bf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Model.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Model.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; @@ -39,7 +39,7 @@ public class Model extends Pointer { return new Model((Pointer)this).offsetAddress(i); } - public Model() { super((Pointer)null); allocate(); } + @Deprecated public Model() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); public Model(@Const @ByRef Model arg0) { super((Pointer)null); allocate(arg0); } @@ -100,6 +100,11 @@ public class Model extends Pointer { */ public native @ByRef Model setInputSwapRB(@Cast("bool") boolean swapRB); + /** \brief Set output names for frame. + * @param outNames [in] Names for output layers. + */ + public native @ByRef Model setOutputNames(@Const @ByRef StringVector outNames); + /** \brief Set preprocessing parameters for frame. * @param size [in] New input size. * @param mean [in] Scalar with mean values which are subtracted from channels. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NaryEltwiseLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NaryEltwiseLayer.java index c0b7c828aee..7bba8383b51 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NaryEltwiseLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NaryEltwiseLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Net.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Net.java index e6c3e73908d..883867c19b5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Net.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Net.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; @@ -92,6 +92,15 @@ public class Net extends Pointer { */ public native void dumpToFile(@Str BytePointer path); public native void dumpToFile(@Str String path); + /** \brief Dump net structure, hyperparameters, backend, target and fusion to pbtxt file + * @param path path to output file with .pbtxt extension + * + * Use Netron (https://netron.app) to open the target file to visualize the model. + * Call method after setInput(). To see correct backend, target and fusion run after forward(). + */ + public native void dumpToPbtxt(@Str BytePointer path); + public native void dumpToPbtxt(@Str String path); + /** \brief Adds new layer to the net. * @param name unique name of the adding layer. * @param type typename of the adding layer (type must be registered in LayerRegister). diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NormalizeBBoxLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NormalizeBBoxLayer.java index 374a15de7ca..8a3725c9587 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NormalizeBBoxLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NormalizeBBoxLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NotLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NotLayer.java index d454dec9be1..5e0c62e59e9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NotLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/NotLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PaddingLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PaddingLayer.java index aad4102fbe6..26af8937e18 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PaddingLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PaddingLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PermuteLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PermuteLayer.java index fa43da781ee..f3a899f600c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PermuteLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PermuteLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PoolingLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PoolingLayer.java index c3a7d9a3e15..017798dd585 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PoolingLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PoolingLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PoolingLayerInt8.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PoolingLayerInt8.java index 00d03d26c98..be2192b979d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PoolingLayerInt8.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PoolingLayerInt8.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PowerLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PowerLayer.java index beb22dd5a2a..eb193217dec 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PowerLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PowerLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PriorBoxLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PriorBoxLayer.java index 4b0f25f4634..87b25e27bf4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PriorBoxLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/PriorBoxLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ProposalLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ProposalLayer.java index b0cff66c610..9fc710a60f9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ProposalLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ProposalLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/QuantizeLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/QuantizeLayer.java index 8dc5d85b68a..d0f41ac8dab 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/QuantizeLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/QuantizeLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RNNLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RNNLayer.java index fac5ac09ccf..5d0808bd7a9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RNNLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RNNLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RangeVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RangeVectorVector.java index e2254d6e3a2..82fc6f87e5e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RangeVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RangeVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReLU6Layer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReLU6Layer.java index 7c2e06a3925..f0fee4833ed 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReLU6Layer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReLU6Layer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReLULayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReLULayer.java index cd3ec01246e..843d80e68c1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReLULayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReLULayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReciprocalLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReciprocalLayer.java index 5c77c234a04..70f06b56b9f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReciprocalLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReciprocalLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReduceLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReduceLayer.java index cd66b4bf53d..69b44600145 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReduceLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReduceLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RegionLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RegionLayer.java index 7384f03f390..5ecd14ee804 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RegionLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RegionLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReorgLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReorgLayer.java index 9b47e6c7a46..8f4db7731fb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReorgLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReorgLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RequantizeLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RequantizeLayer.java index 949438844c4..948f8ea814b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RequantizeLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RequantizeLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReshapeLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReshapeLayer.java index 8caf12649fb..83165835f5d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReshapeLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ReshapeLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ResizeLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ResizeLayer.java index b14fd05a379..2527f6de17e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ResizeLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ResizeLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RoundLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RoundLayer.java index 3d8af83c7d4..f3b73d8ce9a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RoundLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/RoundLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScaleLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScaleLayer.java index 20284a40afe..9df85f0010a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScaleLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScaleLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScaleLayerInt8.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScaleLayerInt8.java index 8091aef4519..955901158e9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScaleLayerInt8.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScaleLayerInt8.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScatterLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScatterLayer.java index e801c485fb6..54bbfde74bc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScatterLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScatterLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScatterNDLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScatterNDLayer.java index cfacf3521a0..e3ed2f971b5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScatterNDLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ScatterNDLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SegmentationModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SegmentationModel.java index cf69bceed7c..cd88a96e758 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SegmentationModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SegmentationModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SeluLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SeluLayer.java index d1e5a6b7def..4b6f5af3ca3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SeluLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SeluLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShiftLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShiftLayer.java index c423455c44b..bfed9eea5ba 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShiftLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShiftLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShiftLayerInt8.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShiftLayerInt8.java index d375f10a2be..97210dbac67 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShiftLayerInt8.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShiftLayerInt8.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShrinkLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShrinkLayer.java index 1faf540c985..97ddb2f1231 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShrinkLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShrinkLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShuffleChannelLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShuffleChannelLayer.java index 01fa8b68edb..eb4e5256345 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShuffleChannelLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ShuffleChannelLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SigmoidLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SigmoidLayer.java index 33b826a765f..312d1898610 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SigmoidLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SigmoidLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SignLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SignLayer.java index 1d0bce871fd..88bcd08a05a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SignLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SignLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SinLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SinLayer.java index 9998f380c6b..680ae4578ee 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SinLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SinLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SinhLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SinhLayer.java index b9606d46005..d69237ef0df 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SinhLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SinhLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SliceLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SliceLayer.java index 7546a7ba1b8..d2301caa259 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SliceLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SliceLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftmaxLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftmaxLayer.java index 5f544a3e4cb..bd290b543c6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftmaxLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftmaxLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftmaxLayerInt8.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftmaxLayerInt8.java index 0a924c5c37b..964b5a4c38a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftmaxLayerInt8.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftmaxLayerInt8.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftplusLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftplusLayer.java index aa3faf3dae5..48cb90bf56e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftplusLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftplusLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftsignLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftsignLayer.java index c6601cc47dc..7add922692a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftsignLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SoftsignLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SplitLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SplitLayer.java index 5a88b819a52..3c12577215e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SplitLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SplitLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SqrtLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SqrtLayer.java index 0a25d5a2704..ab02764498b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SqrtLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SqrtLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SwishLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SwishLayer.java index 53883f24442..731eca5513f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SwishLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/SwishLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TanHLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TanHLayer.java index 7946968432d..09f716e630f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TanHLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TanHLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TanLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TanLayer.java index f03e64aea04..ab059caba22 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TanLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TanLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel.java index c7335b3a136..1179b1a44c2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_DB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_DB.java index 5b152efa49e..74fbc648fb0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_DB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_DB.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; @@ -44,7 +44,7 @@ public class TextDetectionModel_DB extends TextDetectionModel { return new TextDetectionModel_DB((Pointer)this).offsetAddress(i); } - public TextDetectionModel_DB() { super((Pointer)null); allocate(); } + @Deprecated public TextDetectionModel_DB() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_EAST.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_EAST.java index 0b29feaf08a..f7b9d1c613a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_EAST.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_EAST.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; @@ -38,7 +38,7 @@ public class TextDetectionModel_EAST extends TextDetectionModel { return new TextDetectionModel_EAST((Pointer)this).offsetAddress(i); } - public TextDetectionModel_EAST() { super((Pointer)null); allocate(); } + @Deprecated public TextDetectionModel_EAST() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextRecognitionModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextRecognitionModel.java index 98e0257befd..bccf3270ece 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextRecognitionModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextRecognitionModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; @@ -40,7 +40,7 @@ public class TextRecognitionModel extends Model { return new TextRecognitionModel((Pointer)this).offsetAddress(i); } - public TextRecognitionModel() { super((Pointer)null); allocate(); } + @Deprecated public TextRecognitionModel() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ThresholdedReluLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ThresholdedReluLayer.java index 5cde8fc4984..983ceb81d6f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ThresholdedReluLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ThresholdedReluLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TileLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TileLayer.java index 0912c122ba5..0e90abd5cb6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TileLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TileLayer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/_Range.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/_Range.java index 86fb261cd96..ee2ae11f0cb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/_Range.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/_Range.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn_superres/DnnSuperResImpl.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn_superres/DnnSuperResImpl.java index 2d77e1af8c1..9db5add5b89 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn_superres/DnnSuperResImpl.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn_superres/DnnSuperResImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_dnn_superres; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/BasicFaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/BasicFaceRecognizer.java index 74f12201162..342e241aacc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/BasicFaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/BasicFaceRecognizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/CParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/CParams.java index 2cd6c9e8e76..026925d6bfb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/CParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/CParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/EigenFaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/EigenFaceRecognizer.java index b425ccca441..c5c41e9c4f2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/EigenFaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/EigenFaceRecognizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FaceRecognizer.java index 18edce7c712..eab54f52ebf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FaceRecognizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/Facemark.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/Facemark.java index 9e9b4f6ad00..0b043545615 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/Facemark.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/Facemark.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; @@ -34,7 +34,9 @@ import static org.bytedeco.opencv.global.opencv_face.*; - +/** \addtogroup face + * \{ +

/** \brief Abstract base class for all facemark models

To utilize this API in your program, please take a look at the \ref tutorial_table_of_content_facemark diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkAAM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkAAM.java index bfd69966308..f9affd26996 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkAAM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkAAM.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkKazemi.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkKazemi.java index 565b492da81..873e516578b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkKazemi.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkKazemi.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkLBF.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkLBF.java index 1b22b43e869..479f339490c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkLBF.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkLBF.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkTrain.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkTrain.java index 4c7b3d51544..7073361fd23 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkTrain.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkTrain.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FisherFaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FisherFaceRecognizer.java index bf44f6c4348..89b3b8f1650 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FisherFaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FisherFaceRecognizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/LBPHFaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/LBPHFaceRecognizer.java index 8019d9c28da..ff336b1b0b6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/LBPHFaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/LBPHFaceRecognizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/PredictCollector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/PredictCollector.java index ba32c4e5762..eeb2534b7f7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/PredictCollector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/PredictCollector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/StandardCollector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/StandardCollector.java index 22cee859556..96282ab62fd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/StandardCollector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/StandardCollector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_face; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AKAZE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AKAZE.java index 5c7ea217f08..abf4a465ba0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AKAZE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AKAZE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AffineFeature.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AffineFeature.java index 6f90243ee59..f599e28be18 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AffineFeature.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AffineFeature.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AgastFeatureDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AgastFeatureDetector.java index 3dc586646f3..16a06dabe2b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AgastFeatureDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AgastFeatureDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; @@ -24,11 +24,7 @@ import static org.bytedeco.opencv.global.opencv_features2d.*; -/** \} features2d_main -

- * \addtogroup features2d_main - * \{ -

+ /** \brief Wrapping class for feature detection using the AGAST method. : */ @Namespace("cv") @Properties(inherit = org.bytedeco.opencv.presets.opencv_features2d.class) diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java index 27120dc052b..f4192131902 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWImgDescriptorExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWImgDescriptorExtractor.java index ff3d84e62b2..8bae06e17d3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWImgDescriptorExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWImgDescriptorExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWKMeansTrainer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWKMeansTrainer.java index f563d3b7bfa..776fe096a47 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWKMeansTrainer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWKMeansTrainer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWTrainer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWTrainer.java index c4954b3289c..1e323f1f345 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWTrainer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BOWTrainer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; @@ -24,6 +24,8 @@ import static org.bytedeco.opencv.global.opencv_features2d.*; +/** \} +

/****************************************************************************************\ * Bag of visual words * \****************************************************************************************/ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java index b98525944c4..66e67112342 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/DescriptorMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/DescriptorMatcher.java index efe0dbe274b..ec07fc69f76 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/DescriptorMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/DescriptorMatcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; @@ -24,6 +24,8 @@ import static org.bytedeco.opencv.global.opencv_features2d.*; +/** \} features2d_main +

/****************************************************************************************\ * DescriptorMatcher * \****************************************************************************************/ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FastFeatureDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FastFeatureDetector.java index 785c1fb4d86..c18229ed696 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FastFeatureDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FastFeatureDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; @@ -24,11 +24,7 @@ import static org.bytedeco.opencv.global.opencv_features2d.*; -/** \} features2d_main -

- * \addtogroup features2d_main - * \{ -

+ /** \brief Wrapping class for feature detection using the FAST method. : */ @Namespace("cv") @Properties(inherit = org.bytedeco.opencv.presets.opencv_features2d.class) diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java index 3f7bf099e7e..c08a19dcb6a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java index c70eec747fb..c0c9978b840 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/GFTTDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/GFTTDetector.java index 270599ea88a..bf9992aa654 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/GFTTDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/GFTTDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KAZE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KAZE.java index 676f662bcad..9ff718859ab 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KAZE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KAZE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; @@ -24,11 +24,7 @@ import static org.bytedeco.opencv.global.opencv_features2d.*; -/** \} features2d_main -

- * \addtogroup features2d_main - * \{ -

+ /** \brief Class implementing the KAZE keypoint detector and descriptor extractor, described in \cite ABD12 .

\note AKAZE descriptor can only be used with KAZE or AKAZE keypoints .. [ABD12] KAZE Features. Pablo diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KeyPointsFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KeyPointsFilter.java index 6514e373123..6f8193c4561 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KeyPointsFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KeyPointsFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/MSER.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/MSER.java index b5ab0c95c12..3583342d718 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/MSER.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/MSER.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/ORB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/ORB.java index 3bc07aa200f..e0129688134 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/ORB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/ORB.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java index 4ecf3a2bcc0..6f5ac8887b6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java index 77eb296f978..1428a2fe115 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_features2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/AutotunedIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/AutotunedIndexParams.java index 16f185a6ade..fd8fedf99de 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/AutotunedIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/AutotunedIndexParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/CompositeIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/CompositeIndexParams.java index 85b20ca5df7..46d7e8d7bff 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/CompositeIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/CompositeIndexParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/HierarchicalClusteringIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/HierarchicalClusteringIndexParams.java index be6f98af78d..61da5ebc360 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/HierarchicalClusteringIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/HierarchicalClusteringIndexParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/Index.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/Index.java index 9de99893278..44ec6e20448 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/Index.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/Index.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/IndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/IndexParams.java index 119e3380b07..d263ce253a4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/IndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/IndexParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KDTreeIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KDTreeIndexParams.java index 408658c4d55..a04d63da858 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KDTreeIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KDTreeIndexParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KMeansIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KMeansIndexParams.java index e1f0bddb1b9..5cd1a4f38ea 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KMeansIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KMeansIndexParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LinearIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LinearIndexParams.java index b10bb25d5f2..9a601b71b87 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LinearIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LinearIndexParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LshIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LshIndexParams.java index 9350bb9203e..5a39ecf463e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LshIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LshIndexParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SavedIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SavedIndexParams.java index 0b88bdb93ef..b618b627566 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SavedIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SavedIndexParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SearchParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SearchParams.java index 140b2e18b4f..6cf97e698c8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SearchParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SearchParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_flann; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/ButtonCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/ButtonCallback.java index 4c5f98c8864..5d468205c3a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/ButtonCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/ButtonCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvButtonCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvButtonCallback.java index d24ea2c6d3e..c70f0e20ec3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvButtonCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvButtonCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvMouseCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvMouseCallback.java index e203d7bdb39..8657ff91d73 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvMouseCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvMouseCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvOpenGlDrawCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvOpenGlDrawCallback.java index dd48a7a034b..26245a8759a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvOpenGlDrawCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvOpenGlDrawCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvTrackbarCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvTrackbarCallback.java index 0df7939ac70..d967c90d326 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvTrackbarCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvTrackbarCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvTrackbarCallback2.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvTrackbarCallback2.java index 1211e188d0c..35272ac1ba2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvTrackbarCallback2.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/CvTrackbarCallback2.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/MouseCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/MouseCallback.java index 7729e9454a1..070afad02a3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/MouseCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/MouseCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/OpenGlDrawCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/OpenGlDrawCallback.java index 0b8b403a7c3..30f79133a27 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/OpenGlDrawCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/OpenGlDrawCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_ByteBuffer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_ByteBuffer.java index 48bacaf9e12..db61a25e88b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_ByteBuffer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_ByteBuffer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_BytePointer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_BytePointer.java index f6905aad8c6..e7c467009f5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_BytePointer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_BytePointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_PointerPointer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_PointerPointer.java index efaa7e21f92..065281e1bcc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_PointerPointer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_PointerPointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_byte__.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_byte__.java index 4de03258d98..c2e91aa1825 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_byte__.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/Pt2Func_int_byte__.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/QtFont.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/QtFont.java index 875bc4086d0..deea5966693 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/QtFont.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/QtFont.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/TrackbarCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/TrackbarCallback.java index ecf9f95ce68..a061d43998d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/TrackbarCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/TrackbarCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_highgui; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/AverageHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/AverageHash.java index be347f44eeb..cb20ada9ce1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/AverageHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/AverageHash.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_img_hash; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/BlockMeanHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/BlockMeanHash.java index 28779c5f7ac..dcef4c19ebf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/BlockMeanHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/BlockMeanHash.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_img_hash; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ColorMomentHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ColorMomentHash.java index a22934124c6..368b9898d72 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ColorMomentHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ColorMomentHash.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_img_hash; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ImgHashBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ImgHashBase.java index 0c965b37c62..238026ab9ef 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ImgHashBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ImgHashBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_img_hash; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/MarrHildrethHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/MarrHildrethHash.java index 45f7c9ffb31..6664f93c131 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/MarrHildrethHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/MarrHildrethHash.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_img_hash; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/PHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/PHash.java index 9a60106b3ef..6c9be4e4da0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/PHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/PHash.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_img_hash; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/RadialVarianceHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/RadialVarianceHash.java index 282bfe0797a..cb61aeb65b6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/RadialVarianceHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/RadialVarianceHash.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_img_hash; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CLAHE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CLAHE.java index ffca2a7d028..fbed3751e88 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CLAHE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CLAHE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvChainPtReader.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvChainPtReader.java index 08dfcf87e7c..0d0f9c80133 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvChainPtReader.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvChainPtReader.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConnectedComp.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConnectedComp.java index a5e38ef3ed2..8d828fba556 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConnectedComp.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConnectedComp.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvContourScanner.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvContourScanner.java index a16184d39d3..a1350fa9b54 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvContourScanner.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvContourScanner.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConvexityDefect.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConvexityDefect.java index 5428b323547..3344d3c5570 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConvexityDefect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConvexityDefect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvDistanceFunction.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvDistanceFunction.java index 1de71adb5d0..bd4c0b1694d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvDistanceFunction.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvDistanceFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFeatureTree.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFeatureTree.java index 9743d391abc..85a951a6bb2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFeatureTree.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFeatureTree.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFont.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFont.java index d56abbc57c7..8d904195641 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFont.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFont.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvHuMoments.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvHuMoments.java index 4f94985bf90..114b8234e3d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvHuMoments.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvHuMoments.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvLSH.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvLSH.java index 4ec914188d6..59b3216fa73 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvLSH.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvLSH.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvLSHOperations.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvLSHOperations.java index 5f8d3cd814c..d9576ec2ee8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvLSHOperations.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvLSHOperations.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvMoments.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvMoments.java index 8747f2bba10..a82b745c2d9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvMoments.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvMoments.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHough.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHough.java index ce17a26f44f..26ec20b2cff 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHough.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHough.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughBallard.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughBallard.java index 8c9baabd9c8..c92097d4e05 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughBallard.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughBallard.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughGuil.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughGuil.java index ca0055a415d..4f116619caa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughGuil.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughGuil.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineIterator.java index 9ab9bb53c2c..e403e7dd341 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineSegmentDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineSegmentDetector.java index 18f472bfa42..47a8b3b2acc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineSegmentDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineSegmentDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Subdiv2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Subdiv2D.java index fc8a4fd312c..1e8d37d8bf9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Subdiv2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Subdiv2D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec2fVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec2fVector.java index 90ac8104259..61da8374fbd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec2fVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec2fVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec3fVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec3fVector.java index e3d2a90e3d5..df67cc712f9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec3fVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec3fVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec4fVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec4fVector.java index 61ca19fa7ca..d3e109e292a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec4fVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec4fVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec4iVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec4iVector.java index d00751977da..b05381eb928 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec4iVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec4iVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec6fVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec6fVector.java index 19904e51b98..1f5f6389641 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec6fVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Vec6fVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_imgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CChecker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CChecker.java index b8eb4fb8404..f90b4740705 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CChecker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CChecker.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_mcc; @@ -68,6 +68,15 @@ public class CChecker extends Pointer { public native @Cast("cv::mcc::TYPECHART") int getTarget(); public native @ByVal Point2fVector getBox(); + + /** \brief Computes and returns the coordinates of the central parts of the charts modules. + * + * This method computes transformation matrix from the checkers's coordinates ({@code cv::mcc::CChecker::getBox()}) + * and find by this the coordinates of the central parts of the charts modules. + * It is used in {@code cv::mcc::CCheckerDraw::draw()} and in {@code ChartsRGB} calculation. + */ + public native @ByVal Point2fVector getColorCharts(); + public native @ByVal Mat getChartsRGB(); public native @ByVal Mat getChartsYCbCr(); public native float getCost(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDetector.java index 559dd3173db..793c211af8c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_mcc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDraw.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDraw.java index 17308b9dc72..45803b89920 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDraw.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDraw.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_mcc; @@ -53,7 +53,6 @@ public class CCheckerDraw extends Pointer { /** \brief Draws the checker to the given image. * @param img image in color space BGR - * @return void */ public native void draw(@ByVal Mat img); public native void draw(@ByVal UMat img); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerVector.java index b4587840a9e..d4d419de1e8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_mcc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/ColorCorrectionModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/ColorCorrectionModel.java index 13ef0e6f64c..88b8904a288 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/ColorCorrectionModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/ColorCorrectionModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_mcc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/DetectorParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/DetectorParameters.java index c25a39b7c67..998e5801682 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/DetectorParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/DetectorParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_mcc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ANN_MLP.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ANN_MLP.java index c065c81a931..15ca986235d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ANN_MLP.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ANN_MLP.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/Boost.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/Boost.java index 51b3146162e..103f137cd26 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/Boost.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/Boost.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java index 7faa1a740f6..7ed4cd2517a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/EM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/EM.java index 700d13bbe98..39ead00c2c1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/EM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/EM.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/KNearest.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/KNearest.java index 868c9164265..403593310cc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/KNearest.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/KNearest.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/LogisticRegression.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/LogisticRegression.java index 9d59ee439d5..e177c69f4fc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/LogisticRegression.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/LogisticRegression.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/NormalBayesClassifier.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/NormalBayesClassifier.java index 291c3a7b35a..59d5aeb0b51 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/NormalBayesClassifier.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/NormalBayesClassifier.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ParamGrid.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ParamGrid.java index e9622b7ec8e..9e2939a75ff 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ParamGrid.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ParamGrid.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/RTrees.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/RTrees.java index 6c4ac3e0ba8..006b1c9383a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/RTrees.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/RTrees.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVM.java index 6b4a5548ede..066cae3e1fa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVM.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVMSGD.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVMSGD.java index 774099d3b0a..30773986786 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVMSGD.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVMSGD.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/StatModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/StatModel.java index a0adc80f0f8..6e5be8bbae5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/StatModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/StatModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/TrainData.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/TrainData.java index 180c6c56876..c8d401ab992 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/TrainData.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/TrainData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ml; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/ArucoDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/ArucoDetector.java index 0aa47e27d4b..cb0f9f86b55 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/ArucoDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/ArucoDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BarcodeDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BarcodeDetector.java index 610ebde2ba6..97637400c25 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BarcodeDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BarcodeDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; @@ -115,4 +115,54 @@ public class BarcodeDetector extends GraphicalCodeDetector { public native @Cast("bool") boolean detectAndDecodeWithType(@ByVal GpuMat img, @ByRef StringVector decoded_info, @ByRef StringVector decoded_type); + + /** \brief Get detector downsampling threshold. + * + * @return detector downsampling threshold + */ + public native double getDownsamplingThreshold(); + + /** \brief Set detector downsampling threshold. + * + * By default, the detect method resizes the input image to this limit if the smallest image size is is greater than the threshold. + * Increasing this value can improve detection accuracy and the number of results at the expense of performance. + * Correlates with detector scales. Setting this to a large value will disable downsampling. + * @param thresh downsampling limit to apply (default 512) + * @see setDetectorScales + */ + public native @ByRef BarcodeDetector setDownsamplingThreshold(double thresh); + + /** \brief Returns detector box filter sizes. + * + * @param sizes output parameter for returning the sizes. + */ + public native void getDetectorScales(@StdVector FloatPointer sizes); + public native void getDetectorScales(@StdVector FloatBuffer sizes); + public native void getDetectorScales(@StdVector float[] sizes); + + /** \brief Set detector box filter sizes. + * + * Adjusts the value and the number of box filters used in the detect step. + * The filter sizes directly correlate with the expected line widths for a barcode. Corresponds to expected barcode distance. + * If the downsampling limit is increased, filter sizes need to be adjusted in an inversely proportional way. + * @param sizes box filter sizes, relative to minimum dimension of the image (default [0.01, 0.03, 0.06, 0.08]) + */ + public native @ByRef BarcodeDetector setDetectorScales(@StdVector FloatPointer sizes); + public native @ByRef BarcodeDetector setDetectorScales(@StdVector FloatBuffer sizes); + public native @ByRef BarcodeDetector setDetectorScales(@StdVector float[] sizes); + + /** \brief Get detector gradient magnitude threshold. + * + * @return detector gradient magnitude threshold. + */ + public native double getGradientThreshold(); + + /** \brief Set detector gradient magnitude threshold. + * + * Sets the coherence threshold for detected bounding boxes. + * Increasing this value will generate a closer fitted bounding box width and can reduce false-positives. + * Values between 16 and 1024 generally work, while too high of a value will remove valid detections. + * @param thresh gradient magnitude threshold (default 64). + */ + public native @ByRef BarcodeDetector setGradientThreshold(double thresh); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BaseCascadeClassifier.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BaseCascadeClassifier.java index 1e590711ba9..b97c9fcdab3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BaseCascadeClassifier.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BaseCascadeClassifier.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/Board.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/Board.java index c331e78852e..14a01a495d8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/Board.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/Board.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; @@ -158,7 +158,7 @@ public native void matchImagePoints(@ByVal GpuMatVector detectedCorners, @ByVal public native void generateImage(@ByVal Size outSize, @ByVal GpuMat img, int marginSize/*=0*/, int borderBits/*=1*/); public native void generateImage(@ByVal Size outSize, @ByVal GpuMat img); - public Board() { super((Pointer)null); allocate(); } + @Deprecated public Board() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); @Opaque public static class Impl extends Pointer { diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CascadeClassifier.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CascadeClassifier.java index 45e14219054..3046763feaf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CascadeClassifier.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CascadeClassifier.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoBoard.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoBoard.java index 081cae95ded..7ec7c6d6d35 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoBoard.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoBoard.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; @@ -120,6 +120,6 @@ private native void allocate(@Const @ByRef Size size, float squareLength, float public native @Cast("bool") boolean checkCharucoCornersCollinear(@ByVal UMat charucoIds); public native @Cast("bool") boolean checkCharucoCornersCollinear(@ByVal GpuMat charucoIds); - public CharucoBoard() { super((Pointer)null); allocate(); } + @Deprecated public CharucoBoard() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoDetector.java index 9f30e4d03f3..a975d410078 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; @@ -92,6 +92,9 @@ private native void allocate(@Const @ByRef CharucoBoard board, * If camera parameters are provided, the process is based in an approximated pose estimation, else it is based on local homography. * Only visible corners are returned. For each corner, its corresponding identifier is also returned in charucoIds. * @see findChessboardCorners + * \note After OpenCV 4.6.0, there was an incompatible change in the ChArUco pattern generation algorithm for even row counts. + * Use cv::aruco::CharucoBoard::setLegacyPattern() to ensure compatibility with patterns created using OpenCV versions prior to 4.6.0. + * For more information, see the issue: https://github.com/opencv/opencv/issues/23152 */ public native void detectBoard(@ByVal Mat image, @ByVal Mat charucoCorners, @ByVal Mat charucoIds, @ByVal(nullValue = "cv::InputOutputArrayOfArrays(cv::noArray())") MatVector markerCorners, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoParameters.java index e2c4d27a3fd..03e131693e9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CvHaarClassifierCascade.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CvHaarClassifierCascade.java index 5e19c25190b..577f21e45d9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CvHaarClassifierCascade.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CvHaarClassifierCascade.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; @@ -35,60 +35,62 @@

\{ \defgroup objdetect_cascade_classifier Cascade Classifier for Object Detection -

-The object detector described below has been initially proposed by Paul Viola \cite Viola01 and -improved by Rainer Lienhart \cite Lienhart02 . -

-First, a classifier (namely a *cascade of boosted classifiers working with haar-like features*) is -trained with a few hundred sample views of a particular object (i.e., a face or a car), called -positive examples, that are scaled to the same size (say, 20x20), and negative examples - arbitrary -images of the same size. -

-After a classifier is trained, it can be applied to a region of interest (of the same size as used -during the training) in an input image. The classifier outputs a "1" if the region is likely to show -the object (i.e., face/car), and "0" otherwise. To search for the object in the whole image one can -move the search window across the image and check every location using the classifier. The -classifier is designed so that it can be easily "resized" in order to be able to find the objects of -interest at different sizes, which is more efficient than resizing the image itself. So, to find an -object of an unknown size in the image the scan procedure should be done several times at different -scales. -

-The word "cascade" in the classifier name means that the resultant classifier consists of several -simpler classifiers (*stages*) that are applied subsequently to a region of interest until at some -stage the candidate is rejected or all the stages are passed. The word "boosted" means that the -classifiers at every stage of the cascade are complex themselves and they are built out of basic -classifiers using one of four different boosting techniques (weighted voting). Currently Discrete -Adaboost, Real Adaboost, Gentle Adaboost and Logitboost are supported. The basic classifiers are -decision-tree classifiers with at least 2 leaves. Haar-like features are the input to the basic -classifiers, and are calculated as described below. The current algorithm uses the following -Haar-like features: -

-![image](pics/haarfeatures.png) -

-The feature used in a particular classifier is specified by its shape (1a, 2b etc.), position within -the region of interest and the scale (this scale is not the same as the scale used at the detection -stage, though these two scales are multiplied). For example, in the case of the third line feature -(2c) the response is calculated as the difference between the sum of image pixels under the -rectangle covering the whole feature (including the two white stripes and the black stripe in the -middle) and the sum of the image pixels under the black stripe multiplied by 3 in order to -compensate for the differences in the size of areas. The sums of pixel values over a rectangular -regions are calculated rapidly using integral images (see below and the integral description). -

-Check \ref tutorial_cascade_classifier "the corresponding tutorial" for more details. -

-The following reference is for the detection part only. There is a separate application called -opencv_traincascade that can train a cascade of boosted classifiers from a set of samples. -

-\note In the new C++ interface it is also possible to use LBP (local binary pattern) features in -addition to Haar-like features. .. [Viola01] Paul Viola and Michael J. Jones. Rapid Object Detection -using a Boosted Cascade of Simple Features. IEEE CVPR, 2001. The paper is available online at - +

+ The object detector described below has been initially proposed by Paul Viola \cite Viola01 and + improved by Rainer Lienhart \cite Lienhart02 . +

+ First, a classifier (namely a *cascade of boosted classifiers working with haar-like features*) is + trained with a few hundred sample views of a particular object (i.e., a face or a car), called + positive examples, that are scaled to the same size (say, 20x20), and negative examples - arbitrary + images of the same size. +

+ After a classifier is trained, it can be applied to a region of interest (of the same size as used + during the training) in an input image. The classifier outputs a "1" if the region is likely to show + the object (i.e., face/car), and "0" otherwise. To search for the object in the whole image one can + move the search window across the image and check every location using the classifier. The + classifier is designed so that it can be easily "resized" in order to be able to find the objects of + interest at different sizes, which is more efficient than resizing the image itself. So, to find an + object of an unknown size in the image the scan procedure should be done several times at different + scales. +

+ The word "cascade" in the classifier name means that the resultant classifier consists of several + simpler classifiers (*stages*) that are applied subsequently to a region of interest until at some + stage the candidate is rejected or all the stages are passed. The word "boosted" means that the + classifiers at every stage of the cascade are complex themselves and they are built out of basic + classifiers using one of four different boosting techniques (weighted voting). Currently Discrete + Adaboost, Real Adaboost, Gentle Adaboost and Logitboost are supported. The basic classifiers are + decision-tree classifiers with at least 2 leaves. Haar-like features are the input to the basic + classifiers, and are calculated as described below. The current algorithm uses the following + Haar-like features: +

+ ![image](pics/haarfeatures.png) +

+ The feature used in a particular classifier is specified by its shape (1a, 2b etc.), position within + the region of interest and the scale (this scale is not the same as the scale used at the detection + stage, though these two scales are multiplied). For example, in the case of the third line feature + (2c) the response is calculated as the difference between the sum of image pixels under the + rectangle covering the whole feature (including the two white stripes and the black stripe in the + middle) and the sum of the image pixels under the black stripe multiplied by 3 in order to + compensate for the differences in the size of areas. The sums of pixel values over a rectangular + regions are calculated rapidly using integral images (see below and the integral description). +

+ Check \ref tutorial_cascade_classifier "the corresponding tutorial" for more details. +

+ The following reference is for the detection part only. There is a separate application called + opencv_traincascade that can train a cascade of boosted classifiers from a set of samples. +

+ \note In the new C++ interface it is also possible to use LBP (local binary pattern) features in + addition to Haar-like features. .. [Viola01] Paul Viola and Michael J. Jones. Rapid Object Detection + using a Boosted Cascade of Simple Features. IEEE CVPR, 2001. The paper is available online at +

\defgroup objdetect_hog HOG (Histogram of Oriented Gradients) descriptor and object detector \defgroup objdetect_barcode Barcode detection and decoding \defgroup objdetect_qrcode QRCode detection and encoding \defgroup objdetect_dnn_face DNN-based face detection and recognition -Check \ref tutorial_dnn_face "the corresponding tutorial" for more details. +

+ Check \ref tutorial_dnn_face "the corresponding tutorial" for more details. +

\defgroup objdetect_common Common functions and classes \defgroup objdetect_aruco ArUco markers and boards detection for robust camera pose estimation \{ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionBasedTracker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionBasedTracker.java index 3a997b66b04..42466b5c610 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionBasedTracker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionBasedTracker.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionROI.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionROI.java index 8173ba383aa..75ccec47d51 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionROI.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionROI.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectorParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectorParameters.java index 59938cd411a..ce8b4c9a172 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectorParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectorParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/Dictionary.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/Dictionary.java index 6949c380c39..1667b7dae6a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/Dictionary.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/Dictionary.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/FaceDetectorYN.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/FaceDetectorYN.java index 76e0c409a70..71524a78a7a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/FaceDetectorYN.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/FaceDetectorYN.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/FaceRecognizerSF.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/FaceRecognizerSF.java index 8c8ea747c06..0da573f9b4b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/FaceRecognizerSF.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/FaceRecognizerSF.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/GraphicalCodeDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/GraphicalCodeDetector.java index d6d361ea98f..1c371a6bd2c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/GraphicalCodeDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/GraphicalCodeDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; @@ -48,7 +48,7 @@ public class GraphicalCodeDetector extends Pointer { return new GraphicalCodeDetector((Pointer)this).offsetAddress(i); } - public GraphicalCodeDetector() { super((Pointer)null); allocate(); } + @Deprecated public GraphicalCodeDetector() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); public GraphicalCodeDetector(@Const @ByRef GraphicalCodeDetector arg0) { super((Pointer)null); allocate(arg0); } @@ -135,6 +135,10 @@ public class GraphicalCodeDetector extends Pointer { @param decoded_info UTF8-encoded output vector of string or empty vector of string if the codes cannot be decoded. @param points optional output vector of vertices of the found graphical code quadrangles. Will be empty if not found. @param straight_code The optional vector of images containing binarized codes +

+ - If there are QR codes encoded with a Structured Append mode on the image and all of them detected and decoded correctly, + method writes a full message to position corresponds to 0-th code in a sequence. The rest of QR codes from the same sequence + have empty string. */ public native @Cast("bool") boolean detectAndDecodeMulti(@ByVal Mat img, @ByRef StringVector decoded_info, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") Mat points, @ByVal(nullValue = "cv::OutputArrayOfArrays(cv::noArray())") MatVector straight_code); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/GridBoard.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/GridBoard.java index 8f5d8c3f3f1..9e0821e3576 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/GridBoard.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/GridBoard.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; @@ -80,6 +80,6 @@ private native void allocate(@Const @ByRef Size size, float markerLength, float public native float getMarkerLength(); public native float getMarkerSeparation(); - public GridBoard() { super((Pointer)null); allocate(); } + @Deprecated public GridBoard() { super((Pointer)null); allocate(); } @Deprecated private native void allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/HOGDescriptor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/HOGDescriptor.java index e98157ec15d..7c8e7b40fe3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/HOGDescriptor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/HOGDescriptor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetector.java index a850b7fac0f..9bc344fbf12 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetectorAruco.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetectorAruco.java index 4a17e9c5ff3..e65d414194e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetectorAruco.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetectorAruco.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; @@ -105,7 +105,7 @@ public class QRCodeDetectorAruco extends GraphicalCodeDetector { public native @ByRef QRCodeDetectorAruco setDetectorParameters(@Const @ByRef Params params); /** \brief Aruco detector parameters are used to search for the finder patterns. */ - public native @ByVal DetectorParameters getArucoParameters(); + public native @Const @ByRef DetectorParameters getArucoParameters(); /** \brief Aruco detector parameters are used to search for the finder patterns. */ public native void setArucoParameters(@Const @ByRef DetectorParameters params); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeEncoder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeEncoder.java index 0f365bf4ed5..974f0c65f3d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeEncoder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeEncoder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/RefineParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/RefineParameters.java index 672c95519cf..c7369de5a75 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/RefineParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/RefineParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; @@ -68,7 +68,7 @@ public class RefineParameters extends Pointer { */ public native float minRepDistance(); public native RefineParameters minRepDistance(float setter); - /** \brief minRepDistance rate of allowed erroneous bits respect to the error correction capability of the used dictionary. + /** \brief errorCorrectionRate rate of allowed erroneous bits respect to the error correction capability of the used dictionary. * * -1 ignores the error correction step. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/SimilarRects.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/SimilarRects.java index 535b4f96bfc..9005d588448 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/SimilarRects.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/SimilarRects.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_objdetect; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_optflow/DualTVL1OpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_optflow/DualTVL1OpticalFlow.java index b52ce890588..5b94dd2ce4a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_optflow/DualTVL1OpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_optflow/DualTVL1OpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_optflow; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java index 47af7a25cfe..e3b0a23f391 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_phase_unwrapping; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/PhaseUnwrapping.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/PhaseUnwrapping.java index fc3d1e91964..5d0cd65f4f4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/PhaseUnwrapping.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/PhaseUnwrapping.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_phase_unwrapping; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignExposures.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignExposures.java index 16359929ddc..5a1bba5dfb7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignExposures.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignExposures.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignMTB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignMTB.java index c67471f4789..1be76f80cc9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignMTB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignMTB.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateCRF.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateCRF.java index c477917abb1..3c162920575 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateCRF.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateCRF.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateDebevec.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateDebevec.java index a20d19e269e..340d5867e17 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateDebevec.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateDebevec.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateRobertson.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateRobertson.java index 1daf0349982..1414866986d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateRobertson.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateRobertson.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeDebevec.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeDebevec.java index d67bd3bf64f..d357bb9978f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeDebevec.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeDebevec.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeExposures.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeExposures.java index ab3721bd126..7403aa8c485 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeExposures.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeExposures.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeMertens.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeMertens.java index b08584d3c64..d82d5d456bd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeMertens.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeMertens.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeRobertson.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeRobertson.java index b64ce4262b9..54fb7fbbbc8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeRobertson.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeRobertson.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/Tonemap.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/Tonemap.java index f9919353919..ce0f8cf2259 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/Tonemap.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/Tonemap.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapDrago.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapDrago.java index e6c5c3b4b99..ce6375cd148 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapDrago.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapDrago.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapMantiuk.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapMantiuk.java index ac65e246ade..f831aeb65ac 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapMantiuk.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapMantiuk.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapReinhard.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapReinhard.java index 7c0a565cd3d..8d58f0cbfa9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapReinhard.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapReinhard.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_photo; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_plot/Plot2d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_plot/Plot2d.java index 64bb98dc5fd..4088e6dcd00 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_plot/Plot2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_plot/Plot2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_plot; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBRISQUE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBRISQUE.java index 54cf91565b7..268c5995b90 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBRISQUE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBRISQUE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_quality; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBase.java index c59c78f4fb1..e74d5b43ec4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_quality; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityGMSD.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityGMSD.java index e3352c25aaf..54ed331db29 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityGMSD.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityGMSD.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_quality; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityMSE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityMSE.java index 314a900189a..0df1590a71e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityMSE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityMSE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_quality; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityPSNR.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityPSNR.java index 07c03997bed..a40a9b0e8f2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityPSNR.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityPSNR.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_quality; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualitySSIM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualitySSIM.java index 6f98ba5ff27..53da786a576 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualitySSIM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualitySSIM.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_quality; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/GOSTracker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/GOSTracker.java index c6863f2a596..febb33d7314 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/GOSTracker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/GOSTracker.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_rapid; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/OLSTracker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/OLSTracker.java index 83ca8855e66..a67c90550bb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/OLSTracker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/OLSTracker.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_rapid; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Rapid.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Rapid.java index d751bfbe9ea..747a8767b50 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Rapid.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Rapid.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_rapid; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Tracker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Tracker.java index 8b6a282fd6b..1b92953b01a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Tracker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Tracker.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_rapid; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliency.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliency.java index da50774f6ab..04c617caa92 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliency.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliency.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_saliency; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliencyBinWangApr2014.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliencyBinWangApr2014.java index c9bac9c1c14..29914bec1ee 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliencyBinWangApr2014.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliencyBinWangApr2014.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_saliency; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Objectness.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Objectness.java index c5da8e0750d..539dae9a18f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Objectness.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Objectness.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_saliency; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/ObjectnessBING.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/ObjectnessBING.java index 2764712d091..180b9740bfa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/ObjectnessBING.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/ObjectnessBING.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_saliency; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Saliency.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Saliency.java index 0e13c84bf5a..70732701a0d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Saliency.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Saliency.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_saliency; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliency.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliency.java index 9c2db2b6651..10b9c6928c9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliency.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliency.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_saliency; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencyFineGrained.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencyFineGrained.java index 885ef8c82ad..74799262119 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencyFineGrained.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencyFineGrained.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_saliency; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencySpectralResidual.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencySpectralResidual.java index 911e13739fd..3789f641110 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencySpectralResidual.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencySpectralResidual.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_saliency; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/AffineTransformer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/AffineTransformer.java index d34ab61cf8b..1edbc22fabb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/AffineTransformer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/AffineTransformer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ChiHistogramCostExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ChiHistogramCostExtractor.java index d94d94b3a10..84fcdb9284f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ChiHistogramCostExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ChiHistogramCostExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDHistogramCostExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDHistogramCostExtractor.java index 44b178c2ea3..22f6da4d1ab 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDHistogramCostExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDHistogramCostExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDL1HistogramCostExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDL1HistogramCostExtractor.java index d466c6934ba..5a3eda96621 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDL1HistogramCostExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDL1HistogramCostExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HausdorffDistanceExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HausdorffDistanceExtractor.java index 3ddf03c1ffe..3d7b65c3a3d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HausdorffDistanceExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HausdorffDistanceExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HistogramCostExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HistogramCostExtractor.java index 792073a639e..6e5c28d8e79 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HistogramCostExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HistogramCostExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/NormHistogramCostExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/NormHistogramCostExtractor.java index 84ea907ed27..7469fd7fd97 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/NormHistogramCostExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/NormHistogramCostExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeContextDistanceExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeContextDistanceExtractor.java index 8747c15af4c..f588a8d17f0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeContextDistanceExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeContextDistanceExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeDistanceExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeDistanceExtractor.java index 015d9aa3195..ffa68325521 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeDistanceExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeDistanceExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeTransformer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeTransformer.java index 5b1bc632f17..0802a1093ba 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeTransformer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeTransformer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ThinPlateSplineShapeTransformer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ThinPlateSplineShapeTransformer.java index cae4a075e14..7eee148e9fc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ThinPlateSplineShapeTransformer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ThinPlateSplineShapeTransformer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_shape; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBasedEstimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBasedEstimator.java index d57576dedde..e8a9bec9025 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBasedEstimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBasedEstimator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBestOf2NearestMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBestOf2NearestMatcher.java index 6d1de3fd215..d99c27ee2e2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBestOf2NearestMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBestOf2NearestMatcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineWarper.java index 3168d45e1f4..ac0e0359f5c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestMatcher.java index 686a5e41379..0ad5d27f43f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestMatcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestRangeMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestRangeMatcher.java index a31759b649a..d6ddf50ad9f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestRangeMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestRangeMatcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Blender.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Blender.java index 16b6cd16360..d481a008910 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Blender.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Blender.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksChannelsCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksChannelsCompensator.java index 9e28ad3ac8b..c4ddf49cc06 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksChannelsCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksChannelsCompensator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksCompensator.java index 6554091b3cc..702e369ec4a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksCompensator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksGainCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksGainCompensator.java index 3101c828c92..25f860ceee3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksGainCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksGainCompensator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffine.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffine.java index d1801b33401..5d719007368 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffine.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffine.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffinePartial.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffinePartial.java index 1c5f0665c8e..0a9771248f7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffinePartial.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffinePartial.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterBase.java index 1a4231af39f..70af9cca634 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterRay.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterRay.java index 0637088b3d5..76ccf351b8d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterRay.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterRay.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterReproj.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterReproj.java index 86c1ab7da7a..ec256639a76 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterReproj.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterReproj.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParams.java index 55a2a615af6..2e81f1254cb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParamsVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParamsVector.java index d7f5084a553..f13cd973d3c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParamsVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParamsVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ChannelsCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ChannelsCompensator.java index 422b6997e24..d2b6662c04a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ChannelsCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ChannelsCompensator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitProjector.java index 2540832b231..d8513ed9b0c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitWarper.java index d576958bdbf..b93a58ff37d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearProjector.java index f130aa6c058..f185172fc61 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearWarper.java index b49598fbf02..385bd1978f9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitProjector.java index b044f02bf65..3fe55eecf83 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitWarper.java index 5a2f4988255..e93b4af1b50 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalProjector.java index c0a0cda1523..3350fdefab9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalWarper.java index 4c43b08fc89..8773297e707 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCompressedRectilinearPortraitWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCompressedRectilinearPortraitWarper.java index 40ca18850c2..20b64fafbaf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCompressedRectilinearPortraitWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCompressedRectilinearPortraitWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCompressedRectilinearWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCompressedRectilinearWarper.java index 1329264ad91..3f79fcc6e1b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCompressedRectilinearWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCompressedRectilinearWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCylindricalWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCylindricalWarper.java index 48b5bbc4e36..7128b4578c1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCylindricalWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCylindricalWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCylindricalWarperGpu.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCylindricalWarperGpu.java index 7a343d1754e..70c1ae87202 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCylindricalWarperGpu.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailCylindricalWarperGpu.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailFisheyeWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailFisheyeWarper.java index 4c2f2cd843d..3f2c902ee0d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailFisheyeWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailFisheyeWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailMercatorWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailMercatorWarper.java index c1da072774c..87f88da6054 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailMercatorWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailMercatorWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPaniniPortraitWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPaniniPortraitWarper.java index 5a0abdea46f..e44665b1099 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPaniniPortraitWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPaniniPortraitWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPaniniWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPaniniWarper.java index 0de5aab2183..84e7426d490 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPaniniWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPaniniWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPlaneWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPlaneWarper.java index cca754c945d..ef671ce8a85 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPlaneWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPlaneWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPlaneWarperGpu.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPlaneWarperGpu.java index 5be410ef154..b8c9f623c6c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPlaneWarperGpu.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailPlaneWarperGpu.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailSphericalWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailSphericalWarper.java index b07161a8124..e1370b7be55 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailSphericalWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailSphericalWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailSphericalWarperGpu.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailSphericalWarperGpu.java index 4e7ae6d9632..bb688a9a6ce 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailSphericalWarperGpu.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailSphericalWarperGpu.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailStereographicWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailStereographicWarper.java index 0c74925f50d..9eaa892b8f4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailStereographicWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailStereographicWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailTransverseMercatorWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailTransverseMercatorWarper.java index 6c0d65ba054..8b18951658b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailTransverseMercatorWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DetailTransverseMercatorWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DisjointSets.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DisjointSets.java index cc6aac9626f..a79c76beec4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DisjointSets.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DisjointSets.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DpSeamFinder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DpSeamFinder.java index cb13dc2ddc1..c19a043a5f9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DpSeamFinder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/DpSeamFinder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Estimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Estimator.java index c9ac9f3c25e..89e00b72860 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Estimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Estimator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ExposureCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ExposureCompensator.java index daa30fcadfa..e153596c562 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ExposureCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ExposureCompensator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FeatherBlender.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FeatherBlender.java index a2b64f62e25..7bc45148d2c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FeatherBlender.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FeatherBlender.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FeaturesMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FeaturesMatcher.java index 4da2d7e1c74..a54a1688627 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FeaturesMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FeaturesMatcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeProjector.java index 64a57d560c8..7fe939dbf7e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeWarper.java index 8ea328100e7..9a56b2c5df0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GainCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GainCompensator.java index a8a8615e92e..9d037ac29c3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GainCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GainCompensator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Graph.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Graph.java index 46297b6f68d..1864455b2f7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Graph.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Graph.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinder.java index d1993a33f03..b3133e648f1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinderBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinderBase.java index 87f1e50b613..1a9ed870f9f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinderBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinderBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphEdge.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphEdge.java index 95a55597a18..aeb2e94df71 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphEdge.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphEdge.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/HomographyBasedEstimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/HomographyBasedEstimator.java index a955e1fc7c6..27c223f0030 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/HomographyBasedEstimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/HomographyBasedEstimator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeatures.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeatures.java index 0eb5e8b32af..a3b068aead8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeatures.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeatures.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeaturesVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeaturesVector.java index 51591d8e171..5a194efcac8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeaturesVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeaturesVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfo.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfo.java index 3b1051cde77..22aafedf2ae 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfoVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfoVector.java index 04bbe98fd67..10a7da01da9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfoVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfoVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorProjector.java index cc20e44d0f3..94929ebafc1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorWarper.java index f82782968df..0854b1790bc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MultiBandBlender.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MultiBandBlender.java index 18cbe2f0e5e..964a65bfeec 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MultiBandBlender.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MultiBandBlender.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoBundleAdjuster.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoBundleAdjuster.java index a14556c223b..10576d0ea0f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoBundleAdjuster.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoBundleAdjuster.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoExposureCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoExposureCompensator.java index 4f74eea2923..247ff68d63c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoExposureCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoExposureCompensator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoSeamFinder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoSeamFinder.java index 5b3c7c8bd78..25a8e41c7f9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoSeamFinder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoSeamFinder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PairwiseSeamFinder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PairwiseSeamFinder.java index 23c7ab14ccb..57a32695de1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PairwiseSeamFinder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PairwiseSeamFinder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitProjector.java index 6b8b7f63316..9f1cc9e4fc6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitWarper.java index 813f78e208e..2e624d9bb7d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniProjector.java index fe15ffef3d8..9ae379047d6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniWarper.java index 0889681f50c..a8630bfdf31 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitProjector.java index feb1735a8f0..5e1d305ab72 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitWarper.java index 8f12252f608..b20610d6906 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneProjector.java index 5715abc51bd..b3c0c28d751 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneWarper.java index 73d0235e05d..50fcc7b8934 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ProjectorBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ProjectorBase.java index eed5688e471..90767c8e1d0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ProjectorBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ProjectorBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PyRotationWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PyRotationWarper.java index f34ab973ce3..f45129dab51 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PyRotationWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PyRotationWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/RotationWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/RotationWarper.java index 81feacc0e44..a6641b6ff56 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/RotationWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/RotationWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SeamFinder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SeamFinder.java index 37e30bd629c..62d7aa4acd1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SeamFinder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SeamFinder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitProjector.java index e536af39723..6f9f2161a1d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitWarper.java index ba27c93c84d..c2cfcbe2399 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalProjector.java index 4ff9409c5de..1e1fca4b1c3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalWarper.java index 4f729b8d49d..1437f54b363 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicProjector.java index 94e7814f969..8a664e3e6aa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicWarper.java index ee8fb6fe371..0c7e8dc099d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Stitcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Stitcher.java index 7b46e811a94..89cf7b770f6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Stitcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Stitcher.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Timelapser.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Timelapser.java index 8b842ae15f2..8f2a6a308f7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Timelapser.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Timelapser.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TimelapserCrop.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TimelapserCrop.java index 5127f433fef..e1ca2dc314a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TimelapserCrop.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TimelapserCrop.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorProjector.java index 6dafd5a8cce..7db9c23a430 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorProjector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorWarper.java index ca9aa08d1b7..92c06971992 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorWarper.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/VoronoiSeamFinder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/VoronoiSeamFinder.java index d13b5857c79..300f2d95e65 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/VoronoiSeamFinder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/VoronoiSeamFinder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/WarperCreator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/WarperCreator.java index 3f456e25710..a979b58e43a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/WarperCreator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/WarperCreator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_stitching; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/GrayCodePattern.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/GrayCodePattern.java index 08158e62f42..8ced10f07e5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/GrayCodePattern.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/GrayCodePattern.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_structured_light; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/SinusoidalPattern.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/SinusoidalPattern.java index 65ce8186dac..4dc1d9c6207 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/SinusoidalPattern.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/SinusoidalPattern.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_structured_light; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/StructuredLightPattern.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/StructuredLightPattern.java index 85d81ae8674..6bdba1eba3c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/StructuredLightPattern.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/StructuredLightPattern.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_structured_light; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/BroxOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/BroxOpticalFlow.java index 58e4db99d39..f9825638cb0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/BroxOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/BroxOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_superres; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/DenseOpticalFlowExt.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/DenseOpticalFlowExt.java index fa5605d2ea1..f9328d296f9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/DenseOpticalFlowExt.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/DenseOpticalFlowExt.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_superres; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/FrameSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/FrameSource.java index 388d198931a..97f3835726a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/FrameSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/FrameSource.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_superres; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/PyrLKOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/PyrLKOpticalFlow.java index d5810582de7..d9f28c2ba47 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/PyrLKOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/PyrLKOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_superres; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResDualTVL1OpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResDualTVL1OpticalFlow.java index 3b64de53401..a2cda2d1928 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResDualTVL1OpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResDualTVL1OpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_superres; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResFarnebackOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResFarnebackOpticalFlow.java index 260f05e234f..d06966ad6ec 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResFarnebackOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResFarnebackOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_superres; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResolution.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResolution.java index bc422071f91..d181b338595 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResolution.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResolution.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_superres; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/BaseOCR.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/BaseOCR.java index a22ff22deaf..176e5bf9922 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/BaseOCR.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/BaseOCR.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/DoubleVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/DoubleVector.java index 2170128c988..30b195f255c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/DoubleVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/DoubleVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERFilter.java index 0ffe86bb6d2..d152dbf6043 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStat.java index 743ebe4e53d..878276c4f2c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStatVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStatVector.java index 9fab324e68a..1167ebf9d65 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStatVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStatVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStatVectorVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStatVectorVector.java index 0fecb72d317..c80050dcf52 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStatVectorVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStatVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/FloatVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/FloatVector.java index a50fa39ec77..f7037961ac8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/FloatVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/FloatVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/IntDeque.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/IntDeque.java index b6a6c795ca0..f887c8d079e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/IntDeque.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/IntDeque.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/IntVector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/IntVector.java index f707719f034..ef939759fd2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/IntVector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/IntVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRBeamSearchDecoder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRBeamSearchDecoder.java index ee416d22a32..a3fddc0e5ff 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRBeamSearchDecoder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRBeamSearchDecoder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHMMDecoder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHMMDecoder.java index 2f8760df209..10cfc4cb715 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHMMDecoder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHMMDecoder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHolisticWordRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHolisticWordRecognizer.java index 6ddc7f308fa..8a5e1227340 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHolisticWordRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHolisticWordRecognizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRTesseract.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRTesseract.java index 22d6bdd60f2..b4f06f5617f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRTesseract.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRTesseract.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/TextDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/TextDetector.java index 95b759befc9..15408c69fd4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/TextDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/TextDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/TextDetectorCNN.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/TextDetectorCNN.java index 47ddfafd559..905d28e6405 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/TextDetectorCNN.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/TextDetectorCNN.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_text; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/AugmentedUnscentedKalmanFilterParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/AugmentedUnscentedKalmanFilterParams.java index cff474eb019..0e15189a986 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/AugmentedUnscentedKalmanFilterParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/AugmentedUnscentedKalmanFilterParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/BaseClassifier.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/BaseClassifier.java index ce2b993fa67..27186d18757 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/BaseClassifier.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/BaseClassifier.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ClassifierThreshold.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ClassifierThreshold.java index 86acbb4f390..103acb282cd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ClassifierThreshold.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ClassifierThreshold.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CosDistance.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CosDistance.java index df5af27cabf..3ee3d230ac2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CosDistance.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CosDistance.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureEvaluator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureEvaluator.java index 789fae9abc8..539c23fe04d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureEvaluator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureEvaluator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureParams.java index d408f12e5ee..d7acfeadc9a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGEvaluator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGEvaluator.java index 204c4cbf652..13dbf1bcf38 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGEvaluator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGEvaluator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGFeatureParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGFeatureParams.java index 43123644305..81f101e4181 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGFeatureParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGFeatureParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarEvaluator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarEvaluator.java index 75b001bdbcf..2e553ac215e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarEvaluator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarEvaluator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarFeatureParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarFeatureParams.java index 44fbf571fb9..f24000f9a9b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarFeatureParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarFeatureParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPEvaluator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPEvaluator.java index bb8450e7bd8..62f7f632862 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPEvaluator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPEvaluator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPFeatureParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPFeatureParams.java index f1fce84e20e..3ab506d6ac2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPFeatureParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPFeatureParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvParams.java index e42057004dd..418d759f125 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Detector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Detector.java index 3c0622d8e21..c8cb21eb56f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Detector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Detector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/EstimatedGaussDistribution.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/EstimatedGaussDistribution.java index 8b63c13aeaa..18f6a02902a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/EstimatedGaussDistribution.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/EstimatedGaussDistribution.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/IDescriptorDistance.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/IDescriptorDistance.java index 1bf5e04ed30..685cc2b0a91 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/IDescriptorDistance.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/IDescriptorDistance.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/IImageDescriptor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/IImageDescriptor.java index 480752cfbf7..4f6d9f4234d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/IImageDescriptor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/IImageDescriptor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ITrackerByMatching.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ITrackerByMatching.java index d5350679273..bc03459b3be 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ITrackerByMatching.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ITrackerByMatching.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; @@ -79,7 +79,7 @@ public class ITrackerByMatching extends Pointer { /// /// public native void process(@Const @ByRef Mat frame, @Cast("const cv::detail::tracking::tbm::TrackedObjects*") @ByRef TrackedObjectDeque detections, - @Cast("cv::uint64_t") long timestamp); + @Cast("uint64_t") long timestamp); /** * \brief Pipeline parameters getter. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/MatchTemplateDistance.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/MatchTemplateDistance.java index 154199a83ac..3ee1a56ab69 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/MatchTemplateDistance.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/MatchTemplateDistance.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ResizedImageDescriptor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ResizedImageDescriptor.java index 4ac5d7518d4..029b0de90cb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ResizedImageDescriptor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/ResizedImageDescriptor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTPointVectorMap.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTPointVectorMap.java index 380f163dbae..fc0a7280a17 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTPointVectorMap.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTPointVectorMap.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTTrackMap.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTTrackMap.java index ffc27ad59ca..7d6759de9b5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTTrackMap.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTTrackMap.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/StrongClassifierDirectSelection.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/StrongClassifierDirectSelection.java index 6db1ff15c3f..6f99e1f3f32 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/StrongClassifierDirectSelection.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/StrongClassifierDirectSelection.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Track.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Track.java index 483ec00b033..f2c52e2ca62 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Track.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Track.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObject.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObject.java index c731c3533a0..97bbb03f3e2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObject.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; @@ -64,7 +64,7 @@ public class TrackedObject extends Pointer {

/// /// */ - public native @Cast("cv::uint64_t") long timestamp(); public native TrackedObject timestamp(long setter); + public native @Cast("uint64_t") long timestamp(); public native TrackedObject timestamp(long setter); /** * \brief Default constructor. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObjectDeque.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObjectDeque.java index 43d84bc33ff..4c5d9b9cfce 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObjectDeque.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObjectDeque.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerCSRT.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerCSRT.java index 75faef6574c..479c0771ad3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerCSRT.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerCSRT.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerKCF.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerKCF.java index 5c3e6d29d00..d6c96ce67ec 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerKCF.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerKCF.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerParams.java index 111ad484653..c26701a9dcb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UkfSystemModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UkfSystemModel.java index 51ee2adedf7..1c4932fe871 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UkfSystemModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UkfSystemModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilter.java index f5350c38de9..8ff6badef7f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilterParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilterParams.java index eb1c4ad6326..0df769614fc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilterParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilterParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/WeakClassifierHaarFeature.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/WeakClassifierHaarFeature.java index f5a61a10b58..06e7bc22001 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/WeakClassifierHaarFeature.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/WeakClassifierHaarFeature.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_tracking; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractor.java index e8eada8759a..b3468d18390 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorKNN.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorKNN.java index c4a1666a376..e7f4c194ed7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorKNN.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorKNN.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorMOG2.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorMOG2.java index 03c6390d46a..312aae0eec6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorMOG2.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorMOG2.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DISOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DISOpticalFlow.java index a04e90f9fe8..bdde6892c52 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DISOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DISOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; @@ -111,6 +111,12 @@ public class DISOpticalFlow extends DenseOpticalFlow { /** \copybrief getVariationalRefinementGamma @see getVariationalRefinementGamma */ public native void setVariationalRefinementGamma(float val); + /** \brief Norm value shift for robust penalizer + @see setVariationalRefinementEpsilon */ + public native float getVariationalRefinementEpsilon(); + /** \copybrief getVariationalRefinementEpsilon @see getVariationalRefinementEpsilon */ + public native void setVariationalRefinementEpsilon(float val); + /** \brief Whether to use mean-normalization of patches when computing patch distance. It is turned on by default as it typically provides a noticeable quality boost because of increased robustness to diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DenseOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DenseOpticalFlow.java index 5a70e6d31bd..e5d62e98fe6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DenseOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DenseOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/FarnebackOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/FarnebackOpticalFlow.java index c7ee58f7c87..ec32cdabdd8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/FarnebackOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/FarnebackOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/KalmanFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/KalmanFilter.java index e653d57c60e..189e003e122 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/KalmanFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/KalmanFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparseOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparseOpticalFlow.java index 2792ecad938..216c6f5b552 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparseOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparseOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparsePyrLKOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparsePyrLKOpticalFlow.java index d9b8c9dada1..38db9e80491 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparsePyrLKOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparsePyrLKOpticalFlow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/Tracker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/Tracker.java index 52dbefe6fc8..154763b4d7c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/Tracker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/Tracker.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerDaSiamRPN.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerDaSiamRPN.java index 195cca78433..5b663cc6d20 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerDaSiamRPN.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerDaSiamRPN.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerGOTURN.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerGOTURN.java index 961f2a7dfef..4ad92d7378b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerGOTURN.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerGOTURN.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerMIL.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerMIL.java index 0fa4e6b1847..bccdac66d69 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerMIL.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerMIL.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerNano.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerNano.java index 204708409ec..1a5f4d68a88 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerNano.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerNano.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerVit.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerVit.java index 9200038ea4a..77d2f10b902 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerVit.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerVit.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/VariationalRefinement.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/VariationalRefinement.java index 572f4feb0e2..6f014e09f5c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/VariationalRefinement.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/VariationalRefinement.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_video; @@ -92,6 +92,12 @@ public class VariationalRefinement extends DenseOpticalFlow { /** \copybrief getGamma @see getGamma */ public native void setGamma(float val); + /** \brief Norm value shift for robust penalizer + @see setEpsilon */ + public native float getEpsilon(); + /** \copybrief getEpsilon @see getEpsilon */ + public native void setEpsilon(float val); + /** \brief Creates an instance of VariationalRefinement */ public static native @Ptr VariationalRefinement create(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCapture.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCapture.java index 550b1080f84..b523af47851 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCapture.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCapture.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videoio; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriter.java index bc06bda4711..7b5439ea8d6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videoio; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/IVideoCapture.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/IVideoCapture.java index a650940b925..817f5753fdd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/IVideoCapture.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/IVideoCapture.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videoio; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/IVideoWriter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/IVideoWriter.java index e7ae80dd633..185eeace2a6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/IVideoWriter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/IVideoWriter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videoio; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoCapture.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoCapture.java index 60eaab91fa5..2f208e1aba4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoCapture.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoCapture.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videoio; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoCapturePrivateAccessor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoCapturePrivateAccessor.java index 956725ffb84..e8aac03bf51 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoCapturePrivateAccessor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoCapturePrivateAccessor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videoio; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoWriter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoWriter.java index e1d62b373ae..47bedd6d222 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoWriter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoWriter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videoio; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorAverageInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorAverageInpainter.java index f73866dfe06..275a0008906 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorAverageInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorAverageInpainter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorInpainter.java index 314e100f497..528a8f32925 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorInpainter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ConsistentMosaicInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ConsistentMosaicInpainter.java index 426146bb6ec..53a51e46b9e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ConsistentMosaicInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ConsistentMosaicInpainter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/DeblurerBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/DeblurerBase.java index 33c7c4fcbe1..bb6af36058e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/DeblurerBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/DeblurerBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FastMarchingMethod.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FastMarchingMethod.java index 30ca6b8cae0..519d3b3d055 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FastMarchingMethod.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FastMarchingMethod.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FromFileMotionReader.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FromFileMotionReader.java index bfc4d23534c..033c6770d1e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FromFileMotionReader.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FromFileMotionReader.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/GaussianMotionFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/GaussianMotionFilter.java index bf5d7b2e537..f81acc85ed9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/GaussianMotionFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/GaussianMotionFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IDenseOptFlowEstimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IDenseOptFlowEstimator.java index 6204e6df8c7..162078980e2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IDenseOptFlowEstimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IDenseOptFlowEstimator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IFrameSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IFrameSource.java index 370c732c7ac..e9eef518051 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IFrameSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IFrameSource.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ILog.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ILog.java index 7130413595e..5f16bdf3e9e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ILog.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ILog.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IMotionStabilizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IMotionStabilizer.java index 2a63d9f2d2b..d56adaa7bf4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IMotionStabilizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IMotionStabilizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IOutlierRejector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IOutlierRejector.java index 1bba24dbc9d..e20b2c1471b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IOutlierRejector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IOutlierRejector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ISparseOptFlowEstimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ISparseOptFlowEstimator.java index 2ff934e4d91..0f75d8f1035 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ISparseOptFlowEstimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ISparseOptFlowEstimator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ImageMotionEstimatorBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ImageMotionEstimatorBase.java index dc56448fc35..240f164a871 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ImageMotionEstimatorBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ImageMotionEstimatorBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpainterBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpainterBase.java index fbcaccc7171..a77b922d611 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpainterBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpainterBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpaintingPipeline.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpaintingPipeline.java index 0161abfe924..15587a2c39f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpaintingPipeline.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpaintingPipeline.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/KeypointBasedMotionEstimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/KeypointBasedMotionEstimator.java index 16e2d5bf5c9..3e8037ee0be 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/KeypointBasedMotionEstimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/KeypointBasedMotionEstimator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LogToStdout.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LogToStdout.java index d271038a843..e81f81d16c7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LogToStdout.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LogToStdout.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LpMotionStabilizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LpMotionStabilizer.java index e00cdab3c1e..cc40d019c17 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LpMotionStabilizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LpMotionStabilizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MaskFrameSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MaskFrameSource.java index 98c1c569b3e..f2442bbac54 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MaskFrameSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MaskFrameSource.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressor.java index 8e29d6ed805..5f207d89486 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressorBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressorBase.java index aa8d3d41a0a..d23950e6fa3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressorBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressorBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorBase.java index 7426aa65ccd..68e20a6b6a9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorL1.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorL1.java index 948eff2d000..519674662f1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorL1.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorL1.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorRansacL2.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorRansacL2.java index f764b05ef55..976529b19a8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorRansacL2.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionEstimatorRansacL2.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionFilterBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionFilterBase.java index 44ef335afb3..51d04bcc65a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionFilterBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionFilterBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionInpainter.java index 8761671f9d9..87cef2b3088 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionInpainter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionStabilizationPipeline.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionStabilizationPipeline.java index 8f69618eaea..b9275789ef9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionStabilizationPipeline.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionStabilizationPipeline.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullDeblurer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullDeblurer.java index 7b1e132e98d..f0ba1c2ab83 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullDeblurer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullDeblurer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullFrameSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullFrameSource.java index acf446c238d..8937b7ee838 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullFrameSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullFrameSource.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullInpainter.java index 2195df016fc..2eba8aee3a9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullInpainter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullLog.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullLog.java index c5a91b470a0..10a0a9f2074 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullLog.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullLog.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullOutlierRejector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullOutlierRejector.java index 89878cf5a65..1a7a1554a5b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullOutlierRejector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullOutlierRejector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullWobbleSuppressor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullWobbleSuppressor.java index 0474dd2bedb..dab58c72dd8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullWobbleSuppressor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullWobbleSuppressor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/OnePassStabilizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/OnePassStabilizer.java index 1283fd3b864..186ce96fad4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/OnePassStabilizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/OnePassStabilizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/PyrLkOptFlowEstimatorBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/PyrLkOptFlowEstimatorBase.java index 8e52a9bb70d..468b4c84a0e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/PyrLkOptFlowEstimatorBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/PyrLkOptFlowEstimatorBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/RansacParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/RansacParams.java index 7cb35cbc355..73f1a8dec70 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/RansacParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/RansacParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/SparsePyrLkOptFlowEstimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/SparsePyrLkOptFlowEstimator.java index 50a6ac41dcd..f49cd70c347 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/SparsePyrLkOptFlowEstimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/SparsePyrLkOptFlowEstimator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/StabilizerBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/StabilizerBase.java index 2ee22a31fbb..a16de9e2ef1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/StabilizerBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/StabilizerBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ToFileMotionWriter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ToFileMotionWriter.java index dd6dbec3c4b..a85e8aed3ae 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ToFileMotionWriter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ToFileMotionWriter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TranslationBasedLocalOutlierRejector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TranslationBasedLocalOutlierRejector.java index 0817496986d..ed53f7be5c5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TranslationBasedLocalOutlierRejector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TranslationBasedLocalOutlierRejector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TwoPassStabilizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TwoPassStabilizer.java index 0ea395b77e4..0d77df9aeeb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TwoPassStabilizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TwoPassStabilizer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/VideoFileSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/VideoFileSource.java index b98c285f919..49867ba775a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/VideoFileSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/VideoFileSource.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WeightingDeblurer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WeightingDeblurer.java index b1eb8258d1f..059d25c6b18 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WeightingDeblurer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WeightingDeblurer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WobbleSuppressorBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WobbleSuppressorBase.java index 55841fb9f25..56405b98d48 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WobbleSuppressorBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WobbleSuppressorBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_videostab; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_wechat_qrcode/WeChatQRCode.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_wechat_qrcode/WeChatQRCode.java index 6856c32e7ba..f6168f416d7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_wechat_qrcode/WeChatQRCode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_wechat_qrcode/WeChatQRCode.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_wechat_qrcode; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/AffineFeature2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/AffineFeature2D.java index e35fd1eaa7e..642de920d40 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/AffineFeature2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/AffineFeature2D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java index 4070588aa01..43c07746d19 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BoostDesc.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BoostDesc.java index 05b3075cdf4..9d3f0a20699 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BoostDesc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BoostDesc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java index 9d5bc9b7902..89ade8ecd80 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/DAISY.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/DAISY.java index b09b8b27bf8..f3033174f82 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/DAISY.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/DAISY.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/Elliptic_KeyPoint.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/Elliptic_KeyPoint.java index 124402aafaa..0cc0a5b1aee 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/Elliptic_KeyPoint.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/Elliptic_KeyPoint.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java index d88c004e2b0..d7a9333f5ac 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java index 9ccdb327b41..900700babd6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java index 8feed5296ba..10f07f1b604 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java index ed6960283ae..cfc0f827e3f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java index 4f223dae439..37706f394ab 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignatures.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignatures.java index 1bc29e6e78f..7d01cef228c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignatures.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignatures.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignaturesSQFD.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignaturesSQFD.java index 4504492b64a..1ca0ed51e70 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignaturesSQFD.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignaturesSQFD.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/SURF.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/SURF.java index e1892e0e1c9..9c5ab203871 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/SURF.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/SURF.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; @@ -32,6 +32,9 @@ import static org.bytedeco.opencv.global.opencv_xfeatures2d.*; +/** \addtogroup xfeatures2d_nonfree + * \{ +

/** \brief Class for extracting Speeded Up Robust Features from an image \cite Bay06 .

The algorithm parameters: diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java index 5267d21339f..dc19c63dede 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TBMR.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TBMR.java index 9606f371c6d..f47974d3fca 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TBMR.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TBMR.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TEBLID.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TEBLID.java index b6ed7ac51f2..4ed3ff22b1c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TEBLID.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TEBLID.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/VGG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/VGG.java index 032b47428e4..6d2916ebd5d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/VGG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/VGG.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xfeatures2d; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/AdaptiveManifoldFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/AdaptiveManifoldFilter.java index de86fc2ddaa..d6d38c87db9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/AdaptiveManifoldFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/AdaptiveManifoldFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/Box.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/Box.java index 2b69e522f96..ad9447fd59f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/Box.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/Box.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java index 4509d82d755..ca5edbb960b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DTFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DTFilter.java index 5474a232b21..a6c7200f5fd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DTFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DTFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityFilter.java index 5454d5c7327..a64cc1c930b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityWLSFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityWLSFilter.java index 3a5ee167ae7..ab6f26c3f6e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityWLSFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityWLSFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeAwareInterpolator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeAwareInterpolator.java index bb68137fc48..a1af1584432 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeAwareInterpolator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeAwareInterpolator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeBoxes.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeBoxes.java index 235bd4b61e5..658834ac0f2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeBoxes.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeBoxes.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastBilateralSolverFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastBilateralSolverFilter.java index 4ea3df9c8dc..fb28e93530e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastBilateralSolverFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastBilateralSolverFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastGlobalSmootherFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastGlobalSmootherFilter.java index 760fb580310..e1f187e0bf0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastGlobalSmootherFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastGlobalSmootherFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastLineDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastLineDetector.java index 5f4655a8e6a..870d66ee026 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastLineDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastLineDetector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GraphSegmentation.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GraphSegmentation.java index 38edfdc4bcd..3bce6fdbebe 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GraphSegmentation.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GraphSegmentation.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GuidedFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GuidedFilter.java index 316e8a46411..ed4ea80172e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GuidedFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GuidedFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; @@ -35,9 +35,9 @@ ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// -/** \brief Interface for realizations of Guided Filter. +/** \brief Interface for realizations of (Fast) Guided Filter.

-For more details about this filter see \cite Kaiming10 . +For more details about this filter see \cite Kaiming10 \cite Kaiming15 . */ @Namespace("cv::ximgproc") @Properties(inherit = org.bytedeco.opencv.presets.opencv_ximgproc.class) public class GuidedFilter extends Algorithm { @@ -51,7 +51,7 @@ public class GuidedFilter extends Algorithm { @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(GuidedFilter pointer); - /** \brief Apply Guided Filter to the filtering image. + /** \brief Apply (Fast) Guided Filter to the filtering image.

@param src filtering image with any numbers of channels.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RFFeatureGetter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RFFeatureGetter.java index 514d60ba2fb..b864b46437d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RFFeatureGetter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RFFeatureGetter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RICInterpolator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RICInterpolator.java index 734a164fd1b..3c22cf46848 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RICInterpolator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RICInterpolator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RidgeDetectionFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RidgeDetectionFilter.java index 0493286ca87..8dcea8d3165 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RidgeDetectionFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RidgeDetectionFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentation.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentation.java index 2a2f1b636fd..58782b41539 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentation.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentation.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategy.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategy.java index fd12e970e7c..587438975d6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategy.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategy.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyColor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyColor.java index 482378f4ac0..ea62a458227 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyColor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyColor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyFill.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyFill.java index 813ff84e913..7b594f58431 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyFill.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyFill.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyMultiple.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyMultiple.java index 280574b1924..cb577570154 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyMultiple.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyMultiple.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategySize.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategySize.java index cfedc95fff4..76ab1d9301e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategySize.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategySize.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyTexture.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyTexture.java index bdbd8b745e1..16f62d51c39 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyTexture.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyTexture.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SparseMatchInterpolator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SparseMatchInterpolator.java index 4065575c9fb..85bf0f94912 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SparseMatchInterpolator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SparseMatchInterpolator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/StructuredEdgeDetection.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/StructuredEdgeDetection.java index 40b9acf5345..452aa0b5aa2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/StructuredEdgeDetection.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/StructuredEdgeDetection.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelLSC.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelLSC.java index e016f979c67..ba1dcfffd9b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelLSC.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelLSC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSEEDS.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSEEDS.java index c5ae35e9ba6..d0f5b4acde5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSEEDS.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSEEDS.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSLIC.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSLIC.java index a011db39c69..2423d2f900f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSLIC.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSLIC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_ximgproc; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/GrayworldWB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/GrayworldWB.java index 44f58970d63..3da288b257f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/GrayworldWB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/GrayworldWB.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xphoto; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/LearningBasedWB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/LearningBasedWB.java index 359bb6d6d59..2f616a7920a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/LearningBasedWB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/LearningBasedWB.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xphoto; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/SimpleWB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/SimpleWB.java index 295dd1f13db..823de7f599e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/SimpleWB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/SimpleWB.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xphoto; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/TonemapDurand.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/TonemapDurand.java index babb247b48a..ee3f68b1300 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/TonemapDurand.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/TonemapDurand.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xphoto; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/WhiteBalancer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/WhiteBalancer.java index b8e7b0accab..49e28707724 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/WhiteBalancer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/WhiteBalancer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.opencv.opencv_xphoto; diff --git a/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java b/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java index 03a78f67b88..fe52d32c187 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java +++ b/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java @@ -53,9 +53,9 @@ opencv_dnn_superres.class, }, value = { - @Platform(preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", "opencv_cudaimgproc@.409", "opencv_java"}), + @Platform(preload = {"opencv_cuda@.410", "opencv_cudaarithm@.410", "opencv_cudafilters@.410", "opencv_cudaimgproc@.410", "opencv_java"}), @Platform(value = "ios", preload = "libopencv_java"), - @Platform(value = "windows", preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", "opencv_cudaimgproc490", "opencv_java"}), + @Platform(value = "windows", preload = {"opencv_cuda4100", "opencv_cudaarithm4100", "opencv_cudafilters4100", "opencv_cudaimgproc4100", "opencv_java"}), } ) public class opencv_java { diff --git a/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java b/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java index 119f2062419..0df514e205a 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java +++ b/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java @@ -65,12 +65,12 @@ opencv_wechat_qrcode.class, }, value = { - @Platform(preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", "opencv_cudaimgproc@.409", - "opencv_cudacodec@.409", "opencv_cudaobjdetect@.409", "opencv_cudabgsegm@.409", "opencv_cudastereo@.409", - "opencv_cudafeatures2d@.409", "opencv_cudaoptflow@.409", "opencv_cudawarping@.409", "opencv_cudalegacy@.409"}), - @Platform(value = "windows", preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", "opencv_cudaimgproc490", - "opencv_cudacodec490", "opencv_cudaobjdetect490", "opencv_cudabgsegm490", "opencv_cudastereo490", - "opencv_cudafeatures2d490", "opencv_cudaoptflow490", "opencv_cudawarping490", "opencv_cudalegacy490"}), + @Platform(preload = {"opencv_cuda@.410", "opencv_cudaarithm@.410", "opencv_cudafilters@.410", "opencv_cudaimgproc@.410", + "opencv_cudacodec@.410", "opencv_cudaobjdetect@.410", "opencv_cudabgsegm@.410", "opencv_cudastereo@.410", + "opencv_cudafeatures2d@.410", "opencv_cudaoptflow@.410", "opencv_cudawarping@.410", "opencv_cudalegacy@.410"}), + @Platform(value = "windows", preload = {"opencv_cuda4100", "opencv_cudaarithm4100", "opencv_cudafilters4100", "opencv_cudaimgproc4100", + "opencv_cudacodec4100", "opencv_cudaobjdetect4100", "opencv_cudabgsegm4100", "opencv_cudastereo4100", + "opencv_cudafeatures2d4100", "opencv_cudaoptflow4100", "opencv_cudawarping4100", "opencv_cudalegacy4100"}), } ) public class opencv_python3 { diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java index 67360eccded..bda9afef8c1 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java @@ -33,10 +33,10 @@ value = { @Platform( include = {/*"",*/ "", "", ""}, - link = "opencv_aruco@.409" + link = "opencv_aruco@.410" ), @Platform(value = "ios", preload = "libopencv_aruco"), - @Platform(value = "windows", link = "opencv_aruco490") + @Platform(value = "windows", link = "opencv_aruco4100") }, target = "org.bytedeco.opencv.opencv_aruco", global = "org.bytedeco.opencv.global.opencv_aruco" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java index 546241beac3..08c6c1029f3 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java @@ -33,10 +33,10 @@ value = { @Platform( include = "", - link = "opencv_bgsegm@.409" + link = "opencv_bgsegm@.410" ), @Platform(value = "ios", preload = "libopencv_bgsegm"), - @Platform(value = "windows", link = "opencv_bgsegm490") + @Platform(value = "windows", link = "opencv_bgsegm4100") }, target = "org.bytedeco.opencv.opencv_bgsegm", global = "org.bytedeco.opencv.global.opencv_bgsegm" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java index 1619e7fd6c3..5a821ca023e 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java @@ -35,9 +35,9 @@ inherit = opencv_highgui.class, value = { @Platform(include = {"", "opencv2/bioinspired/bioinspired.hpp", "opencv2/bioinspired/retina.hpp", - "opencv2/bioinspired/retinafasttonemapping.hpp", "opencv2/bioinspired/transientareassegmentationmodule.hpp"}, link = "opencv_bioinspired@.409"), + "opencv2/bioinspired/retinafasttonemapping.hpp", "opencv2/bioinspired/transientareassegmentationmodule.hpp"}, link = "opencv_bioinspired@.410"), @Platform(value = "ios", preload = "libopencv_bioinspired"), - @Platform(value = "windows", link = "opencv_bioinspired490") + @Platform(value = "windows", link = "opencv_bioinspired4100") }, target = "org.bytedeco.opencv.opencv_bioinspired", global = "org.bytedeco.opencv.global.opencv_bioinspired" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java index 45cd599f743..7c754d48be6 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java @@ -35,9 +35,9 @@ @Properties( inherit = opencv_features2d.class, value = { - @Platform(include = {"", ""}, link = "opencv_calib3d@.409"), + @Platform(include = {"", ""}, link = "opencv_calib3d@.410"), @Platform(value = "ios", preload = "libopencv_calib3d"), - @Platform(value = "windows", link = "opencv_calib3d490") + @Platform(value = "windows", link = "opencv_calib3d4100") }, target = "org.bytedeco.opencv.opencv_calib3d", global = "org.bytedeco.opencv.global.opencv_calib3d" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java index 353525bbf09..0ac21fdb250 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java @@ -57,10 +57,10 @@ "", "", "", "", "", "", "", "", "", "", "", "", - "", "", "", "opencv_adapters.h"}, link = {"opencv_core@.409", "opencv_imgproc@.409"}, + "", "", "", "opencv_adapters.h"}, link = {"opencv_core@.410", "opencv_imgproc@.410"}, exclude = {"openblas_config.h", "cblas.h", "lapacke_config.h", "lapacke_mangling.h", "lapack.h", "lapacke.h", "lapacke_utils.h"}, resource = {"include", "lib", "sdk", "share", "x86", "x64", "OpenCVConfig.cmake", "OpenCVConfig-version.cmake", "python"}, linkresource = "lib", - preload = {"opencv_cudev@.409"}, compiler = "cpp11", define = "SHARED_PTR_NAMESPACE std"), + preload = {"opencv_cudev@.410"}, compiler = "cpp11", define = "SHARED_PTR_NAMESPACE std"), @Platform(value = "android", preload = ""), @Platform(value = "ios", preload = {"liblibjpeg", "liblibpng", "liblibprotobuf", "liblibwebp", "libzlib", "libopencv_core"}), @Platform(value = "linux", preloadpath = {"/usr/lib/", "/usr/lib32/", "/usr/lib64/"}), @@ -69,7 +69,7 @@ @Platform(value = "linux-x86", preloadpath = {"/usr/lib32/", "/usr/lib/"}), @Platform(value = "linux-x86_64", preloadpath = {"/usr/lib64/", "/usr/lib/"}), @Platform(value = "linux-ppc64", preloadpath = {"/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}), - @Platform(value = "windows", define = {"SHARED_PTR_NAMESPACE std", "_WIN32_WINNT 0x0502"}, link = {"opencv_core490", "opencv_imgproc490"}, preload = {"opencv_cudev490"}), + @Platform(value = "windows", define = {"SHARED_PTR_NAMESPACE std", "_WIN32_WINNT 0x0502"}, link = {"opencv_core4100", "opencv_imgproc4100"}, preload = {"opencv_cudev4100"}), @Platform(value = {"linux-arm64", "linux-ppc64le", "linux-x86_64", "macosx-x86_64", "windows-x86_64"}, extension = "-gpu")}, target = "org.bytedeco.opencv.opencv_core", global = "org.bytedeco.opencv.global.opencv_core", @@ -224,7 +224,8 @@ public void map(InfoMap infoMap) { .put(new Info("__CV_BEGIN__", "__CV_END__", "__CV_EXIT__").cppTypes()) .put(new Info("uchar").cast().valueTypes("byte").pointerTypes("BytePointer", "ByteBuffer", "byte[]")) - .put(new Info("std::vector >", "std::vector >", "std::vector >").cast().pointerTypes("ByteVectorVector").define()) + .put(new Info("std::vector >", "std::vector >", "std::vector >", + "std::vector >").cast().pointerTypes("ByteVectorVector").define()) .put(new Info("std::vector >").pointerTypes("IntVectorVector").define()) .put(new Info("std::vector >").pointerTypes("FloatVectorVector").define()) .put(new Info("std::vector", "std::vector").pointerTypes("StringVector").define()) @@ -394,9 +395,9 @@ public void map(InfoMap infoMap) { .put(new Info("cv::saturate_cast").javaNames("unsignedSaturateCast")) .put(new Info("cv::saturate_cast").javaNames("uint64SaturateCast")) .put(new Info("cv::saturate_cast").javaNames("int64SaturateCast")) - .put(new Info("cv::saturate_cast", "saturate_cast").javaNames("float16SaturateCast")) + .put(new Info("cv::saturate_cast", "cv::saturate_cast", "saturate_cast").javaNames("float16SaturateCast")) - .put(new Info("cv::normL2Sqr", "cv::normL1", "cv::seqPopMulti").skip()) + .put(new Info("cv::normL2Sqr", "cv::normL1", "cv::seqPopMulti", "cv::hal::polarToCart32f", "cv::hal::polarToCart64f").skip()) .put(new Info("cv::Formatted(cv::Mat&, cv::Formatter*, int*)").javaText( "public Formatted(@Const @ByRef Mat m, @Const Formatter fmt,\n" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java index 54ec00a50ea..2ba025e713c 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudaarithm@.409", + link = "opencv_cudaarithm@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudaarithm490", + link = "opencv_cudaarithm4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java index 829e0ef1b59..3d5fe9fe733 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudabgsegm@.409", + link = "opencv_cudabgsegm@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudabgsegm490", + link = "opencv_cudabgsegm4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java index a21e6fc8c65..16cc7f38b3b 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java @@ -34,12 +34,12 @@ @Platform( not = "macosx", include = "", - link = "opencv_cudacodec@.409", + link = "opencv_cudacodec@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudacodec490", + link = "opencv_cudacodec4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java index e9dcb5476c7..9c4d1d84e6f 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java @@ -37,12 +37,12 @@ value = { @Platform( include = "", - link = "opencv_cudafeatures2d@.409", + link = "opencv_cudafeatures2d@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudafeatures2d490", + link = "opencv_cudafeatures2d4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java index 2ac4530a5d2..a198071a904 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java @@ -36,12 +36,12 @@ value = { @Platform( include = "", - link = "opencv_cudafilters@.409", + link = "opencv_cudafilters@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudafilters490", + link = "opencv_cudafilters4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java index ef7fc54d30c..ae53e05c616 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudaimgproc@.409", + link = "opencv_cudaimgproc@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudaimgproc490", + link = "opencv_cudaimgproc4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java index a75a709d0df..a1ea9d08a24 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java @@ -40,14 +40,14 @@ value = { @Platform( include = "", - link = "opencv_cudaobjdetect@.409", - preload = "opencv_cudalegacy@.409", + link = "opencv_cudaobjdetect@.410", + preload = "opencv_cudalegacy@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudaobjdetect490", - preload = "opencv_cudalegacy490", + link = "opencv_cudaobjdetect4100", + preload = "opencv_cudalegacy4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java index 18223234f76..88fb5c6629f 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java @@ -40,14 +40,14 @@ value = { @Platform( include = "", - link = "opencv_cudaoptflow@.409", - preload = "opencv_cudalegacy@.409", + link = "opencv_cudaoptflow@.410", + preload = "opencv_cudalegacy@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudaoptflow490", - preload = "opencv_cudalegacy490", + link = "opencv_cudaoptflow4100", + preload = "opencv_cudalegacy4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java index 78629404625..7d735410bcd 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudastereo@.409", + link = "opencv_cudastereo@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudastereo490", + link = "opencv_cudastereo4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java index 5ab30e3074b..3cfaffe22ba 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudawarping@.409", + link = "opencv_cudawarping@.410", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudawarping490", + link = "opencv_cudawarping4100", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java index b2a14187e85..862e5eff4ae 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java @@ -37,9 +37,9 @@ value = { @Platform(include = {"", "", "","", "", "", ""}, - link = "opencv_dnn@.409"), + link = "opencv_dnn@.410"), @Platform(value = "ios", preload = "libopencv_dnn"), - @Platform(value = "windows", link = "opencv_dnn490")}, + @Platform(value = "windows", link = "opencv_dnn4100")}, target = "org.bytedeco.opencv.opencv_dnn", global = "org.bytedeco.opencv.global.opencv_dnn" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java index 1ba10d5f936..0446b30229a 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java @@ -35,9 +35,9 @@ @Properties( inherit = {opencv_dnn.class, opencv_quality.class}, value = { - @Platform(include = "", link = "opencv_dnn_superres@.409"), + @Platform(include = "", link = "opencv_dnn_superres@.410"), @Platform(value = "ios", preload = "libopencv_dnn_superres"), - @Platform(value = "windows", link = "opencv_dnn_superres490")}, + @Platform(value = "windows", link = "opencv_dnn_superres4100")}, target = "org.bytedeco.opencv.opencv_dnn_superres", global = "org.bytedeco.opencv.global.opencv_dnn_superres" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java index d5edecc102a..42d1348cbb4 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java @@ -38,9 +38,9 @@ @Platform(include = {"", "", "", "", "", "", "", ""}, - link = "opencv_face@.409"), + link = "opencv_face@.410"), @Platform(value = "ios", preload = "libopencv_face"), - @Platform(value = "windows", link = "opencv_face490")}, + @Platform(value = "windows", link = "opencv_face4100")}, target = "org.bytedeco.opencv.opencv_face", global = "org.bytedeco.opencv.global.opencv_face" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java index e9b3135d748..139aa077b71 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java @@ -35,9 +35,9 @@ @Properties( inherit = {opencv_highgui.class, opencv_flann.class}, value = { - @Platform(include = "", link = "opencv_features2d@.409"), + @Platform(include = "", link = "opencv_features2d@.410"), @Platform(value = "ios", preload = "libopencv_features2d"), - @Platform(value = "windows", link = "opencv_features2d490")}, + @Platform(value = "windows", link = "opencv_features2d4100")}, target = "org.bytedeco.opencv.opencv_features2d", global = "org.bytedeco.opencv.global.opencv_features2d" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java index 5fdb2f14243..d133edafc20 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java @@ -35,9 +35,9 @@ @Properties( inherit = opencv_core.class, value = { - @Platform(include = {"", ""}, link = "opencv_flann@.409"), + @Platform(include = {"", ""}, link = "opencv_flann@.410"), @Platform(value = "ios", preload = "libopencv_flann"), - @Platform(value = "windows", link = "opencv_flann490")}, + @Platform(value = "windows", link = "opencv_flann4100")}, target = "org.bytedeco.opencv.opencv_flann", global = "org.bytedeco.opencv.global.opencv_flann" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_highgui.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_highgui.java index 0eca3fd38d4..8264b571a33 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_highgui.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_highgui.java @@ -35,9 +35,9 @@ @Properties( inherit = opencv_videoio.class, value = { - @Platform(include = {"", ""}, link = "opencv_highgui@.409"), + @Platform(include = {"", ""}, link = "opencv_highgui@.410"), @Platform(value = "ios", preload = "libopencv_highgui"), - @Platform(value = "windows", link = "opencv_highgui490")}, + @Platform(value = "windows", link = "opencv_highgui4100")}, target = "org.bytedeco.opencv.opencv_highgui", global = "org.bytedeco.opencv.global.opencv_highgui" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_img_hash.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_img_hash.java index 2f84f246380..ecb0195ee1b 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_img_hash.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_img_hash.java @@ -42,10 +42,10 @@ "", "", }, - link = "opencv_img_hash@.409" + link = "opencv_img_hash@.410" ), @Platform(value = "ios", preload = "libopencv_img_hash"), - @Platform(value = "windows", link = "opencv_img_hash490") + @Platform(value = "windows", link = "opencv_img_hash4100") }, target = "org.bytedeco.opencv.opencv_img_hash", global = "org.bytedeco.opencv.global.opencv_img_hash" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgcodecs.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgcodecs.java index 4d81f8f1be2..5a5b47de413 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgcodecs.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgcodecs.java @@ -35,9 +35,9 @@ @Properties( inherit = opencv_imgproc.class, value = { - @Platform(include = {/*"",*/ ""}, link = "opencv_imgcodecs@.409"), + @Platform(include = {/*"",*/ ""}, link = "opencv_imgcodecs@.410"), @Platform(value = "ios", preload = "libopencv_imgcodecs"), - @Platform(value = "windows", link = "opencv_imgcodecs490")}, + @Platform(value = "windows", link = "opencv_imgcodecs4100")}, global = "org.bytedeco.opencv.global.opencv_imgcodecs", helper = "org.bytedeco.opencv.helper.opencv_imgcodecs" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgproc.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgproc.java index 333f328a716..87f024b4ad3 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgproc.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgproc.java @@ -36,9 +36,9 @@ inherit = opencv_core.class, value = { @Platform(include = {"", "", "", - ""}, link = "opencv_imgproc@.409"), + ""}, link = "opencv_imgproc@.410"), @Platform(value = "ios", preload = "libopencv_imgproc"), - @Platform(value = "windows", link = "opencv_imgproc490")}, + @Platform(value = "windows", link = "opencv_imgproc4100")}, target = "org.bytedeco.opencv.opencv_imgproc", global = "org.bytedeco.opencv.global.opencv_imgproc", helper = "org.bytedeco.opencv.helper.opencv_imgproc" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_intensity_transform.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_intensity_transform.java index 3e20eec1211..b4c425c7c2c 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_intensity_transform.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_intensity_transform.java @@ -31,9 +31,9 @@ @Properties( inherit = opencv_core.class, value = { - @Platform(include = "", link = "opencv_intensity_transform@.409"), + @Platform(include = "", link = "opencv_intensity_transform@.410"), @Platform(value = "ios", preload = "libopencv_intensity_transform"), - @Platform(value = "windows", link = "opencv_intensity_transform490") + @Platform(value = "windows", link = "opencv_intensity_transform4100") }, global = "org.bytedeco.opencv.global.opencv_intensity_transform" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_mcc.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_mcc.java index 73e2c0dee05..09dce0c8e71 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_mcc.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_mcc.java @@ -35,9 +35,9 @@ "", "", "", - ""}, link = "opencv_mcc@.409"), + ""}, link = "opencv_mcc@.410"), @Platform(value = "ios", preload = "libopencv_mcc"), - @Platform(value = "windows", link = "opencv_mcc490") + @Platform(value = "windows", link = "opencv_mcc4100") }, target = "org.bytedeco.opencv.opencv_mcc", global = "org.bytedeco.opencv.global.opencv_mcc" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ml.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ml.java index 04cdab94722..67a56ece6b2 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ml.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ml.java @@ -34,9 +34,9 @@ @Properties( inherit = opencv_core.class, value = { - @Platform(include = "", link = "opencv_ml@.409"), + @Platform(include = "", link = "opencv_ml@.410"), @Platform(value = "ios", preload = "libopencv_ml"), - @Platform(value = "windows", link = "opencv_ml490")}, + @Platform(value = "windows", link = "opencv_ml4100")}, target = "org.bytedeco.opencv.opencv_ml", global = "org.bytedeco.opencv.global.opencv_ml" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_objdetect.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_objdetect.java index 863556af7df..5d37ae6bc3b 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_objdetect.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_objdetect.java @@ -39,9 +39,9 @@ "opencv2/objdetect/graphical_code_detector.hpp", "", "", "", "", "", - "", ""}, link = "opencv_objdetect@.409"), + "", ""}, link = "opencv_objdetect@.410"), @Platform(value = "ios", preload = "libopencv_objdetect"), - @Platform(value = "windows", link = "opencv_objdetect490")}, + @Platform(value = "windows", link = "opencv_objdetect4100")}, target = "org.bytedeco.opencv.opencv_objdetect", global = "org.bytedeco.opencv.global.opencv_objdetect" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_optflow.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_optflow.java index 942702f4c9b..d7716e746c7 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_optflow.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_optflow.java @@ -34,9 +34,9 @@ @Properties( inherit = {opencv_ximgproc.class, opencv_video.class}, value = { - @Platform(include = {"", ""}, link = "opencv_optflow@.409"), + @Platform(include = {"", ""}, link = "opencv_optflow@.410"), @Platform(value = "ios", preload = "libopencv_optflow"), - @Platform(value = "windows", link = "opencv_optflow490")}, + @Platform(value = "windows", link = "opencv_optflow4100")}, target = "org.bytedeco.opencv.opencv_optflow", global = "org.bytedeco.opencv.global.opencv_optflow" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_phase_unwrapping.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_phase_unwrapping.java index e3f8b7b1215..ba3da411f13 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_phase_unwrapping.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_phase_unwrapping.java @@ -37,10 +37,10 @@ "", "", }, - link = "opencv_phase_unwrapping@.409" + link = "opencv_phase_unwrapping@.410" ), @Platform(value = "ios", preload = "libopencv_phase_unwrapping"), - @Platform(value = "windows", link = "opencv_phase_unwrapping490") + @Platform(value = "windows", link = "opencv_phase_unwrapping4100") }, target = "org.bytedeco.opencv.opencv_phase_unwrapping", global = "org.bytedeco.opencv.global.opencv_phase_unwrapping" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_photo.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_photo.java index 448df73275c..0c36f56e43c 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_photo.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_photo.java @@ -35,11 +35,11 @@ inherit = opencv_imgproc.class, value = { @Platform(include = {/*"",*/ "", ""}, - link = "opencv_photo@.409", - preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", "opencv_cudaimgproc@.409"}), + link = "opencv_photo@.410", + preload = {"opencv_cuda@.410", "opencv_cudaarithm@.410", "opencv_cudafilters@.410", "opencv_cudaimgproc@.410"}), @Platform(value = "ios", preload = "libopencv_photo"), - @Platform(value = "windows", link = "opencv_photo490", - preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", "opencv_cudaimgproc490"})}, + @Platform(value = "windows", link = "opencv_photo4100", + preload = {"opencv_cuda4100", "opencv_cudaarithm4100", "opencv_cudafilters4100", "opencv_cudaimgproc4100"})}, target = "org.bytedeco.opencv.opencv_photo", global = "org.bytedeco.opencv.global.opencv_photo" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_plot.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_plot.java index 29be2f5d0cf..aebf0043c65 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_plot.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_plot.java @@ -33,10 +33,10 @@ value = { @Platform( include = "opencv2/plot.hpp", - link = "opencv_plot@.409" + link = "opencv_plot@.410" ), @Platform(value = "ios", preload = "libopencv_plot"), - @Platform(value = "windows", link = "opencv_plot490") + @Platform(value = "windows", link = "opencv_plot4100") }, target = "org.bytedeco.opencv.opencv_plot", global = "org.bytedeco.opencv.global.opencv_plot" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_quality.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_quality.java index 3d4a3d4fe03..45893d92b6e 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_quality.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_quality.java @@ -42,10 +42,10 @@ "", "", }, - link = "opencv_quality@.409" + link = "opencv_quality@.410" ), @Platform(value = "ios", preload = "libopencv_quality"), - @Platform(value = "windows", link = "opencv_quality490") + @Platform(value = "windows", link = "opencv_quality4100") }, target = "org.bytedeco.opencv.opencv_quality", global = "org.bytedeco.opencv.global.opencv_quality" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_rapid.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_rapid.java index d4f19d0d00d..6946700d840 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_rapid.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_rapid.java @@ -31,9 +31,9 @@ @Properties( inherit = opencv_calib3d.class, value = { - @Platform(include = "", link = "opencv_rapid@.409"), + @Platform(include = "", link = "opencv_rapid@.410"), @Platform(value = "ios", preload = "libopencv_rapid"), - @Platform(value = "windows", link = "opencv_rapid490") + @Platform(value = "windows", link = "opencv_rapid4100") }, target = "org.bytedeco.opencv.opencv_rapid", global = "org.bytedeco.opencv.global.opencv_rapid" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_saliency.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_saliency.java index 1274dcd328c..6acae56229f 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_saliency.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_saliency.java @@ -37,10 +37,10 @@ "", "" }, - link = "opencv_saliency@.409" + link = "opencv_saliency@.410" ), @Platform(value = "ios", preload = "libopencv_saliency"), - @Platform(value = "windows", link = "opencv_saliency490") + @Platform(value = "windows", link = "opencv_saliency4100") }, target = "org.bytedeco.opencv.opencv_saliency", global = "org.bytedeco.opencv.global.opencv_saliency" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_shape.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_shape.java index ecd3b65f5bb..7f2b1d98cd9 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_shape.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_shape.java @@ -37,9 +37,9 @@ value = { @Platform(include = { "", "", "", - "", ""}, link = "opencv_shape@.409"), + "", ""}, link = "opencv_shape@.410"), @Platform(value = "ios", preload = "libopencv_shape"), - @Platform(value = "windows", link = "opencv_shape490")}, + @Platform(value = "windows", link = "opencv_shape4100")}, target = "org.bytedeco.opencv.opencv_shape", global = "org.bytedeco.opencv.global.opencv_shape" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_signal.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_signal.java new file mode 100644 index 00000000000..e0fa2a60e7f --- /dev/null +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_signal.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2024 Samuel Audet + * + * Licensed either under the Apache License, Version 2.0, or (at your option) + * under the terms of the GNU General Public License as published by + * the Free Software Foundation (subject to the "Classpath" exception), + * either version 2, or any later version (collectively, the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.gnu.org/licenses/ + * http://www.gnu.org/software/classpath/license.html + * + * or as provided in the LICENSE.txt file that accompanied this code. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.bytedeco.opencv.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; + +/** + * + * @author Samuel Audet + */ +@Properties( + inherit = opencv_core.class, + value = { + @Platform(include = { + "", ""}, link = "opencv_signal@.410"), + @Platform(value = "ios", preload = "libopencv_signal"), + @Platform(value = "windows", link = "opencv_signal4100")}, + global = "org.bytedeco.opencv.global.opencv_signal" +) +public class opencv_signal implements InfoMapper { + public void map(InfoMap infoMap) { + } +} diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_stitching.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_stitching.java index fb403c42ab0..ac01e5942fe 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_stitching.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_stitching.java @@ -40,11 +40,11 @@ "", "", "", "", "", "", "", "", ""}, - link = "opencv_stitching@.409", preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", - "opencv_cudaimgproc@.409", "opencv_cudawarping@.409", "opencv_cudafeatures2d@.409", "opencv_cudalegacy@.409"}), + link = "opencv_stitching@.410", preload = {"opencv_cuda@.410", "opencv_cudaarithm@.410", "opencv_cudafilters@.410", + "opencv_cudaimgproc@.410", "opencv_cudawarping@.410", "opencv_cudafeatures2d@.410", "opencv_cudalegacy@.410"}), @Platform(value = "ios", preload = "libopencv_stitching"), - @Platform(value = "windows", link = "opencv_stitching490", preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", - "opencv_cudaimgproc490", "opencv_cudawarping490", "opencv_cudafeatures2d490", "opencv_cudalegacy490"})}, + @Platform(value = "windows", link = "opencv_stitching4100", preload = {"opencv_cuda4100", "opencv_cudaarithm4100", "opencv_cudafilters4100", + "opencv_cudaimgproc4100", "opencv_cudawarping4100", "opencv_cudafeatures2d4100", "opencv_cudalegacy4100"})}, target = "org.bytedeco.opencv.opencv_stitching", global = "org.bytedeco.opencv.global.opencv_stitching" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_structured_light.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_structured_light.java index 16e98f77d18..696d21ee505 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_structured_light.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_structured_light.java @@ -38,10 +38,10 @@ "", "", }, - link = "opencv_structured_light@.409" + link = "opencv_structured_light@.410" ), @Platform(value = "ios", preload = "libopencv_structured_light"), - @Platform(value = "windows", link = "opencv_structured_light490") + @Platform(value = "windows", link = "opencv_structured_light4100") }, target = "org.bytedeco.opencv.opencv_structured_light", global = "org.bytedeco.opencv.global.opencv_structured_light" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_superres.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_superres.java index 75df34c122b..1252f17227d 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_superres.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_superres.java @@ -35,14 +35,14 @@ @Properties( inherit = {opencv_objdetect.class, opencv_optflow.class}, value = { - @Platform(not = "ios", include = {"", ""}, link = "opencv_superres@.409", - preload = {"opencv_cuda@.409", "opencv_cudacodec@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", - "opencv_cudaimgproc@.409", "opencv_cudafeatures2d@.409", "opencv_cudalegacy@.409", - "opencv_cudaoptflow@.409", "opencv_cudawarping@.409"}), - @Platform(value = "windows", link = "opencv_superres490", - preload = {"opencv_cuda490", "opencv_cudacodec490", "opencv_cudaarithm490", "opencv_cudafilters490", - "opencv_cudaimgproc490", "opencv_cudafeatures2d490", "opencv_cudalegacy490", - "opencv_cudaoptflow490", "opencv_cudawarping490"})}, + @Platform(not = "ios", include = {"", ""}, link = "opencv_superres@.410", + preload = {"opencv_cuda@.410", "opencv_cudacodec@.410", "opencv_cudaarithm@.410", "opencv_cudafilters@.410", + "opencv_cudaimgproc@.410", "opencv_cudafeatures2d@.410", "opencv_cudalegacy@.410", + "opencv_cudaoptflow@.410", "opencv_cudawarping@.410"}), + @Platform(value = "windows", link = "opencv_superres4100", + preload = {"opencv_cuda4100", "opencv_cudacodec4100", "opencv_cudaarithm4100", "opencv_cudafilters4100", + "opencv_cudaimgproc4100", "opencv_cudafeatures2d4100", "opencv_cudalegacy4100", + "opencv_cudaoptflow4100", "opencv_cudawarping4100"})}, target = "org.bytedeco.opencv.opencv_superres", global = "org.bytedeco.opencv.global.opencv_superres" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_text.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_text.java index 94fefc89ecc..6901307381b 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_text.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_text.java @@ -37,9 +37,9 @@ inherit = {opencv_dnn.class, opencv_features2d.class, opencv_ml.class}, value = { @Platform(include = {"", "", "", "opencv2/text/textDetector.hpp"}, - link = "opencv_text@.409"), + link = "opencv_text@.410"), @Platform(value = "ios", preload = "libopencv_text"), - @Platform(value = "windows", link = "opencv_text490")}, + @Platform(value = "windows", link = "opencv_text4100")}, target = "org.bytedeco.opencv.opencv_text", global = "org.bytedeco.opencv.global.opencv_text" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_tracking.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_tracking.java index 4e90822e224..db8f5217ec2 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_tracking.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_tracking.java @@ -43,10 +43,10 @@ // "", // "", }, - link = "opencv_tracking@.409" + link = "opencv_tracking@.410" ), @Platform(value = "ios", preload = "libopencv_tracking"), - @Platform(value = "windows", link = "opencv_tracking490") + @Platform(value = "windows", link = "opencv_tracking4100") }, target = "org.bytedeco.opencv.opencv_tracking", global = "org.bytedeco.opencv.global.opencv_tracking" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_video.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_video.java index 1971734e349..6a7396c18aa 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_video.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_video.java @@ -36,9 +36,9 @@ inherit = {opencv_calib3d.class, opencv_dnn.class}, value = { @Platform(include = {"", /*"",*/ "", - ""}, link = "opencv_video@.409"), + ""}, link = "opencv_video@.410"), @Platform(value = "ios", preload = "libopencv_video"), - @Platform(value = "windows", link = "opencv_video490")}, + @Platform(value = "windows", link = "opencv_video4100")}, target = "org.bytedeco.opencv.opencv_video", global = "org.bytedeco.opencv.global.opencv_video" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videoio.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videoio.java index 6e981477b34..0ee82ea85d1 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videoio.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videoio.java @@ -35,12 +35,12 @@ @Properties( inherit = opencv_imgcodecs.class, value = { - @Platform(include = {/*"",*/ ""}, link = "opencv_videoio@.409"), + @Platform(include = {/*"",*/ ""}, link = "opencv_videoio@.410"), @Platform(value = "android", preload = { "native_camera_r2.2.0", "native_camera_r2.3.4", "native_camera_r3.0.1", "native_camera_r4.0.0", "native_camera_r4.0.3", "native_camera_r4.1.1", "native_camera_r4.2.0", "native_camera_r4.3.0", "native_camera_r4.4.0"}), @Platform(value = "ios", preload = "libopencv_videoio"), - @Platform(value = "windows", link = "opencv_videoio490", preload = {"opencv_ffmpeg490", "opencv_ffmpeg490_64"})}, + @Platform(value = "windows", link = "opencv_videoio4100", preload = {"opencv_ffmpeg4100", "opencv_ffmpeg4100_64"})}, target = "org.bytedeco.opencv.opencv_videoio", global = "org.bytedeco.opencv.global.opencv_videoio" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videostab.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videostab.java index c91545a7c45..93d7d15b216 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videostab.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videostab.java @@ -45,15 +45,15 @@ "", "", "", "", "", "", "", "", "", - "", ""}, link = "opencv_videostab@.409", - preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", - "opencv_cudaimgproc@.409", "opencv_cudafeatures2d@.409", "opencv_cudalegacy@.409", - "opencv_cudaoptflow@.409", "opencv_cudawarping@.409"}), + "", ""}, link = "opencv_videostab@.410", + preload = {"opencv_cuda@.410", "opencv_cudaarithm@.410", "opencv_cudafilters@.410", + "opencv_cudaimgproc@.410", "opencv_cudafeatures2d@.410", "opencv_cudalegacy@.410", + "opencv_cudaoptflow@.410", "opencv_cudawarping@.410"}), @Platform(value = "ios", preload = "libopencv_videostab"), - @Platform(value = "windows", link = "opencv_videostab490", - preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", - "opencv_cudaimgproc490", "opencv_cudafeatures2d490", "opencv_cudalegacy490", - "opencv_cudaoptflow490", "opencv_cudawarping490"})}, + @Platform(value = "windows", link = "opencv_videostab4100", + preload = {"opencv_cuda4100", "opencv_cudaarithm4100", "opencv_cudafilters4100", + "opencv_cudaimgproc4100", "opencv_cudafeatures2d4100", "opencv_cudalegacy4100", + "opencv_cudaoptflow4100", "opencv_cudawarping4100"})}, target = "org.bytedeco.opencv.opencv_videostab", global = "org.bytedeco.opencv.global.opencv_videostab" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_wechat_qrcode.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_wechat_qrcode.java index 6f415a55583..47ce3fede2b 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_wechat_qrcode.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_wechat_qrcode.java @@ -33,10 +33,10 @@ value = { @Platform( include = "", - link = "opencv_wechat_qrcode@.409" + link = "opencv_wechat_qrcode@.410" ), @Platform(value = "ios", preload = "libopencv_wechat_qrcode"), - @Platform(value = "windows", link = "opencv_wechat_qrcode490") + @Platform(value = "windows", link = "opencv_wechat_qrcode4100") }, target = "org.bytedeco.opencv.opencv_wechat_qrcode", global = "org.bytedeco.opencv.global.opencv_wechat_qrcode" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xfeatures2d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xfeatures2d.java index c07d9d565ab..bd20f8b05b5 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xfeatures2d.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xfeatures2d.java @@ -36,11 +36,11 @@ @Properties( inherit = {opencv_ml.class, opencv_shape.class}, value = { - @Platform(include = {"", ""}, link = "opencv_xfeatures2d@.409", - preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409"}), + @Platform(include = {"", ""}, link = "opencv_xfeatures2d@.410", + preload = {"opencv_cuda@.410", "opencv_cudaarithm@.410"}), @Platform(value = "ios", preload = "libopencv_xfeatures2d"), - @Platform(value = "windows", link = "opencv_xfeatures2d490", - preload = {"opencv_cuda490", "opencv_cudaarithm490"})}, + @Platform(value = "windows", link = "opencv_xfeatures2d4100", + preload = {"opencv_cuda4100", "opencv_cudaarithm4100"})}, target = "org.bytedeco.opencv.opencv_xfeatures2d", global = "org.bytedeco.opencv.global.opencv_xfeatures2d" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ximgproc.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ximgproc.java index e8b6f96e7af..0ddc58913c6 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ximgproc.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ximgproc.java @@ -41,9 +41,9 @@ "opencv2/ximgproc/slic.hpp", "opencv2/ximgproc/lsc.hpp", "opencv2/ximgproc/paillou_filter.hpp", "opencv2/ximgproc/fast_line_detector.hpp", "opencv2/ximgproc/deriche_filter.hpp", "opencv2/ximgproc/peilin.hpp", "opencv2/ximgproc/fourier_descriptors.hpp", "opencv2/ximgproc/ridgefilter.hpp", "opencv2/ximgproc/brightedges.hpp", "opencv2/ximgproc/run_length_morphology.hpp", "opencv2/ximgproc/edgepreserving_filter.hpp", - "opencv2/ximgproc/color_match.hpp", "opencv2/ximgproc/radon_transform.hpp", "opencv2/ximgproc/find_ellipses.hpp"}, link = "opencv_ximgproc@.409"), + "opencv2/ximgproc/color_match.hpp", "opencv2/ximgproc/radon_transform.hpp", "opencv2/ximgproc/find_ellipses.hpp"}, link = "opencv_ximgproc@.410"), @Platform(value = "ios", preload = "libopencv_ximgproc"), - @Platform(value = "windows", link = "opencv_ximgproc490")}, + @Platform(value = "windows", link = "opencv_ximgproc4100")}, target = "org.bytedeco.opencv.opencv_ximgproc", global = "org.bytedeco.opencv.global.opencv_ximgproc" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xphoto.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xphoto.java index 438f8be7d83..de1a3a7a639 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xphoto.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xphoto.java @@ -41,10 +41,10 @@ "", "", }, - link = "opencv_xphoto@.409" + link = "opencv_xphoto@.410" ), @Platform(value = "ios", preload = "libopencv_xphoto"), - @Platform(value = "windows", link = "opencv_xphoto490") + @Platform(value = "windows", link = "opencv_xphoto4100") }, target = "org.bytedeco.opencv.opencv_xphoto", global = "org.bytedeco.opencv.global.opencv_xphoto" diff --git a/platform/pom.xml b/platform/pom.xml index 7ee2032b15a..ef79c788b63 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -87,7 +87,7 @@ org.bytedeco opencv-platform - 4.9.0-${project.version} + 4.10.0-${project.version} org.bytedeco @@ -197,7 +197,7 @@ org.bytedeco cminpack-platform - 1.3.8-${project.version} + 1.3.9-${project.version} org.bytedeco @@ -207,22 +207,22 @@ org.bytedeco gsl-platform - 2.7-${project.version} + 2.8-${project.version} org.bytedeco cpython-platform - 3.12.3-${project.version} + 3.12.4-${project.version} org.bytedeco numpy-platform - 1.26.4-${project.version} + 2.0.0-${project.version} org.bytedeco scipy-platform - 1.13.0-${project.version} + 1.14.0-${project.version} @@ -257,7 +257,7 @@ org.bytedeco tesseract-platform - 5.3.4-${project.version} + 5.4.1-${project.version} @@ -332,7 +332,7 @@ org.bytedeco onnx-platform - 1.16.0-${project.version} + 1.16.1-${project.version} @@ -342,7 +342,7 @@ org.bytedeco onnxruntime-platform - 1.17.3-${project.version} + 1.18.0-${project.version} org.bytedeco diff --git a/pytorch/cppbuild.sh b/pytorch/cppbuild.sh index 523a8785296..1d805c3af39 100755 --- a/pytorch/cppbuild.sh +++ b/pytorch/cppbuild.sh @@ -71,7 +71,7 @@ if [[ -n "${BUILD_PATH:-}" ]]; then fi elif [[ -f "$P/include/openblas_config.h" ]]; then OPENBLAS_PATH="$P" - elif [[ -f "$P/python/numpy/core/include/numpy/numpyconfig.h" ]]; then + elif [[ -f "$P/python/numpy/_core/include/numpy/numpyconfig.h" ]]; then NUMPY_PATH="$P" fi done diff --git a/pytorch/pom.xml b/pytorch/pom.xml index aa4f8e569bc..9ccf181e047 100644 --- a/pytorch/pom.xml +++ b/pytorch/pom.xml @@ -46,12 +46,12 @@ org.bytedeco numpy-platform - 1.26.4-${project.parent.version} + 2.0.0-${project.parent.version} org.bytedeco cpython - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} ${os.name}-${os.arch} diff --git a/scipy/README.md b/scipy/README.md index d580fd18d05..10edbc2a1cb 100644 --- a/scipy/README.md +++ b/scipy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * SciPy 1.13.0 https://www.scipy.org/ + * SciPy 1.14.0 https://www.scipy.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco scipy-platform - 1.13.0-1.5.11-SNAPSHOT + 1.14.0-1.5.11-SNAPSHOT diff --git a/scipy/cppbuild.sh b/scipy/cppbuild.sh index 5fa33b4b746..8757b6ef0ea 100755 --- a/scipy/cppbuild.sh +++ b/scipy/cppbuild.sh @@ -8,12 +8,13 @@ if [[ -z "$PLATFORM" ]]; then fi BOOST=1_75_0 -SCIPY_VERSION=1.13.0 +SCIPY_VERSION=1.14.0rc2 download http://downloads.sourceforge.net/project/boost/boost/${BOOST//_/.}/boost_$BOOST.tar.gz boost_$BOOST.tar.gz -download https://github.com/data-apis/array-api-compat/archive/05548f0.tar.gz array-api-compat-05548f0.tar.gz +download https://github.com/data-apis/array-api-compat/archive/fd22a73.tar.gz array-api-compat-fd22a73.tar.gz +download https://github.com/cobyqa/cobyqa/archive/7f40b6d.tar.gz cobyqa-7f40b6d.tar.gz download https://github.com/scipy/HiGHS/archive/4a12295.tar.gz HiGHS-4a12295.tar.gz download https://github.com/scipy/unuran/archive/21810c8.tar.gz unuran-21810c8.tar.gz -download https://github.com/scipy/pocketfft/archive/0bf2b51.tar.gz pocketfft-0bf2b51.tar.gz +download https://github.com/scipy/pocketfft/archive/9367142.tar.gz pocketfft-9367142.tar.gz download https://github.com/scipy/PROPACK/archive/96f6800.tar.gz PROPACK-96f6800.tar.gz download https://github.com/scipy/scipy/archive/v$SCIPY_VERSION.tar.gz scipy-$SCIPY_VERSION.tar.gz @@ -39,7 +40,7 @@ if [[ -n "${BUILD_PATH:-}" ]]; then fi elif [[ -f "$P/include/openblas_config.h" ]]; then OPENBLAS_PATH="$P" - elif [[ -f "$P/python/numpy/core/include/numpy/numpyconfig.h" ]]; then + elif [[ -f "$P/python/numpy/_core/include/numpy/numpyconfig.h" ]]; then NUMPY_PATH="$P" fi done @@ -53,7 +54,8 @@ NUMPY_PATH="${NUMPY_PATH//\\//}" echo "Decompressing archives..." tar --totals -xzf ../boost_$BOOST.tar.gz -tar --totals -xzf ../array-api-compat-*.tar.gz +tar --totals -xzf ../array-api-compat-*.tar.gz || true +tar --totals -xzf ../cobyqa-*.tar.gz tar --totals -xzf ../HiGHS-*.tar.gz tar --totals -xzf ../unuran-*.tar.gz tar --totals -xzf ../pocketfft-*.tar.gz @@ -61,6 +63,7 @@ tar --totals -xzf ../PROPACK-*.tar.gz tar --totals -xzf ../scipy-$SCIPY_VERSION.tar.gz cp -a boost_$BOOST/* scipy-$SCIPY_VERSION/scipy/_lib/boost_math/ cp -a array-api-compat-*/* scipy-$SCIPY_VERSION/scipy/_lib/array_api_compat/ +cp -a cobyqa-*/* scipy-$SCIPY_VERSION/scipy/_lib/cobyqa/ cp -a HiGHS-*/* scipy-$SCIPY_VERSION/scipy/_lib/highs/ cp -a unuran-*/* scipy-$SCIPY_VERSION/scipy/_lib/unuran/ cp -a pocketfft-*/* scipy-$SCIPY_VERSION/scipy/_lib/pocketfft/ @@ -121,7 +124,7 @@ if ! $PYTHON_BIN_PATH -m pip install --no-deps --target=$PYTHON_LIB_PATH $TOOLS; echo "extra_link_args = -lgfortran" >> site.cfg chmod +x "$CPYTHON_HOST_PATH/bin/python3.12" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CPYTHON_HOST_PATH/lib/:$CPYTHON_HOST_PATH" - "$CPYTHON_HOST_PATH/bin/python3.12" -m pip install --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.12/" crossenv==1.4 numpy==1.26.4 $TOOLS + "$CPYTHON_HOST_PATH/bin/python3.12" -m pip install --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.12/" crossenv==1.4 numpy==2.0.0 $TOOLS "$CPYTHON_HOST_PATH/bin/python3.12" -m crossenv "$PYTHON_BIN_PATH" crossenv cp -a "$NUMPY_PATH/python/numpy" "$CPYTHON_HOST_PATH/lib/python3.12/" # cp -a "$CPYTHON_HOST_PATH/lib/python3.12/include" "$PYTHON_LIB_PATH" diff --git a/scipy/platform/pom.xml b/scipy/platform/pom.xml index 6f289a7276a..68a5cd2ccee 100644 --- a/scipy/platform/pom.xml +++ b/scipy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco scipy-platform - 1.13.0-${project.parent.version} + 1.14.0-${project.parent.version} JavaCPP Presets Platform for SciPy @@ -23,7 +23,7 @@ org.bytedeco numpy-platform - 1.26.4-${project.parent.version} + 2.0.0-${project.parent.version} ${project.groupId} diff --git a/scipy/pom.xml b/scipy/pom.xml index 97226e4ad26..8cf7e239686 100644 --- a/scipy/pom.xml +++ b/scipy/pom.xml @@ -11,14 +11,14 @@ org.bytedeco scipy - 1.13.0-${project.parent.version} + 1.14.0-${project.parent.version} JavaCPP Presets for SciPy org.bytedeco numpy - 1.26.4-${project.parent.version} + 2.0.0-${project.parent.version} org.bytedeco @@ -41,7 +41,7 @@ org.bytedeco numpy - 1.26.4-${project.parent.version} + 2.0.0-${project.parent.version} org.bytedeco @@ -52,13 +52,13 @@ org.bytedeco cpython - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} ${javacpp.platform} org.bytedeco numpy - 1.26.4-${project.parent.version} + 2.0.0-${project.parent.version} ${javacpp.platform} @@ -80,14 +80,14 @@ ${basedir}/../cpython/cppbuild/${javacpp.platform}/include/python3.12/ ${basedir}/../numpy/src/main/resources/org/bytedeco/numpy/include/ ${basedir}/../numpy/target/classes/org/bytedeco/numpy/include/ - ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/core/include/ - ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/core/include/numpy/ + ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/_core/include/ + ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/_core/include/numpy/ ${basedir}/../openblas/cppbuild/${javacpp.platform}/lib/ ${basedir}/../cpython/cppbuild/${javacpp.platform}/lib/ ${basedir}/../cpython/cppbuild/${javacpp.platform}/libs/ - ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/core/lib/ + ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/_core/lib/ ${basedir}/../openblas/cppbuild/${javacpp.platform}/bin/ @@ -110,8 +110,8 @@ /org/bytedeco/cpython/${javacpp.platform}/include/ /org/bytedeco/cpython/${javacpp.platform}/include/python3.12/ /org/bytedeco/numpy/include/ - /org/bytedeco/numpy/${javacpp.platform}/python/numpy/core/include/ - /org/bytedeco/numpy/${javacpp.platform}/python/numpy/core/include/numpy/ + /org/bytedeco/numpy/${javacpp.platform}/python/numpy/_core/include/ + /org/bytedeco/numpy/${javacpp.platform}/python/numpy/_core/include/numpy/ /${javacpp.platform.library.path}/ @@ -122,7 +122,7 @@ /org/bytedeco/cpython/${javacpp.platform}/lib/ /org/bytedeco/cpython/${javacpp.platform}/libs/ /org/bytedeco/numpy/${javacpp.platform}/ - /org/bytedeco/numpy/${javacpp.platform}/python/numpy/core/lib/ + /org/bytedeco/numpy/${javacpp.platform}/python/numpy/_core/lib/ @@ -177,7 +177,7 @@ org.bytedeco cpython - 3.12.3-${project.parent.version} + 3.12.4-${project.parent.version} ${os.name}-${os.arch} diff --git a/scipy/samples/pom.xml b/scipy/samples/pom.xml index e3cba89fe41..a577aa2135f 100644 --- a/scipy/samples/pom.xml +++ b/scipy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco scipy-platform - 1.13.0-1.5.11-SNAPSHOT + 1.14.0-1.5.11-SNAPSHOT diff --git a/tesseract/README.md b/tesseract/README.md index 6dd11c8c569..b84dd5e2c07 100644 --- a/tesseract/README.md +++ b/tesseract/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * Tesseract 5.3.4 https://github.com/tesseract-ocr + * Tesseract 5.4.1 https://github.com/tesseract-ocr Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -39,7 +39,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.tesseract BasicExample - 1.5.10 + 1.5.11-SNAPSHOT BasicExample @@ -47,7 +47,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco tesseract-platform - 5.3.4-1.5.10 + 5.4.1-1.5.11-SNAPSHOT diff --git a/tesseract/cppbuild.sh b/tesseract/cppbuild.sh index 8e4b44ed149..27070c4b1dc 100755 --- a/tesseract/cppbuild.sh +++ b/tesseract/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -TESSERACT_VERSION=5.3.4 +TESSERACT_VERSION=5.4.1 download https://github.com/tesseract-ocr/tesseract/archive/$TESSERACT_VERSION.tar.gz tesseract-$TESSERACT_VERSION.tar.gz mkdir -p $PLATFORM diff --git a/tesseract/platform/pom.xml b/tesseract/platform/pom.xml index d22fe537663..37f0d5351a8 100644 --- a/tesseract/platform/pom.xml +++ b/tesseract/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tesseract-platform - 5.3.4-${project.parent.version} + 5.4.1-${project.parent.version} JavaCPP Presets Platform for Tesseract diff --git a/tesseract/pom.xml b/tesseract/pom.xml index 9af951bc501..21950f74384 100644 --- a/tesseract/pom.xml +++ b/tesseract/pom.xml @@ -11,7 +11,7 @@ org.bytedeco tesseract - 5.3.4-${project.parent.version} + 5.4.1-${project.parent.version} JavaCPP Presets for Tesseract diff --git a/tesseract/samples/pom.xml b/tesseract/samples/pom.xml index 9fc2258fea0..df04a02842b 100644 --- a/tesseract/samples/pom.xml +++ b/tesseract/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tesseract-platform - 5.3.4-1.5.11-SNAPSHOT + 5.4.1-1.5.11-SNAPSHOT diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/BLOB_CHOICE_IT.java b/tesseract/src/gen/java/org/bytedeco/tesseract/BLOB_CHOICE_IT.java index 4599324b15a..ce1644ee0af 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/BLOB_CHOICE_IT.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/BLOB_CHOICE_IT.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/BLOCK_LIST.java b/tesseract/src/gen/java/org/bytedeco/tesseract/BLOCK_LIST.java index 0c2b5116a40..575675493cb 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/BLOCK_LIST.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/BLOCK_LIST.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/BlamerBundle.java b/tesseract/src/gen/java/org/bytedeco/tesseract/BlamerBundle.java index 23277d4a315..b53544a92db 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/BlamerBundle.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/BlamerBundle.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/ByteVector.java b/tesseract/src/gen/java/org/bytedeco/tesseract/ByteVector.java index d0f1cfb7e06..4771b63bce7 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/ByteVector.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/ByteVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/CANCEL_FUNC.java b/tesseract/src/gen/java/org/bytedeco/tesseract/CANCEL_FUNC.java index 5e22213e377..eb12a0c5263 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/CANCEL_FUNC.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/CANCEL_FUNC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/C_BLOB_IT.java b/tesseract/src/gen/java/org/bytedeco/tesseract/C_BLOB_IT.java index 0dd6905e60b..137177b24e0 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/C_BLOB_IT.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/C_BLOB_IT.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/ChoiceIterator.java b/tesseract/src/gen/java/org/bytedeco/tesseract/ChoiceIterator.java index ebece18b457..05c8975182e 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/ChoiceIterator.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/ChoiceIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/Dawg.java b/tesseract/src/gen/java/org/bytedeco/tesseract/Dawg.java index 81042097c16..4ad0b0f278d 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/Dawg.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/Dawg.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/Dict.java b/tesseract/src/gen/java/org/bytedeco/tesseract/Dict.java index 374d437126a..1167e9e30bc 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/Dict.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/Dict.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/DictFunc.java b/tesseract/src/gen/java/org/bytedeco/tesseract/DictFunc.java index 77862c76ecc..80349c15feb 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/DictFunc.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/DictFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/EANYCODE_CHAR.java b/tesseract/src/gen/java/org/bytedeco/tesseract/EANYCODE_CHAR.java index bec86b85f76..1dbe2abf90c 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/EANYCODE_CHAR.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/EANYCODE_CHAR.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/ETEXT_DESC.java b/tesseract/src/gen/java/org/bytedeco/tesseract/ETEXT_DESC.java index 294221d28d4..1e42d1d3cd9 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/ETEXT_DESC.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/ETEXT_DESC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/EquationDetect.java b/tesseract/src/gen/java/org/bytedeco/tesseract/EquationDetect.java index 119d1b7151e..160375021fb 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/EquationDetect.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/EquationDetect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/FileReader.java b/tesseract/src/gen/java/org/bytedeco/tesseract/FileReader.java index 33816bc3049..fe3b7618426 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/FileReader.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/FileReader.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/ImageThresholder.java b/tesseract/src/gen/java/org/bytedeco/tesseract/ImageThresholder.java index b77d45ddd7d..a56b7372158 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/ImageThresholder.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/ImageThresholder.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/LTRResultIterator.java b/tesseract/src/gen/java/org/bytedeco/tesseract/LTRResultIterator.java index 814f87448d5..d6db6838772 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/LTRResultIterator.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/LTRResultIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/MutableIterator.java b/tesseract/src/gen/java/org/bytedeco/tesseract/MutableIterator.java index 1360751b795..f77af9ff50d 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/MutableIterator.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/MutableIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/OSResults.java b/tesseract/src/gen/java/org/bytedeco/tesseract/OSResults.java index 4489c5b0b0d..ea81d3995e8 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/OSResults.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/OSResults.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/PAGE_RES.java b/tesseract/src/gen/java/org/bytedeco/tesseract/PAGE_RES.java index bd341373689..bc2e27bb664 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/PAGE_RES.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/PAGE_RES.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/PAGE_RES_IT.java b/tesseract/src/gen/java/org/bytedeco/tesseract/PAGE_RES_IT.java index b27e2a78e6c..1116bfffce8 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/PAGE_RES_IT.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/PAGE_RES_IT.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/PROGRESS_FUNC.java b/tesseract/src/gen/java/org/bytedeco/tesseract/PROGRESS_FUNC.java index 060dc5f2260..636d53d7fdb 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/PROGRESS_FUNC.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/PROGRESS_FUNC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/PROGRESS_FUNC2.java b/tesseract/src/gen/java/org/bytedeco/tesseract/PROGRESS_FUNC2.java index 2dac5075070..de6c38b9bc2 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/PROGRESS_FUNC2.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/PROGRESS_FUNC2.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/PageIterator.java b/tesseract/src/gen/java/org/bytedeco/tesseract/PageIterator.java index fa4a966b180..3eec20563c4 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/PageIterator.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/PageIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/ParagraphModel.java b/tesseract/src/gen/java/org/bytedeco/tesseract/ParagraphModel.java index e7727e341d2..77968638c23 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/ParagraphModel.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/ParagraphModel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/ProbabilityInContextFunc.java b/tesseract/src/gen/java/org/bytedeco/tesseract/ProbabilityInContextFunc.java index 3dabb6cb063..0d082612759 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/ProbabilityInContextFunc.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/ProbabilityInContextFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/ResultIterator.java b/tesseract/src/gen/java/org/bytedeco/tesseract/ResultIterator.java index 34ed05fde4b..6c0cf5bc846 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/ResultIterator.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/ResultIterator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/StringFloatPairVectorVector.java b/tesseract/src/gen/java/org/bytedeco/tesseract/StringFloatPairVectorVector.java index 6c844eb3e81..765d55055a6 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/StringFloatPairVectorVector.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/StringFloatPairVectorVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/StringVector.java b/tesseract/src/gen/java/org/bytedeco/tesseract/StringVector.java index 09300aa77cf..d56ca7d5caa 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/StringVector.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/StringVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessAltoRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessAltoRenderer.java index 2d888d25b71..c3f43f3ba95 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessAltoRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessAltoRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessBaseAPI.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessBaseAPI.java index 3f0ac092c89..35b04b449c7 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessBaseAPI.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessBaseAPI.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; @@ -47,16 +47,6 @@ public class TessBaseAPI extends Pointer { */ public static native @Cast("const char*") BytePointer Version(); - /** - * If compiled with OpenCL AND an available OpenCL - * device is deemed faster than serial code, then - * "device" is populated with the cl_device_id - * and returns sizeof(cl_device_id) - * otherwise *device=nullptr and returns 0. - */ - public static native @Cast("size_t") long getOpenCLDevice(@Cast("void**") PointerPointer device); - public static native @Cast("size_t") long getOpenCLDevice(@Cast("void**") @ByPtrPtr Pointer device); - /** * Set the name of the input file. Needed for training and * reading a UNLV zone file, and for searchable PDF output. @@ -394,6 +384,11 @@ public native void SetImage(@Cast("const unsigned char*") byte[] imagedata, int */ public native PIX GetThresholdedImage(); + /** + * Return average gradient of lines on page. + */ + public native float GetGradient(); + /** * Get the result of page layout analysis as a leptonica-style * Boxa, Pixa pair, in reading order. @@ -547,7 +542,7 @@ public native BOXA GetComponentImages(@Cast("const tesseract::PageIteratorLevel" * timeout_millisec terminates processing if any single page * takes too long. Set to 0 for unlimited time. * - * renderer is responible for creating the output. For example, + * renderer is responsible for creating the output. For example, * use the TessTextRenderer if you want plaintext output, or * the TessPDFRender to produce searchable PDF. * @@ -639,6 +634,18 @@ public native BOXA GetComponentImages(@Cast("const tesseract::PageIteratorLevel" */ public native @Cast("char*") BytePointer GetAltoText(int page_number); + /** + * Make an XML-formatted string with PAGE markup from the internal + * data structures. + */ + public native @Cast("char*") BytePointer GetPAGEText(ETEXT_DESC monitor, int page_number); + + /** + * Make an XML-formatted string with PAGE markup from the internal + * data structures. + */ + public native @Cast("char*") BytePointer GetPAGEText(int page_number); + /** * Make a TSV-formatted string from the internal data structures. * page_number is 0-based but will appear in the output as 1-based. diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessBoxTextRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessBoxTextRenderer.java index 5eb40419ec4..4a9f12bef1b 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessBoxTextRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessBoxTextRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessCancelFunc.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessCancelFunc.java index 22458305f64..109ee1bfd70 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessCancelFunc.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessCancelFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessHOcrRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessHOcrRenderer.java index 3eaad30a06c..6fea5159f92 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessHOcrRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessHOcrRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessLSTMBoxRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessLSTMBoxRenderer.java index d0496c6b427..28b6691f69e 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessLSTMBoxRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessLSTMBoxRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessOsdRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessOsdRenderer.java index 813b95b4905..81c41d509c5 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessOsdRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessOsdRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessPAGERenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessPAGERenderer.java new file mode 100644 index 00000000000..1b0f1f3bb67 --- /dev/null +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessPAGERenderer.java @@ -0,0 +1,29 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.tesseract; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import org.bytedeco.leptonica.*; +import static org.bytedeco.leptonica.global.leptonica.*; + +import static org.bytedeco.tesseract.global.tesseract.*; + + +/** + * Renders Tesseract output into a PAGE XML text string + */ +@Namespace("tesseract") @NoOffset @Properties(inherit = org.bytedeco.tesseract.presets.tesseract.class) +public class TessPAGERenderer extends TessResultRenderer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public TessPAGERenderer(Pointer p) { super(p); } + + public TessPAGERenderer(@Cast("const char*") BytePointer outputbase) { super((Pointer)null); allocate(outputbase); } + private native void allocate(@Cast("const char*") BytePointer outputbase); + public TessPAGERenderer(String outputbase) { super((Pointer)null); allocate(outputbase); } + private native void allocate(String outputbase); +} diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessPDFRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessPDFRenderer.java index 507a275e1ec..3d998ccfbf3 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessPDFRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessPDFRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessProgressFunc.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessProgressFunc.java index 6af9916786f..541e2cb5e8e 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessProgressFunc.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessProgressFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessResultRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessResultRenderer.java index 4cd2544cb15..f0e0ced5aa7 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessResultRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessResultRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessTextRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessTextRenderer.java index 9e06e8828eb..ff3bb198b21 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessTextRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessTextRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessTsvRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessTsvRenderer.java index 1815e8504d9..93e0e6bade5 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessTsvRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessTsvRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; @@ -13,6 +13,7 @@ import static org.bytedeco.tesseract.global.tesseract.*; + /** * Renders Tesseract output into a TSV string */ diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessUnlvRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessUnlvRenderer.java index 7e0b56c195f..b008a74e2a2 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessUnlvRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessUnlvRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessWordStrBoxRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessWordStrBoxRenderer.java index 27281a25664..66bb92b6896 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/TessWordStrBoxRenderer.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/TessWordStrBoxRenderer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/Tesseract.java b/tesseract/src/gen/java/org/bytedeco/tesseract/Tesseract.java index a35f1e2ad94..7253cef63b7 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/Tesseract.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/Tesseract.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/UNICHAR.java b/tesseract/src/gen/java/org/bytedeco/tesseract/UNICHAR.java index 17c09027e98..4449f0165f5 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/UNICHAR.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/UNICHAR.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/UNICHARSET.java b/tesseract/src/gen/java/org/bytedeco/tesseract/UNICHARSET.java index e7c1ca4e8a3..3eff4fe258b 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/UNICHARSET.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/UNICHARSET.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/WERD.java b/tesseract/src/gen/java/org/bytedeco/tesseract/WERD.java index 3976e26f12c..d551ea6f90d 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/WERD.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/WERD.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/WERD_RES.java b/tesseract/src/gen/java/org/bytedeco/tesseract/WERD_RES.java index a6dccecdb88..9158ac69f32 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/WERD_RES.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/WERD_RES.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/global/tesseract.java b/tesseract/src/gen/java/org/bytedeco/tesseract/global/tesseract.java index b07ede7a050..6bc99d21e07 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/global/tesseract.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/global/tesseract.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract.global; @@ -145,15 +145,15 @@ public class tesseract extends org.bytedeco.tesseract.presets.tesseract { // clang-format off public static final int TESSERACT_MAJOR_VERSION = 5; -public static final int TESSERACT_MINOR_VERSION = 3; -public static final int TESSERACT_MICRO_VERSION = 4; +public static final int TESSERACT_MINOR_VERSION = 4; +public static final int TESSERACT_MICRO_VERSION = 1; public static final int TESSERACT_VERSION = (TESSERACT_MAJOR_VERSION << 16 | TESSERACT_MINOR_VERSION << 8 | TESSERACT_MICRO_VERSION); -public static final String TESSERACT_VERSION_STR = "5.3.4"; +public static final String TESSERACT_VERSION_STR = "5.4.1"; // clang-format on @@ -619,6 +619,9 @@ public class tesseract extends org.bytedeco.tesseract.presets.tesseract { // Targeting ../TessAltoRenderer.java +// Targeting ../TessPAGERenderer.java + + // Targeting ../TessTsvRenderer.java @@ -841,6 +844,8 @@ public static native TessResultRenderer TessHOcrRendererCreate2(String outputbas @Cast("BOOL") boolean font_info); public static native TessResultRenderer TessAltoRendererCreate(@Cast("const char*") BytePointer outputbase); public static native TessResultRenderer TessAltoRendererCreate(String outputbase); +public static native TessResultRenderer TessPAGERendererCreate(@Cast("const char*") BytePointer outputbase); +public static native TessResultRenderer TessPAGERendererCreate(String outputbase); public static native TessResultRenderer TessTsvRendererCreate(@Cast("const char*") BytePointer outputbase); public static native TessResultRenderer TessTsvRendererCreate(String outputbase); public static native TessResultRenderer TessPDFRendererCreate(@Cast("const char*") BytePointer outputbase, @@ -882,9 +887,6 @@ public static native TessResultRenderer TessResultRendererNext( public static native TessBaseAPI TessBaseAPICreate(); public static native void TessBaseAPIDelete(TessBaseAPI handle); -public static native @Cast("size_t") long TessBaseAPIGetOpenCLDevice(TessBaseAPI handle, @Cast("void**") PointerPointer device); -public static native @Cast("size_t") long TessBaseAPIGetOpenCLDevice(TessBaseAPI handle, @Cast("void**") @ByPtrPtr Pointer device); - public static native void TessBaseAPISetInputName(TessBaseAPI handle, @Cast("const char*") BytePointer name); public static native void TessBaseAPISetInputName(TessBaseAPI handle, String name); public static native @Cast("const char*") BytePointer TessBaseAPIGetInputName(TessBaseAPI handle); @@ -1105,6 +1107,7 @@ public static native void TessBaseAPISetRectangle(TessBaseAPI handle, int left, int width, int height); public static native PIX TessBaseAPIGetThresholdedImage(TessBaseAPI handle); +public static native float TessBaseAPIGetGradient(TessBaseAPI handle); public static native BOXA TessBaseAPIGetRegions(TessBaseAPI handle, @Cast("Pixa**") PointerPointer pixa); public static native BOXA TessBaseAPIGetRegions(TessBaseAPI handle, @@ -1224,6 +1227,7 @@ public static native int TessBaseAPIGetThresholdedImageScaleFactor( public static native @Cast("char*") BytePointer TessBaseAPIGetHOCRText(TessBaseAPI handle, int page_number); public static native @Cast("char*") BytePointer TessBaseAPIGetAltoText(TessBaseAPI handle, int page_number); +public static native @Cast("char*") BytePointer TessBaseAPIGetPAGEText(TessBaseAPI handle, int page_number); public static native @Cast("char*") BytePointer TessBaseAPIGetTsvText(TessBaseAPI handle, int page_number); public static native @Cast("char*") BytePointer TessBaseAPIGetBoxText(TessBaseAPI handle, int page_number); diff --git a/tesseract/src/main/java/org/bytedeco/tesseract/presets/tesseract.java b/tesseract/src/main/java/org/bytedeco/tesseract/presets/tesseract.java index 940732bcb0e..a66cd961eda 100644 --- a/tesseract/src/main/java/org/bytedeco/tesseract/presets/tesseract.java +++ b/tesseract/src/main/java/org/bytedeco/tesseract/presets/tesseract.java @@ -42,9 +42,9 @@ @Platform(define = "TESS_CAPI_INCLUDE_BASEAPI", include = {"tesseract/export.h", /*"tesseract/osdetect.h",*/ "tesseract/unichar.h", "tesseract/version.h", "tesseract/publictypes.h", "tesseract/pageiterator.h", "tesseract/ocrclass.h", "tesseract/ltrresultiterator.h", "tesseract/renderer.h", "tesseract/resultiterator.h", "tesseract/baseapi.h", "tesseract/capi.h", "locale.h"}, - compiler = "cpp11", link = "tesseract@.5.3.4"/*, resource = {"include", "lib"}*/), + compiler = "cpp14", link = "tesseract@.5.4.1"/*, resource = {"include", "lib"}*/), @Platform(value = "android", link = "tesseract"), - @Platform(value = "windows", link = "tesseract53", preload = "libtesseract53") }) + @Platform(value = "windows", link = "tesseract54", preload = "libtesseract54") }) public class tesseract implements InfoMapper { static { Loader.checkVersion("org.bytedeco", "tesseract"); } diff --git a/tvm/cppbuild.sh b/tvm/cppbuild.sh index 95d81c61644..3c7c234ed1b 100755 --- a/tvm/cppbuild.sh +++ b/tvm/cppbuild.sh @@ -37,7 +37,7 @@ if [[ -n "${BUILD_PATH:-}" ]]; then CPYTHON_PATH="$P" elif [[ -f "$P/include/openblas_config.h" ]]; then OPENBLAS_PATH="$P" - elif [[ -f "$P/python/numpy/core/include/numpy/numpyconfig.h" ]]; then + elif [[ -f "$P/python/numpy/_core/include/numpy/numpyconfig.h" ]]; then NUMPY_PATH="$P" elif [[ -f "$P/python/scipy/version.py" ]]; then SCIPY_PATH="$P" diff --git a/tvm/platform/gpu/pom.xml b/tvm/platform/gpu/pom.xml index a4845bd12ed..f1188ef303d 100644 --- a/tvm/platform/gpu/pom.xml +++ b/tvm/platform/gpu/pom.xml @@ -39,7 +39,7 @@ org.bytedeco scipy-platform - 1.13.0-${project.parent.version} + 1.14.0-${project.parent.version} org.bytedeco diff --git a/tvm/platform/pom.xml b/tvm/platform/pom.xml index b3369c2a8b1..adbd2e36955 100644 --- a/tvm/platform/pom.xml +++ b/tvm/platform/pom.xml @@ -38,7 +38,7 @@ org.bytedeco scipy-platform - 1.13.0-${project.parent.version} + 1.14.0-${project.parent.version} org.bytedeco diff --git a/tvm/pom.xml b/tvm/pom.xml index 27d3c694171..2f0e59a7b0b 100644 --- a/tvm/pom.xml +++ b/tvm/pom.xml @@ -33,7 +33,7 @@ org.bytedeco scipy - 1.13.0-${project.parent.version} + 1.14.0-${project.parent.version} org.bytedeco @@ -71,7 +71,7 @@ org.bytedeco scipy-platform - 1.13.0-${project.parent.version} + 1.14.0-${project.parent.version} @@ -104,8 +104,8 @@ ${basedir}/../cpython/cppbuild/${javacpp.platform}/include/python3.12/ ${basedir}/../numpy/src/main/resources/org/bytedeco/numpy/include/ ${basedir}/../numpy/target/classes/org/bytedeco/numpy/include/ - ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/core/include/ - ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/core/include/numpy/ + ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/_core/include/ + ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/_core/include/numpy/ ${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/include/ @@ -115,7 +115,7 @@ ${basedir}/../openblas/cppbuild/${javacpp.platform}/lib/ ${basedir}/../cpython/cppbuild/${javacpp.platform}/lib/ ${basedir}/../cpython/cppbuild/${javacpp.platform}/libs/ - ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/core/lib/ + ${basedir}/../numpy/cppbuild/${javacpp.platform}/python/numpy/_core/lib/ ${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/lib/ @@ -151,8 +151,8 @@ /org/bytedeco/cpython/${javacpp.platform}/include/ /org/bytedeco/cpython/${javacpp.platform}/include/python3.12/ /org/bytedeco/numpy/include/ - /org/bytedeco/numpy/${javacpp.platform}/python/numpy/core/include/ - /org/bytedeco/numpy/${javacpp.platform}/python/numpy/core/include/numpy/ + /org/bytedeco/numpy/${javacpp.platform}/python/numpy/_core/include/ + /org/bytedeco/numpy/${javacpp.platform}/python/numpy/_core/include/numpy/ /${javacpp.platform.library.path}/ @@ -169,7 +169,7 @@ /org/bytedeco/cpython/${javacpp.platform}/lib/ /org/bytedeco/cpython/${javacpp.platform}/libs/ /org/bytedeco/numpy/${javacpp.platform}/ - /org/bytedeco/numpy/${javacpp.platform}/python/numpy/core/lib/ + /org/bytedeco/numpy/${javacpp.platform}/python/numpy/_core/lib/