From 6693a42f1993d7254c4f34b394990c78354d736f Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Fri, 13 Oct 2023 23:39:05 +0900 Subject: [PATCH] * Upgrade presets for OpenCV 4.8.1, DNNL 3.3, Leptonica 1.83.1, Tesseract 5.3.3, TensorFlow Lite 2.14.0, ONNX Runtime 1.16.1 --- CHANGELOG.md | 2 +- README.md | 6 +- dnnl/README.md | 6 +- dnnl/cppbuild.sh | 2 +- dnnl/platform/pom.xml | 2 +- dnnl/pom.xml | 2 +- dnnl/samples/pom.xml | 2 +- .../gen/java/org/bytedeco/dnnl/concat.java | 24 +- .../java/org/bytedeco/dnnl/global/dnnl.java | 113 +++++++++- .../dnnl/group_normalization_backward.java | 205 ++++++++++++++++++ .../dnnl/group_normalization_forward.java | 204 +++++++++++++++++ .../dnnl/layer_normalization_forward.java | 2 +- .../gen/java/org/bytedeco/dnnl/memory.java | 21 +- .../gen/java/org/bytedeco/dnnl/primitive.java | 4 +- .../bytedeco/dnnl/primitive_desc_base.java | 6 +- dnnl/src/gen/java/org/bytedeco/dnnl/sum.java | 50 +++-- leptonica/README.md | 6 +- leptonica/cppbuild.sh | 43 ++-- leptonica/platform/pom.xml | 2 +- leptonica/pom.xml | 2 +- leptonica/samples/pom.xml | 2 +- .../gen/java/org/bytedeco/leptonica/BOX.java | 2 +- .../gen/java/org/bytedeco/leptonica/BOXA.java | 2 +- .../java/org/bytedeco/leptonica/BOXAA.java | 2 +- .../java/org/bytedeco/leptonica/CCBORD.java | 2 +- .../java/org/bytedeco/leptonica/CCBORDA.java | 2 +- .../java/org/bytedeco/leptonica/DLLIST.java | 2 +- .../gen/java/org/bytedeco/leptonica/DPIX.java | 2 +- .../gen/java/org/bytedeco/leptonica/FPIX.java | 2 +- .../java/org/bytedeco/leptonica/FPIXA.java | 2 +- .../java/org/bytedeco/leptonica/GPLOT.java | 2 +- .../leptonica/Handler_BytePointer.java | 2 +- .../bytedeco/leptonica/Handler_String.java | 2 +- .../org/bytedeco/leptonica/JBCLASSER.java | 2 +- .../java/org/bytedeco/leptonica/JBDATA.java | 2 +- .../java/org/bytedeco/leptonica/L_AMAP.java | 2 +- .../org/bytedeco/leptonica/L_AMAP_NODE.java | 2 +- .../java/org/bytedeco/leptonica/L_ASET.java | 2 +- .../org/bytedeco/leptonica/L_ASET_NODE.java | 2 +- .../org/bytedeco/leptonica/L_BBUFFER.java | 2 +- .../java/org/bytedeco/leptonica/L_BMF.java | 2 +- .../java/org/bytedeco/leptonica/L_BYTEA.java | 2 +- .../org/bytedeco/leptonica/L_COLORFILL.java | 2 +- .../org/bytedeco/leptonica/L_COMP_DATA.java | 2 +- .../java/org/bytedeco/leptonica/L_DEWARP.java | 2 +- .../org/bytedeco/leptonica/L_DEWARPA.java | 2 +- .../java/org/bytedeco/leptonica/L_DNA.java | 2 +- .../java/org/bytedeco/leptonica/L_DNAA.java | 2 +- .../org/bytedeco/leptonica/L_DNAHASH.java | 2 +- .../org/bytedeco/leptonica/L_HASHITEM.java | 2 +- .../org/bytedeco/leptonica/L_HASHMAP.java | 2 +- .../java/org/bytedeco/leptonica/L_HEAP.java | 2 +- .../java/org/bytedeco/leptonica/L_KERNEL.java | 2 +- .../org/bytedeco/leptonica/L_PDF_DATA.java | 2 +- .../java/org/bytedeco/leptonica/L_PTRA.java | 2 +- .../java/org/bytedeco/leptonica/L_PTRAA.java | 2 +- .../java/org/bytedeco/leptonica/L_QUEUE.java | 2 +- .../java/org/bytedeco/leptonica/L_RBTREE.java | 2 +- .../org/bytedeco/leptonica/L_RBTREE_NODE.java | 2 +- .../java/org/bytedeco/leptonica/L_RCH.java | 2 +- .../java/org/bytedeco/leptonica/L_RCHA.java | 2 +- .../java/org/bytedeco/leptonica/L_RDID.java | 2 +- .../java/org/bytedeco/leptonica/L_RECOG.java | 2 +- .../org/bytedeco/leptonica/L_REGPARAMS.java | 2 +- .../java/org/bytedeco/leptonica/L_STACK.java | 2 +- .../org/bytedeco/leptonica/L_STRCODE.java | 2 +- .../java/org/bytedeco/leptonica/L_SUDOKU.java | 2 +- .../java/org/bytedeco/leptonica/L_TIMER.java | 2 +- .../org/bytedeco/leptonica/L_WALLTIMER.java | 2 +- .../java/org/bytedeco/leptonica/L_WSHED.java | 2 +- .../gen/java/org/bytedeco/leptonica/NUMA.java | 2 +- .../java/org/bytedeco/leptonica/NUMAA.java | 2 +- .../gen/java/org/bytedeco/leptonica/PIX.java | 2 +- .../gen/java/org/bytedeco/leptonica/PIXA.java | 2 +- .../java/org/bytedeco/leptonica/PIXAA.java | 2 +- .../java/org/bytedeco/leptonica/PIXAC.java | 2 +- .../java/org/bytedeco/leptonica/PIXACC.java | 2 +- .../gen/java/org/bytedeco/leptonica/PIXC.java | 2 +- .../java/org/bytedeco/leptonica/PIXCMAP.java | 2 +- .../org/bytedeco/leptonica/PIXTILING.java | 2 +- .../gen/java/org/bytedeco/leptonica/PTA.java | 2 +- .../gen/java/org/bytedeco/leptonica/PTAA.java | 2 +- .../java/org/bytedeco/leptonica/RB_TYPE.java | 2 +- .../org/bytedeco/leptonica/RGBA_QUAD.java | 2 +- .../java/org/bytedeco/leptonica/SARRAY.java | 2 +- .../gen/java/org/bytedeco/leptonica/SEL.java | 2 +- .../gen/java/org/bytedeco/leptonica/SELA.java | 2 +- .../java/org/bytedeco/leptonica/alloc_fn.java | 2 +- .../org/bytedeco/leptonica/dealloc_fn.java | 2 +- .../bytedeco/leptonica/global/leptonica.java | 4 +- onnxruntime/README.md | 6 +- onnxruntime/cppbuild.sh | 4 +- onnxruntime/platform/gpu/pom.xml | 4 +- onnxruntime/platform/pom.xml | 4 +- onnxruntime/pom.xml | 6 +- onnxruntime/samples/pom.xml | 4 +- .../onnxruntime/presets/onnxruntime.java | 6 +- opencv/README.md | 6 +- opencv/cppbuild.sh | 2 +- opencv/platform/gpu/pom.xml | 2 +- opencv/platform/pom.xml | 2 +- opencv/pom.xml | 2 +- opencv/samples/pom.xml | 4 +- .../bytedeco/opencv/global/opencv_core.java | 2 +- .../BackgroundSubtractorCNT.java | 3 + .../BackgroundSubtractorGMG.java | 3 + .../BackgroundSubtractorGSOC.java | 3 + .../BackgroundSubtractorLSBP.java | 3 + .../BackgroundSubtractorMOG.java | 3 + .../SyntheticSequenceGenerator.java | 3 + .../opencv/opencv_calib3d/LMSolver.java | 3 + .../opencv/opencv_calib3d/StereoBM.java | 3 + .../opencv/opencv_calib3d/StereoMatcher.java | 3 + .../opencv/opencv_calib3d/StereoSGBM.java | 3 + .../opencv/opencv_core/DMatchVector.java | 2 + .../opencv_core/DMatchVectorVector.java | 2 + .../opencv/opencv_core/GpuMatVector.java | 2 + .../opencv/opencv_core/KeyPointVector.java | 2 + .../opencv_core/KeyPointVectorVector.java | 2 + .../opencv/opencv_core/MatVector.java | 2 + .../opencv/opencv_core/MatVectorVector.java | 2 + .../opencv/opencv_core/NodeDataTlsVector.java | 2 + .../opencv/opencv_core/Point2dVector.java | 2 + .../opencv_core/Point2dVectorVector.java | 2 + .../opencv/opencv_core/Point2fVector.java | 2 + .../opencv_core/Point2fVectorVector.java | 2 + .../opencv/opencv_core/Point3fVector.java | 2 + .../opencv_core/Point3fVectorVector.java | 2 + .../opencv/opencv_core/Point3iVector.java | 2 + .../opencv/opencv_core/PointVector.java | 2 + .../opencv/opencv_core/PointVectorVector.java | 2 + .../opencv/opencv_core/RangeVector.java | 2 + .../opencv/opencv_core/Rect2dVector.java | 2 + .../opencv/opencv_core/RectVector.java | 2 + .../opencv/opencv_core/RectVectorVector.java | 2 + .../opencv/opencv_core/ScalarVector.java | 2 + .../opencv/opencv_core/SizeVector.java | 2 + .../opencv/opencv_core/StringVector.java | 2 + .../opencv/opencv_core/UMatVector.java | 2 + .../opencv/opencv_dnn/MatPointerVector.java | 2 + .../opencv/opencv_dnn/MatShapeVector.java | 2 + .../opencv_dnn/MatShapeVectorVector.java | 2 + .../opencv_face/BasicFaceRecognizer.java | 3 + .../opencv_face/EigenFaceRecognizer.java | 3 + .../opencv/opencv_face/FaceRecognizer.java | 3 + .../bytedeco/opencv/opencv_face/Facemark.java | 5 + .../opencv/opencv_face/FacemarkAAM.java | 3 + .../opencv/opencv_face/FacemarkKazemi.java | 3 + .../opencv/opencv_face/FacemarkLBF.java | 3 + .../opencv/opencv_face/FacemarkTrain.java | 3 + .../opencv_face/FisherFaceRecognizer.java | 3 + .../opencv_face/LBPHFaceRecognizer.java | 3 + .../opencv/opencv_features2d/BFMatcher.java | 3 + .../opencv_features2d/DescriptorMatcher.java | 3 + .../opencv/opencv_features2d/Feature2D.java | 5 + .../opencv_features2d/FlannBasedMatcher.java | 3 + .../opencv/opencv_imgproc/Vec2fVector.java | 2 + .../opencv/opencv_imgproc/Vec3fVector.java | 2 + .../opencv/opencv_imgproc/Vec4fVector.java | 2 + .../opencv/opencv_imgproc/Vec4iVector.java | 2 + .../opencv/opencv_imgproc/Vec6fVector.java | 2 + .../opencv/opencv_mcc/CCheckerDetector.java | 3 + .../opencv/opencv_mcc/CCheckerVector.java | 2 + .../opencv_objdetect/ArucoDetector.java | 3 + .../BaseCascadeClassifier.java | 3 + .../opencv_objdetect/CharucoDetector.java | 3 + .../opencv_optflow/DualTVL1OpticalFlow.java | 3 + .../PhaseUnwrapping.java | 5 + .../opencv/opencv_quality/QualityBase.java | 5 + .../opencv/opencv_rapid/GOSTracker.java | 3 + .../opencv/opencv_rapid/OLSTracker.java | 3 + .../bytedeco/opencv/opencv_rapid/Rapid.java | 3 + .../bytedeco/opencv/opencv_rapid/Tracker.java | 3 + .../opencv_saliency/MotionSaliency.java | 8 + .../MotionSaliencyBinWangApr2014.java | 6 + .../opencv/opencv_saliency/Objectness.java | 8 + .../opencv_saliency/ObjectnessBING.java | 6 + .../opencv/opencv_saliency/Saliency.java | 5 + .../opencv_saliency/StaticSaliency.java | 8 + .../StaticSaliencyFineGrained.java | 3 + .../StaticSaliencySpectralResidual.java | 3 + .../opencv_shape/AffineTransformer.java | 3 + .../EMDHistogramCostExtractor.java | 3 + .../HausdorffDistanceExtractor.java | 3 + .../opencv_shape/HistogramCostExtractor.java | 3 + .../NormHistogramCostExtractor.java | 3 + .../ShapeContextDistanceExtractor.java | 3 + .../opencv_shape/ShapeDistanceExtractor.java | 3 + .../opencv/opencv_shape/ShapeTransformer.java | 3 + .../ThinPlateSplineShapeTransformer.java | 3 + .../opencv_stitching/CameraParamsVector.java | 2 + .../opencv_stitching/ImageFeaturesVector.java | 2 + .../opencv_stitching/MatchesInfoVector.java | 2 + .../GrayCodePattern.java | 3 + .../SinusoidalPattern.java | 3 + .../StructuredLightPattern.java | 5 + .../opencv_superres/BroxOpticalFlow.java | 8 + .../opencv_superres/DenseOpticalFlowExt.java | 3 + .../opencv_superres/PyrLKOpticalFlow.java | 8 + .../SuperResDualTVL1OpticalFlow.java | 8 + .../SuperResFarnebackOpticalFlow.java | 8 + .../opencv_superres/SuperResolution.java | 3 + .../opencv/opencv_text/DoubleVector.java | 2 + .../bytedeco/opencv/opencv_text/ERFilter.java | 3 + .../opencv/opencv_text/ERStatVector.java | 2 + .../opencv_text/ERStatVectorVector.java | 2 + .../opencv/opencv_text/FloatVector.java | 2 + .../bytedeco/opencv/opencv_text/IntDeque.java | 2 + .../opencv/opencv_text/IntVector.java | 2 + .../opencv_tracking/SizeTPointVectorMap.java | 2 + .../opencv/opencv_tracking/SizeTTrackMap.java | 2 + .../opencv_tracking/TrackedObjectDeque.java | 2 + .../opencv_video/BackgroundSubtractor.java | 3 + .../opencv_video/BackgroundSubtractorKNN.java | 3 + .../BackgroundSubtractorMOG2.java | 3 + .../opencv/opencv_video/DISOpticalFlow.java | 3 + .../opencv/opencv_video/DenseOpticalFlow.java | 3 + .../opencv_video/FarnebackOpticalFlow.java | 3 + .../opencv_video/SparseOpticalFlow.java | 3 + .../opencv_video/SparsePyrLKOpticalFlow.java | 3 + .../opencv_video/VariationalRefinement.java | 3 + .../opencv_xfeatures2d/PCTSignatures.java | 3 + .../opencv_xfeatures2d/PCTSignaturesSQFD.java | 3 + .../AdaptiveManifoldFilter.java | 3 + .../opencv_ximgproc/ContourFitting.java | 3 + .../opencv/opencv_ximgproc/DTFilter.java | 3 + .../opencv_ximgproc/DisparityFilter.java | 3 + .../opencv_ximgproc/DisparityWLSFilter.java | 3 + .../EdgeAwareInterpolator.java | 3 + .../opencv/opencv_ximgproc/EdgeBoxes.java | 3 + .../FastBilateralSolverFilter.java | 3 + .../FastGlobalSmootherFilter.java | 3 + .../opencv_ximgproc/FastLineDetector.java | 3 + .../opencv_ximgproc/GraphSegmentation.java | 3 + .../opencv/opencv_ximgproc/GuidedFilter.java | 3 + .../opencv_ximgproc/RFFeatureGetter.java | 3 + .../opencv_ximgproc/RICInterpolator.java | 3 + .../opencv_ximgproc/RidgeDetectionFilter.java | 3 + .../SelectiveSearchSegmentation.java | 3 + .../SelectiveSearchSegmentationStrategy.java | 3 + ...iveSearchSegmentationStrategyMultiple.java | 3 + .../SparseMatchInterpolator.java | 3 + .../StructuredEdgeDetection.java | 3 + .../opencv/opencv_ximgproc/SuperpixelLSC.java | 3 + .../opencv_ximgproc/SuperpixelSEEDS.java | 3 + .../opencv_ximgproc/SuperpixelSLIC.java | 3 + platform/pom.xml | 12 +- tensorflow-lite/cppbuild.sh | 2 +- tensorflow-lite/pom.xml | 2 +- tesseract/README.md | 6 +- tesseract/cppbuild.sh | 2 +- tesseract/platform/pom.xml | 4 +- tesseract/pom.xml | 8 +- tesseract/samples/pom.xml | 2 +- .../bytedeco/tesseract/BLOB_CHOICE_IT.java | 2 +- .../org/bytedeco/tesseract/BLOCK_LIST.java | 2 +- .../org/bytedeco/tesseract/BlamerBundle.java | 2 +- .../org/bytedeco/tesseract/ByteVector.java | 4 +- .../org/bytedeco/tesseract/CANCEL_FUNC.java | 2 +- .../org/bytedeco/tesseract/C_BLOB_IT.java | 2 +- .../bytedeco/tesseract/ChoiceIterator.java | 2 +- .../gen/java/org/bytedeco/tesseract/Dawg.java | 2 +- .../gen/java/org/bytedeco/tesseract/Dict.java | 2 +- .../java/org/bytedeco/tesseract/DictFunc.java | 2 +- .../org/bytedeco/tesseract/EANYCODE_CHAR.java | 2 +- .../org/bytedeco/tesseract/ETEXT_DESC.java | 2 +- .../bytedeco/tesseract/EquationDetect.java | 2 +- .../org/bytedeco/tesseract/FileReader.java | 2 +- .../bytedeco/tesseract/ImageThresholder.java | 2 +- .../bytedeco/tesseract/LTRResultIterator.java | 2 +- .../bytedeco/tesseract/MutableIterator.java | 2 +- .../org/bytedeco/tesseract/OSResults.java | 2 +- .../java/org/bytedeco/tesseract/PAGE_RES.java | 2 +- .../org/bytedeco/tesseract/PAGE_RES_IT.java | 2 +- .../org/bytedeco/tesseract/PROGRESS_FUNC.java | 2 +- .../bytedeco/tesseract/PROGRESS_FUNC2.java | 2 +- .../org/bytedeco/tesseract/PageIterator.java | 2 +- .../bytedeco/tesseract/ParagraphModel.java | 2 +- .../tesseract/ProbabilityInContextFunc.java | 2 +- .../bytedeco/tesseract/ResultIterator.java | 2 +- .../StringFloatPairVectorVector.java | 2 +- .../org/bytedeco/tesseract/StringVector.java | 4 +- .../bytedeco/tesseract/TessAltoRenderer.java | 2 +- .../org/bytedeco/tesseract/TessBaseAPI.java | 2 +- .../tesseract/TessBoxTextRenderer.java | 2 +- .../bytedeco/tesseract/TessCancelFunc.java | 2 +- .../bytedeco/tesseract/TessHOcrRenderer.java | 2 +- .../tesseract/TessLSTMBoxRenderer.java | 2 +- .../bytedeco/tesseract/TessOsdRenderer.java | 2 +- .../bytedeco/tesseract/TessPDFRenderer.java | 2 +- .../bytedeco/tesseract/TessProgressFunc.java | 2 +- .../tesseract/TessResultRenderer.java | 2 +- .../bytedeco/tesseract/TessTextRenderer.java | 2 +- .../bytedeco/tesseract/TessTsvRenderer.java | 2 +- .../bytedeco/tesseract/TessUnlvRenderer.java | 2 +- .../tesseract/TessWordStrBoxRenderer.java | 2 +- .../org/bytedeco/tesseract/Tesseract.java | 2 +- .../java/org/bytedeco/tesseract/UNICHAR.java | 2 +- .../org/bytedeco/tesseract/UNICHARSET.java | 2 +- .../gen/java/org/bytedeco/tesseract/WERD.java | 2 +- .../java/org/bytedeco/tesseract/WERD_RES.java | 2 +- .../bytedeco/tesseract/global/tesseract.java | 8 +- tritonserver/platform/pom.xml | 2 +- tritonserver/platform/redist/pom.xml | 2 +- tritonserver/pom.xml | 2 +- tritonserver/samples/simple/pom.xml | 2 +- tritonserver/samples/simplecpp/pom.xml | 2 +- tritonserver/samples/unsupported/pom.xml | 2 +- 308 files changed, 1245 insertions(+), 244 deletions(-) create mode 100644 dnnl/src/gen/java/org/bytedeco/dnnl/group_normalization_backward.java create mode 100644 dnnl/src/gen/java/org/bytedeco/dnnl/group_normalization_forward.java diff --git a/CHANGELOG.md b/CHANGELOG.md index ef934aaeabe..b77f472e04f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ * Refactor and improve presets for PyTorch ([pull #1360](https://github.com/bytedeco/javacpp-presets/pull/1360)) * Include `mkl_lapack.h` header file in presets for MKL ([issue #1388](https://github.com/bytedeco/javacpp-presets/issues/1388)) * Map new higher-level C++ API of Triton Inference Server ([pull #1361](https://github.com/bytedeco/javacpp-presets/pull/1361)) - * Upgrade presets for OpenCV 4.8.0, DNNL 3.2.1, OpenBLAS 0.3.24, CPython 3.11.5, NumPy 1.25.2, SciPy 1.11.2, LLVM 17.0.1, TensorFlow Lite 2.14.0, Triton Inference Server 2.38.0, ONNX 1.14.1, ONNX Runtime 1.16.0, TVM 0.13.0, and their dependencies + * Upgrade presets for OpenCV 4.8.1, DNNL 3.3, OpenBLAS 0.3.24, CPython 3.11.5, NumPy 1.25.2, SciPy 1.11.2, LLVM 17.0.1, Leptonica 1.83.1, Tesseract 5.3.3, TensorFlow Lite 2.14.0, Triton Inference Server 2.38.0, ONNX 1.14.1, ONNX Runtime 1.16.1, TVM 0.13.0, and their dependencies ### June 6, 2023 version 1.5.9 * Virtualize `nvinfer1::IGpuAllocator` from TensorRT to allow customization ([pull #1367](https://github.com/bytedeco/javacpp-presets/pull/1367)) diff --git a/README.md b/README.md index 8087a856b56..673ad7e553e 100644 --- a/README.md +++ b/README.md @@ -198,7 +198,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * LZ4 1.9.x https://github.com/lz4/lz4 * MKL 2023.x https://software.intel.com/mkl * MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN - * DNNL 3.2.x https://github.com/oneapi-src/oneDNN + * DNNL 3.3.x https://github.com/oneapi-src/oneDNN * OpenBLAS 0.3.24 http://www.openblas.net/ * ARPACK-NG 3.9.0 https://github.com/opencollab/arpack-ng * CMINPACK 1.3.8 https://github.com/devernay/cminpack @@ -227,12 +227,12 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * TensorFlow 1.15.x https://github.com/tensorflow/tensorflow * TensorFlow Lite 2.14.x https://github.com/tensorflow/tensorflow * TensorRT 8.6.x https://developer.nvidia.com/tensorrt - * Triton Inference Server 2.34.x https://developer.nvidia.com/nvidia-triton-inference-server + * Triton Inference Server 2.38.x https://developer.nvidia.com/nvidia-triton-inference-server * The Arcade Learning Environment 0.8.x https://github.com/mgbellemare/Arcade-Learning-Environment * DepthAI 2.21.x https://github.com/luxonis/depthai-core * ONNX 1.14.x https://github.com/onnx/onnx * nGraph 0.26.0 https://github.com/NervanaSystems/ngraph - * ONNX Runtime 1.15.x https://github.com/microsoft/onnxruntime + * ONNX Runtime 1.16.x https://github.com/microsoft/onnxruntime * TVM 0.13.x https://github.com/apache/tvm * Bullet Physics SDK 3.25 https://pybullet.org * LiquidFun http://google.github.io/liquidfun/ diff --git a/dnnl/README.md b/dnnl/README.md index de0c6df56c4..abd56295a71 100644 --- a/dnnl/README.md +++ b/dnnl/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * DNNL 3.2.1 https://01.org/dnnl + * DNNL 3.3 https://01.org/dnnl Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -25,7 +25,7 @@ Sample Usage ------------ Here is a simple example of DNNL ported to Java from this C++ source file: - * https://github.com/oneapi-src/oneDNN/blob/v3.2.1/examples/cnn_inference_int8.cpp + * https://github.com/oneapi-src/oneDNN/blob/v3.3/examples/cnn_inference_int8.cpp We can use [Maven 3](http://maven.apache.org/) to download and install automatically all the class files as well as the native binaries. To run this sample code, after creating the `pom.xml` and `CpuCnnInferenceInt8.java` source files below, simply execute on the command line: ```bash @@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco dnnl-platform - 3.2.1-1.5.10-SNAPSHOT + 3.3-1.5.10-SNAPSHOT diff --git a/dnnl/cppbuild.sh b/dnnl/cppbuild.sh index 9d2629df1ae..55e64ff6c20 100755 --- a/dnnl/cppbuild.sh +++ b/dnnl/cppbuild.sh @@ -11,7 +11,7 @@ export DNNL_CPU_RUNTIME="OMP" # or TBB export DNNL_GPU_RUNTIME="OCL" TBB_VERSION=2020.3 -MKLDNN_VERSION=3.2.1 +MKLDNN_VERSION=3.3 download https://github.com/oneapi-src/oneTBB/archive/v$TBB_VERSION.tar.gz oneTBB-$TBB_VERSION.tar.bz2 download https://github.com/oneapi-src/oneDNN/archive/v$MKLDNN_VERSION.tar.gz oneDNN-$MKLDNN_VERSION.tar.bz2 diff --git a/dnnl/platform/pom.xml b/dnnl/platform/pom.xml index 377cd342ca0..7ba4fb0fe47 100644 --- a/dnnl/platform/pom.xml +++ b/dnnl/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco dnnl-platform - 3.2.1-${project.parent.version} + 3.3-${project.parent.version} JavaCPP Presets Platform for DNNL diff --git a/dnnl/pom.xml b/dnnl/pom.xml index df808fa4a0a..a45b02ece69 100644 --- a/dnnl/pom.xml +++ b/dnnl/pom.xml @@ -11,7 +11,7 @@ org.bytedeco dnnl - 3.2.1-${project.parent.version} + 3.3-${project.parent.version} JavaCPP Presets for DNNL diff --git a/dnnl/samples/pom.xml b/dnnl/samples/pom.xml index 184087f0ab0..584bcd7971a 100644 --- a/dnnl/samples/pom.xml +++ b/dnnl/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco dnnl-platform - 3.2.1-1.5.10-SNAPSHOT + 3.3-1.5.10-SNAPSHOT diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/concat.java b/dnnl/src/gen/java/org/bytedeco/dnnl/concat.java index ed17edad8ae..0e02a60da8c 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/concat.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/concat.java @@ -71,16 +71,22 @@ public static class primitive_desc extends primitive_desc_base { * not depend on memory format. * @param srcs Vector of source memory descriptors. * @param attr Primitive attributes to use. Attributes are optional - * and default to empty attributes. */ + * and default to empty attributes. + * @param allow_empty A flag signifying whether construction is + * allowed to fail without throwing an exception. In this case an + * empty object will be produced. This flag is optional and + * defaults to false. */ /// /// public primitive_desc(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, int concat_dimension, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr) { super((Pointer)null); allocate(aengine, dst, concat_dimension, srcs, attr); } + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, dst, concat_dimension, srcs, attr, allow_empty); } private native void allocate(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, int concat_dimension, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr); + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); public primitive_desc(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, int concat_dimension, @Cast("const std::vector*") @ByRef memory_desc_vector srcs) { super((Pointer)null); allocate(aengine, dst, concat_dimension, srcs); } private native void allocate(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @@ -98,15 +104,21 @@ private native void allocate(@Const @ByRef engine aengine, @Const @ByRef org.byt * not depend on memory format. * @param srcs Vector of source memory descriptors. * @param attr Primitive attributes to use. Attributes are optional - * and default to empty attributes. */ + * and default to empty attributes. + * @param allow_empty A flag signifying whether construction is + * allowed to fail without throwing an exception. In this case an + * empty object will be produced. This flag is optional and + * defaults to false. */ /// public primitive_desc(@Const @ByRef engine aengine, int concat_dimension, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr) { super((Pointer)null); allocate(aengine, concat_dimension, srcs, attr); } + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, concat_dimension, srcs, attr, allow_empty); } private native void allocate(@Const @ByRef engine aengine, int concat_dimension, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr); + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); public primitive_desc(@Const @ByRef engine aengine, int concat_dimension, @Cast("const std::vector*") @ByRef memory_desc_vector srcs) { super((Pointer)null); allocate(aengine, concat_dimension, srcs); } private native void allocate(@Const @ByRef engine aengine, int concat_dimension, diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java b/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java index 5313d549e93..e96150baed4 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java @@ -1208,10 +1208,15 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { dnnl_ABc16b48a = 759, dnnl_ABcd16b48a = 760, dnnl_ABcde16b48a = 761, + dnnl_ABc16a4b = 762, + dnnl_ABcd16a4b = 763, + dnnl_ABcde16a4b = 764, + dnnl_defcbA16a = 765, + dnnl_defcbA8a = 766, /** Just a sentinel, not real memory format tag. Must be changed after new * format tag is added. */ - dnnl_format_tag_last = 762, + dnnl_format_tag_last = 767, // Aliases @@ -2016,6 +2021,8 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { dnnl_gIdhwO16o64i4o = dnnl_aCdefB16b64c4b, dnnl_hwioG16g = dnnl_decbA16a, dnnl_hwioG8g = dnnl_decbA8a, + dnnl_dhwioG16g = dnnl_defcbA16a, + dnnl_dhwioG8g = dnnl_defcbA8a, dnnl_NCdhw40n16c = dnnl_ABcde40a16b, dnnl_NCw40n16c = dnnl_ABc40a16b, dnnl_NChw40n16c = dnnl_ABcd40a16b, @@ -2138,6 +2145,8 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { dnnl_softmax = 19, /** A layer normalization primitive. */ dnnl_layer_normalization = 20, + /** A group normalization primitive. */ + dnnl_group_normalization = 21, /** Parameter to allow internal only primitives without undefined behavior. * This parameter is chosen to be valid for so long as sizeof(int) >= 2. */ @@ -3025,7 +3034,7 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { // Parsed from oneapi/dnnl/dnnl_common.h /******************************************************************************* -* Copyright 2022 Intel Corporation +* Copyright 2022-2023 Intel Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -3205,8 +3214,8 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { * * @param level Verbosity level: * - 0: no verbose output (default), - * - 1: primitive information at execution, - * - 2: primitive information at creation and execution. + * - 1: primitive and graph information at execution, + * - 2: primitive and graph information at creation/compilation and execution. * @return #dnnl_invalid_arguments/#dnnl::status::invalid_arguments if the * \p level value is invalid, and #dnnl_success/#dnnl::status::success on * success. */ @@ -3399,6 +3408,7 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { public static final int BUILD_CONVOLUTION = 0; public static final int BUILD_DECONVOLUTION = 0; public static final int BUILD_ELTWISE = 0; +public static final int BUILD_GROUP_NORMALIZATION = 0; public static final int BUILD_INNER_PRODUCT = 0; public static final int BUILD_LAYER_NORMALIZATION = 0; public static final int BUILD_LRN = 0; @@ -3426,6 +3436,12 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { public static final int BUILD_XEHP = 0; public static final int BUILD_XEHPG = 0; public static final int BUILD_XEHPC = 0; +// GeMM kernels ISA controls +public static final int BUILD_GEMM_KERNELS_ALL = 1; +public static final int BUILD_GEMM_KERNELS_NONE = 0; +public static final int BUILD_GEMM_SSE41 = 0; +public static final int BUILD_GEMM_AVX2 = 0; +public static final int BUILD_GEMM_AVX512 = 0; // #endif @@ -3456,10 +3472,10 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { public static final int DNNL_VERSION_MAJOR = 3; /** Minor version */ -public static final int DNNL_VERSION_MINOR = 2; +public static final int DNNL_VERSION_MINOR = 3; /** Patch version */ -public static final int DNNL_VERSION_PATCH = 1; +public static final int DNNL_VERSION_PATCH = 0; /** Git commit hash */ public static native @MemberGetter String DNNL_VERSION_HASH(); @@ -6172,6 +6188,85 @@ public static native int dnnl_memory_desc_equal( @Const dnnl_primitive_attr attr); /** \} dnnl_api_batch_normalization +

+ * \addtogroup dnnl_api_group_normalization + * \{ +

+ * Creates a primitive descriptor for a group normalization forward propagation + * primitive. + * + * \note + * In-place operation is supported: the dst can refer to the same memory + * as the src. + * + * @param primitive_desc Output primitive_descriptor. + * @param engine Engine to use. + * @param prop_kind Propagation kind. Possible values are + * #dnnl_forward_training and #dnnl_forward_inference. + * @param src_desc Source memory descriptor. + * @param dst_desc Destination memory descriptor. + * @param groups Group normalization groups parameter. + * @param epsilon Group normalization epsilon parameter. + * @param flags Group normalization flags (\ref dnnl_normalization_flags_t). + * @param attr Primitive attributes (can be NULL). + * @return #dnnl_success on success and a status describing the error + * otherwise. */ + +/// +/// +public static native @Cast("dnnl_status_t") int dnnl_group_normalization_forward_primitive_desc_create( + @ByPtrPtr dnnl_primitive_desc primitive_desc, dnnl_engine engine, + @Cast("dnnl_prop_kind_t") int prop_kind, @Const dnnl_memory_desc src_desc, + @Const dnnl_memory_desc dst_desc, @Cast("dnnl_dim_t") long groups, float epsilon, + @Cast("unsigned") int flags, @Const dnnl_primitive_attr attr); +public static native @Cast("dnnl_status_t") int dnnl_group_normalization_forward_primitive_desc_create( + @Cast("dnnl_primitive_desc_t*") PointerPointer primitive_desc, dnnl_engine engine, + @Cast("dnnl_prop_kind_t") int prop_kind, @Const dnnl_memory_desc src_desc, + @Const dnnl_memory_desc dst_desc, @Cast("dnnl_dim_t") long groups, float epsilon, + @Cast("unsigned") int flags, @Const dnnl_primitive_attr attr); + +/** Creates a primitive descriptor for a group normalization backward + * propagation primitive. + * + * \note + * In-place operation is supported: the diff_dst can refer to the same + * memory as the diff_src. + * + * @param primitive_desc Output primitive_descriptor. + * @param engine Engine to use. + * @param prop_kind Propagation kind. Possible values are + * #dnnl_backward_data and #dnnl_backward (diffs for all parameters are + * computed in this case). + * @param diff_src_desc Diff source memory descriptor. + * @param diff_dst_desc Diff destination memory descriptor. + * @param src_desc Source memory descriptor. + * @param groups Group normalization groups parameter. + * @param epsilon Group normalization epsilon parameter. + * @param flags Group normalization flags (\ref dnnl_normalization_flags_t). + * @param hint_fwd_pd Primitive descriptor for a respective forward propagation + * primitive. + * @param attr Primitive attributes (can be NULL). + * @return #dnnl_success on success and a status describing the error + * otherwise. */ + +/// +/// +public static native @Cast("dnnl_status_t") int dnnl_group_normalization_backward_primitive_desc_create( + @ByPtrPtr dnnl_primitive_desc primitive_desc, dnnl_engine engine, + @Cast("dnnl_prop_kind_t") int prop_kind, @Const dnnl_memory_desc diff_src_desc, + @Const dnnl_memory_desc diff_dst_desc, + @Const dnnl_memory_desc src_desc, @Cast("dnnl_dim_t") long groups, float epsilon, + @Cast("unsigned") int flags, @Const dnnl_primitive_desc hint_fwd_pd, + @Const dnnl_primitive_attr attr); +public static native @Cast("dnnl_status_t") int dnnl_group_normalization_backward_primitive_desc_create( + @Cast("dnnl_primitive_desc_t*") PointerPointer primitive_desc, dnnl_engine engine, + @Cast("dnnl_prop_kind_t") int prop_kind, @Const dnnl_memory_desc diff_src_desc, + @Const dnnl_memory_desc diff_dst_desc, + @Const dnnl_memory_desc src_desc, @Cast("dnnl_dim_t") long groups, float epsilon, + @Cast("unsigned") int flags, @Const dnnl_primitive_desc hint_fwd_pd, + @Const dnnl_primitive_attr attr); + +/** \} dnnl_api_group_normalization

* \addtogroup dnnl_api_layer_normalization * \{ @@ -9192,6 +9287,12 @@ public static native int dnnl_memory_desc_equal( // Targeting ../batch_normalization_backward.java +// Targeting ../group_normalization_forward.java + + +// Targeting ../group_normalization_backward.java + + // Targeting ../layer_normalization_forward.java diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/group_normalization_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/group_normalization_backward.java new file mode 100644 index 00000000000..fc76b628044 --- /dev/null +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/group_normalization_backward.java @@ -0,0 +1,205 @@ +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.dnnl; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import org.bytedeco.opencl.*; +import static org.bytedeco.opencl.global.OpenCL.*; + +import static org.bytedeco.dnnl.global.dnnl.*; + + +/** Group normalization backward propagation primitive. */ +@Namespace("dnnl") @Properties(inherit = org.bytedeco.dnnl.presets.dnnl.class) +public class group_normalization_backward extends primitive { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public group_normalization_backward(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public group_normalization_backward(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public group_normalization_backward position(long position) { + return (group_normalization_backward)super.position(position); + } + @Override public group_normalization_backward getPointer(long i) { + return new group_normalization_backward((Pointer)this).offsetAddress(i); + } + + /** Primitive descriptor for a group normalization backward propagation + * primitive. */ + public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public primitive_desc(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public primitive_desc(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public primitive_desc position(long position) { + return (primitive_desc)super.position(position); + } + @Override public primitive_desc getPointer(long i) { + return new primitive_desc((Pointer)this).offsetAddress(i); + } + + /** Default constructor. Produces an empty object. */ + + /// + public primitive_desc() { super((Pointer)null); allocate(); } + private native void allocate(); + + /** Constructs a primitive descriptor for a group normalization backward + * propagation primitive. + * + * @param aengine Engine to use. + * @param aprop_kind Propagation kind. Possible values are + * #dnnl::prop_kind::backward_data and #dnnl::prop_kind::backward + * (diffs for all parameters are computed in this case). + * @param diff_src_desc Diff source memory descriptor. + * @param diff_dst_desc Diff destination memory descriptor. + * @param src_desc Source memory descriptor. + * @param groups Group normalization groups parameter. + * @param epsilon Group normalization epsilon parameter. + * @param flags Group normalization flags (\ref + * dnnl::normalization_flags). + * @param hint_fwd_pd Primitive descriptor for a group normalization + * forward propagation primitive. It is used as a hint for + * deciding which memory format to use. + * @param attr Primitive attributes to use. Attributes are optional + * and default to empty attributes. + * @param allow_empty A flag signifying whether construction is + * allowed to fail without throwing an exception. In this case an + * empty object will be produced. This flag is optional and + * defaults to false. */ + + /// + public primitive_desc(@Const @ByRef engine aengine, prop_kind aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_src_desc, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_dst_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, normalization_flags flags, + @Const @ByRef group_normalization_forward.primitive_desc hint_fwd_pd, + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, aprop_kind, diff_src_desc, diff_dst_desc, src_desc, groups, epsilon, flags, hint_fwd_pd, attr, allow_empty); } + private native void allocate(@Const @ByRef engine aengine, prop_kind aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_src_desc, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_dst_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, normalization_flags flags, + @Const @ByRef group_normalization_forward.primitive_desc hint_fwd_pd, + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); + public primitive_desc(@Const @ByRef engine aengine, prop_kind aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_src_desc, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_dst_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, normalization_flags flags, + @Const @ByRef group_normalization_forward.primitive_desc hint_fwd_pd) { super((Pointer)null); allocate(aengine, aprop_kind, diff_src_desc, diff_dst_desc, src_desc, groups, epsilon, flags, hint_fwd_pd); } + private native void allocate(@Const @ByRef engine aengine, prop_kind aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_src_desc, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_dst_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, normalization_flags flags, + @Const @ByRef group_normalization_forward.primitive_desc hint_fwd_pd); + public primitive_desc(@Const @ByRef engine aengine, @Cast("dnnl::prop_kind") int aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_src_desc, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_dst_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, @Cast("dnnl::normalization_flags") int flags, + @Const @ByRef group_normalization_forward.primitive_desc hint_fwd_pd, + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, aprop_kind, diff_src_desc, diff_dst_desc, src_desc, groups, epsilon, flags, hint_fwd_pd, attr, allow_empty); } + private native void allocate(@Const @ByRef engine aengine, @Cast("dnnl::prop_kind") int aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_src_desc, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_dst_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, @Cast("dnnl::normalization_flags") int flags, + @Const @ByRef group_normalization_forward.primitive_desc hint_fwd_pd, + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); + public primitive_desc(@Const @ByRef engine aengine, @Cast("dnnl::prop_kind") int aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_src_desc, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_dst_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, @Cast("dnnl::normalization_flags") int flags, + @Const @ByRef group_normalization_forward.primitive_desc hint_fwd_pd) { super((Pointer)null); allocate(aengine, aprop_kind, diff_src_desc, diff_dst_desc, src_desc, groups, epsilon, flags, hint_fwd_pd); } + private native void allocate(@Const @ByRef engine aengine, @Cast("dnnl::prop_kind") int aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_src_desc, + @Const @ByRef org.bytedeco.dnnl.memory.desc diff_dst_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, @Cast("dnnl::normalization_flags") int flags, + @Const @ByRef group_normalization_forward.primitive_desc hint_fwd_pd); + + /** Constructs a primitive descriptor for a group normalization + * backward propagation primitive from a C API primitive descriptor + * that must have a matching kind. + * + * @param pd C API primitive descriptor for a group normalization + * backward propagation primitive. */ + public primitive_desc(dnnl_primitive_desc pd) { super((Pointer)null); allocate(pd); } + private native void allocate(dnnl_primitive_desc pd); + + /** \copydoc dnnl::primitive_desc_base::src_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc src_desc(); + + /** \copydoc dnnl::primitive_desc_base::weights_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc weights_desc(); + + /** \copydoc dnnl::primitive_desc_base::dst_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc dst_desc(); + + /** \copydoc dnnl::primitive_desc_base::diff_src_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc diff_src_desc(); + + /** \copydoc dnnl::primitive_desc_base::diff_dst_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc diff_dst_desc(); + + /** \copydoc dnnl::primitive_desc_base::diff_weights_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc diff_weights_desc(); + + /** \copydoc dnnl::group_normalization_forward::primitive_desc::mean_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc mean_desc(); + + /** \copydoc dnnl::group_normalization_forward::primitive_desc::variance_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc variance_desc(); + + /** \copydoc dnnl::primitive_desc_base::workspace_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc workspace_desc(); + + /** \copydoc dnnl::primitive_desc_base::get_prop_kind()const */ + public native prop_kind get_prop_kind(); + + /** \copydoc dnnl::primitive_desc_base::get_group_size()const */ + public native @Cast("dnnl::memory::dim") long get_group_size(); + + /** \copydoc dnnl::primitive_desc_base::get_epsilon()const */ + public native float get_epsilon(); + + /** Returns normalization flags. + * @return Normalization flags. */ + public native normalization_flags get_flags(); + } + + /** Default constructor. Produces an empty object. */ + public group_normalization_backward() { super((Pointer)null); allocate(); } + private native void allocate(); + + /** Constructs a group normalization backward propagation primitive. + * @param pd Primitive descriptor for a group normalization backward + * propagation primitive. */ + public group_normalization_backward(@Const @ByRef primitive_desc pd) { super((Pointer)null); allocate(pd); } + private native void allocate(@Const @ByRef primitive_desc pd); + + /** Constructs a group normalization backward propagation primitive from + * a cache blob. + * @param pd Primitive descriptor for a group normalization backward + * propagation primitive. + * @param cache_blob Cache blob. */ + public group_normalization_backward( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector BytePointer cache_blob) { super((Pointer)null); allocate(pd, cache_blob); } + private native void allocate( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector BytePointer cache_blob); + public group_normalization_backward( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector ByteBuffer cache_blob) { super((Pointer)null); allocate(pd, cache_blob); } + private native void allocate( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector ByteBuffer cache_blob); + public group_normalization_backward( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector byte[] cache_blob) { super((Pointer)null); allocate(pd, cache_blob); } + private native void allocate( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector byte[] cache_blob); +} diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/group_normalization_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/group_normalization_forward.java new file mode 100644 index 00000000000..fa7c8b8baa8 --- /dev/null +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/group_normalization_forward.java @@ -0,0 +1,204 @@ +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.dnnl; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import org.bytedeco.opencl.*; +import static org.bytedeco.opencl.global.OpenCL.*; + +import static org.bytedeco.dnnl.global.dnnl.*; + + +/** \} dnnl_api_batch_normalization +

+ * \addtogroup dnnl_api_group_normalization Group Normalization + * + * A primitive to perform group normalization. + * + * Both forward and backward propagation primitives support in-place + * operation; that is, src and dst can refer to the same memory for forward + * propagation, and diff_dst and diff_src can refer to the same memory for + * backward propagation. + * + * The group normalization primitives computations can be controlled by + * specifying different \ref dnnl::normalization_flags values. For example, + * group normalization forward propagation can be configured to either + * compute the mean and variance or take them as arguments. It can either + * perform scaling and shifting using gamma and beta parameters or not. + * + * @see \ref dev_guide_group_normalization in developer guide + * + * \{ +

+ * Group normalization forward propagation primitive. */ +@Namespace("dnnl") @Properties(inherit = org.bytedeco.dnnl.presets.dnnl.class) +public class group_normalization_forward extends primitive { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public group_normalization_forward(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public group_normalization_forward(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public group_normalization_forward position(long position) { + return (group_normalization_forward)super.position(position); + } + @Override public group_normalization_forward getPointer(long i) { + return new group_normalization_forward((Pointer)this).offsetAddress(i); + } + + /** Primitive descriptor for a group normalization forward propagation + * primitive. */ + public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public primitive_desc(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public primitive_desc(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public primitive_desc position(long position) { + return (primitive_desc)super.position(position); + } + @Override public primitive_desc getPointer(long i) { + return new primitive_desc((Pointer)this).offsetAddress(i); + } + + /** Default constructor. Produces an empty object. */ + + /// + /// + public primitive_desc() { super((Pointer)null); allocate(); } + private native void allocate(); + + /** Constructs a primitive descriptor for a group normalization forward + * propagation primitive. + * + * \note + * In-place operation is supported: the dst can refer to the same + * memory as the src. + * + * @param aengine Engine to use. + * @param aprop_kind Propagation kind. Possible values are + * #dnnl::prop_kind::forward_training and + * #dnnl::prop_kind::forward_inference. + * @param src_desc Source memory descriptor. + * @param dst_desc Destination memory descriptor. + * @param groups Group normalization groups parameter. + * @param epsilon Group normalization epsilon parameter. + * @param flags Group normalization flags (\ref + * dnnl::normalization_flags). + * @param attr Primitive attributes to use. Attributes are optional + * and default to empty attributes. + * @param allow_empty A flag signifying whether construction is + * allowed to fail without throwing an exception. In this case an + * empty object will be produced. This flag is optional and + * defaults to false. */ + + /// + public primitive_desc(@Const @ByRef engine aengine, prop_kind aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc dst_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, normalization_flags flags, + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, aprop_kind, src_desc, dst_desc, groups, epsilon, flags, attr, allow_empty); } + private native void allocate(@Const @ByRef engine aengine, prop_kind aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc dst_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, normalization_flags flags, + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); + public primitive_desc(@Const @ByRef engine aengine, prop_kind aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc dst_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, normalization_flags flags) { super((Pointer)null); allocate(aengine, aprop_kind, src_desc, dst_desc, groups, epsilon, flags); } + private native void allocate(@Const @ByRef engine aengine, prop_kind aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc dst_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, normalization_flags flags); + public primitive_desc(@Const @ByRef engine aengine, @Cast("dnnl::prop_kind") int aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc dst_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, @Cast("dnnl::normalization_flags") int flags, + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, aprop_kind, src_desc, dst_desc, groups, epsilon, flags, attr, allow_empty); } + private native void allocate(@Const @ByRef engine aengine, @Cast("dnnl::prop_kind") int aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc dst_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, @Cast("dnnl::normalization_flags") int flags, + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); + public primitive_desc(@Const @ByRef engine aengine, @Cast("dnnl::prop_kind") int aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc dst_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, @Cast("dnnl::normalization_flags") int flags) { super((Pointer)null); allocate(aengine, aprop_kind, src_desc, dst_desc, groups, epsilon, flags); } + private native void allocate(@Const @ByRef engine aengine, @Cast("dnnl::prop_kind") int aprop_kind, + @Const @ByRef org.bytedeco.dnnl.memory.desc src_desc, @Const @ByRef org.bytedeco.dnnl.memory.desc dst_desc, + @Cast("dnnl::memory::dim") long groups, float epsilon, @Cast("dnnl::normalization_flags") int flags); + + /** Constructs a primitive descriptor for a group normalization + * forward propagation primitive from a C API primitive descriptor + * that must have a matching kind. + * + * @param pd C API primitive descriptor for a group normalization + * forward propagation primitive. */ + public primitive_desc(dnnl_primitive_desc pd) { super((Pointer)null); allocate(pd); } + private native void allocate(dnnl_primitive_desc pd); + + /** \copydoc dnnl::primitive_desc_base::src_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc src_desc(); + + /** \copydoc dnnl::primitive_desc_base::dst_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc dst_desc(); + + /** \copydoc dnnl::primitive_desc_base::weights_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc weights_desc(); + + /** \copydoc dnnl::primitive_desc_base::workspace_desc()const */ + public native @ByVal org.bytedeco.dnnl.memory.desc workspace_desc(); + + /** Returns memory descriptor for mean. + * @return Memory descriptor for mean. */ + public native @ByVal org.bytedeco.dnnl.memory.desc mean_desc(); + + /** Returns memory descriptor for variance. + * @return Memory descriptor for variance. */ + public native @ByVal org.bytedeco.dnnl.memory.desc variance_desc(); + + /** \copydoc dnnl::primitive_desc_base::get_prop_kind()const */ + public native prop_kind get_prop_kind(); + + /** \copydoc dnnl::primitive_desc_base::get_group_size()const */ + public native @Cast("dnnl::memory::dim") long get_group_size(); + + /** \copydoc dnnl::primitive_desc_base::get_epsilon()const */ + public native float get_epsilon(); + + /** Returns normalization flags. + * @return Normalization flags. */ + public native normalization_flags get_flags(); + } + + /** Default constructor. Produces an empty object. */ + public group_normalization_forward() { super((Pointer)null); allocate(); } + private native void allocate(); + + /** Constructs a group normalization forward propagation primitive. + * @param pd Primitive descriptor for a group normalization forward + * propagation primitive. */ + public group_normalization_forward(@Const @ByRef primitive_desc pd) { super((Pointer)null); allocate(pd); } + private native void allocate(@Const @ByRef primitive_desc pd); + + /** Constructs a group normalization forward propagation primitive from + * a cache blob. + * @param pd Primitive descriptor for a group normalization forward + * propagation primitive. + * @param cache_blob Cache blob. */ + public group_normalization_forward( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector BytePointer cache_blob) { super((Pointer)null); allocate(pd, cache_blob); } + private native void allocate( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector BytePointer cache_blob); + public group_normalization_forward( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector ByteBuffer cache_blob) { super((Pointer)null); allocate(pd, cache_blob); } + private native void allocate( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector ByteBuffer cache_blob); + public group_normalization_forward( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector byte[] cache_blob) { super((Pointer)null); allocate(pd, cache_blob); } + private native void allocate( + @Const @ByRef primitive_desc pd, @Cast("uint8_t*") @StdVector byte[] cache_blob); +} diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_forward.java index d25e248c4e0..37d6ae3979f 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_forward.java @@ -13,7 +13,7 @@ import static org.bytedeco.dnnl.global.dnnl.*; -/** \} dnnl_api_batch_normalization +/** \} dnnl_api_group_normalization

* \addtogroup dnnl_api_layer_normalization Layer Normalization * diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/memory.java b/dnnl/src/gen/java/org/bytedeco/dnnl/memory.java index 70c5af10bbe..acb0b4e993e 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/memory.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/memory.java @@ -834,6 +834,8 @@ public enum format_tag { BA16a64b4a(dnnl_BA16a64b4a), decbA16a(dnnl_decbA16a), decbA8a(dnnl_decbA8a), + defcbA16a(dnnl_defcbA16a), + defcbA8a(dnnl_defcbA8a), aCB16b16c(dnnl_aCB16b16c), aCB16b32c(dnnl_aCB16b32c), aCB16b48c(dnnl_aCB16b48c), @@ -1462,6 +1464,8 @@ public enum format_tag { AcdeB16b16a2b(dnnl_AcdeB16b16a2b), hwioG16g(dnnl_hwioG16g), hwioG8g(dnnl_hwioG8g), + dhwioG16g(dnnl_dhwioG16g), + dhwioG8g(dnnl_dhwioG8g), ABc4a2b(dnnl_ABc4a2b), ABc8a2b(dnnl_ABc8a2b), ABcd4a2b(dnnl_ABcd4a2b), @@ -1842,7 +1846,22 @@ public enum format_tag { BcdeA24b4a(dnnl_BcdeA24b4a), aCdB24c4b(dnnl_aCdB24c4b), aCdeB24c4b(dnnl_aCdeB24c4b), - aCdefB24c4b(dnnl_aCdefB24c4b); + aCdefB24c4b(dnnl_aCdefB24c4b), + ABc16a4b(dnnl_ABc16a4b), + ABcd16a4b(dnnl_ABcd16a4b), + ABcde16a4b(dnnl_ABcde16a4b), + IwO8i4o(dnnl_IwO8i4o), + IwO24i4o(dnnl_IwO24i4o), + IhwO8i4o(dnnl_IhwO8i4o), + IhwO24i4o(dnnl_IhwO24i4o), + IdhwO8i4o(dnnl_IdhwO8i4o), + IdhwO24i4o(dnnl_IdhwO24i4o), + gIwO8i4o(dnnl_gIwO8i4o), + gIwO24i4o(dnnl_gIwO24i4o), + gIhwO8i4o(dnnl_gIhwO8i4o), + gIhwO24i4o(dnnl_gIhwO24i4o), + gIdhwO8i4o(dnnl_gIdhwO8i4o), + gIdhwO24i4o(dnnl_gIdhwO24i4o); public final int value; private format_tag(int v) { this.value = v; } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive.java b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive.java index 9fecea5a494..b86f66f8a06 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive.java @@ -92,7 +92,9 @@ public enum kind { /** A softmax primitive. */ softmax(dnnl_softmax), /** A layer normalization primitive. */ - layer_normalization(dnnl_layer_normalization); + layer_normalization(dnnl_layer_normalization), + /** A group normalization primitive */ + group_normalization(dnnl_group_normalization); public final int value; private kind(int v) { this.value = v; } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc_base.java b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc_base.java index fa66cc0536d..f7faea37134 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc_base.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc_base.java @@ -165,9 +165,9 @@ public class primitive_desc_base extends dnnl_primitive_desc_handle { * a pooling kernel parameter. */ public native @Cast({"dnnl_dim_t*", "std::vector&"}) @StdVector("dnnl_dim_t") @ByVal LongPointer get_kernel(); - /** Returns a shuffle group size parameter. - * @return A shuffle group size parameter. - * @return Zero if the primitive does not have a shuffle group size + /** Returns a group size parameter. + * @return A group size parameter. + * @return Zero if the primitive does not have a group size * parameter. */ public native @Cast("dnnl::memory::dim") long get_group_size(); diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/sum.java b/dnnl/src/gen/java/org/bytedeco/dnnl/sum.java index 895224b271e..ad7fcfe1879 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/sum.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/sum.java @@ -78,18 +78,24 @@ public static class primitive_desc extends primitive_desc_base { * memory by. * @param srcs Vector of source memory descriptors. * @param attr Primitive attributes to use. Attributes are optional - * and default to empty attributes. */ + * and default to empty attributes. + * @param allow_empty A flag signifying whether construction is + * allowed to fail without throwing an exception. In this case an + * empty object will be produced. This flag is optional and + * defaults to false. */ /// /// public primitive_desc(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @StdVector FloatPointer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr) { super((Pointer)null); allocate(aengine, dst, scales, srcs, attr); } + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, dst, scales, srcs, attr, allow_empty); } private native void allocate(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @StdVector FloatPointer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr); + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); public primitive_desc(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @StdVector FloatPointer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs) { super((Pointer)null); allocate(aengine, dst, scales, srcs); } @@ -99,11 +105,13 @@ private native void allocate(@Const @ByRef engine aengine, @Const @ByRef org.byt public primitive_desc(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @StdVector FloatBuffer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr) { super((Pointer)null); allocate(aengine, dst, scales, srcs, attr); } + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, dst, scales, srcs, attr, allow_empty); } private native void allocate(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @StdVector FloatBuffer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr); + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); public primitive_desc(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @StdVector FloatBuffer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs) { super((Pointer)null); allocate(aengine, dst, scales, srcs); } @@ -113,11 +121,13 @@ private native void allocate(@Const @ByRef engine aengine, @Const @ByRef org.byt public primitive_desc(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @StdVector float[] scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr) { super((Pointer)null); allocate(aengine, dst, scales, srcs, attr); } + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, dst, scales, srcs, attr, allow_empty); } private native void allocate(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @StdVector float[] scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr); + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); public primitive_desc(@Const @ByRef engine aengine, @Const @ByRef org.bytedeco.dnnl.memory.desc dst, @StdVector float[] scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs) { super((Pointer)null); allocate(aengine, dst, scales, srcs); } @@ -135,35 +145,45 @@ private native void allocate(@Const @ByRef engine aengine, @Const @ByRef org.byt * source memory object. * @param srcs Vector of source memory descriptors. * @param attr Primitive attributes to use. Attributes are optional - * and default to empty attributes. */ + * and default to empty attributes. + * @param allow_empty A flag signifying whether construction is + * allowed to fail without throwing an exception. In this case an + * empty object will be produced. This flag is optional and + * defaults to false. */ /// public primitive_desc(@Const @ByRef engine aengine, @StdVector FloatPointer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr) { super((Pointer)null); allocate(aengine, scales, srcs, attr); } + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, scales, srcs, attr, allow_empty); } private native void allocate(@Const @ByRef engine aengine, @StdVector FloatPointer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr); + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); public primitive_desc(@Const @ByRef engine aengine, @StdVector FloatPointer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs) { super((Pointer)null); allocate(aengine, scales, srcs); } private native void allocate(@Const @ByRef engine aengine, @StdVector FloatPointer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs); public primitive_desc(@Const @ByRef engine aengine, @StdVector FloatBuffer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr) { super((Pointer)null); allocate(aengine, scales, srcs, attr); } + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, scales, srcs, attr, allow_empty); } private native void allocate(@Const @ByRef engine aengine, @StdVector FloatBuffer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr); + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); public primitive_desc(@Const @ByRef engine aengine, @StdVector FloatBuffer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs) { super((Pointer)null); allocate(aengine, scales, srcs); } private native void allocate(@Const @ByRef engine aengine, @StdVector FloatBuffer scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs); public primitive_desc(@Const @ByRef engine aengine, @StdVector float[] scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr) { super((Pointer)null); allocate(aengine, scales, srcs, attr); } + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/) { super((Pointer)null); allocate(aengine, scales, srcs, attr, allow_empty); } private native void allocate(@Const @ByRef engine aengine, @StdVector float[] scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs, - @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr); + @Const @ByRef(nullValue = "dnnl::primitive_attr()") primitive_attr attr, + @Cast("bool") boolean allow_empty/*=false*/); public primitive_desc(@Const @ByRef engine aengine, @StdVector float[] scales, @Cast("const std::vector*") @ByRef memory_desc_vector srcs) { super((Pointer)null); allocate(aengine, scales, srcs); } private native void allocate(@Const @ByRef engine aengine, @StdVector float[] scales, @@ -172,7 +192,7 @@ private native void allocate(@Const @ByRef engine aengine, @StdVector float[] sc /** Constructs a primitive descriptor for sum primitive from a C API * primitive descriptor which must have a matching kind. * - * @param pd C API primitive descriptor for reorder primitive. */ + * @param pd C API primitive descriptor for sum primitive. */ /** \copydoc dnnl::primitive_desc_base::src_desc(int)const */ diff --git a/leptonica/README.md b/leptonica/README.md index 215f60f5b23..701707d561d 100644 --- a/leptonica/README.md +++ b/leptonica/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * Leptonica 1.83.0 http://www.leptonica.org/ + * Leptonica 1.83.1 http://www.leptonica.org/ 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.leptonica sudokutest - 1.5.9 + 1.5.10-SNAPSHOT SudokuTest @@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco leptonica-platform - 1.83.0-1.5.9 + 1.83.1-1.5.10-SNAPSHOT diff --git a/leptonica/cppbuild.sh b/leptonica/cppbuild.sh index 3e13a9cbf5a..2f1d79e6356 100755 --- a/leptonica/cppbuild.sh +++ b/leptonica/cppbuild.sh @@ -8,19 +8,19 @@ if [[ -z "$PLATFORM" ]]; then fi NASM_VERSION=2.14 -ZLIB=zlib-1.2.13 +ZLIB=zlib-1.3 GIFLIB=giflib-5.2.1 -LIBJPEG=libjpeg-turbo-2.1.4 -LIBPNG=libpng-1.6.39 # warning: libpng16 doesn't work on CentOS 6 for some reason -LIBTIFF=tiff-4.5.0 -LIBWEBP=libwebp-1.2.4 +LIBJPEG=libjpeg-turbo-2.1.5.1 +LIBPNG=libpng-1.6.40 # warning: libpng16 doesn't work on CentOS 6 for some reason +LIBTIFF=tiff-4.6.0 +LIBWEBP=libwebp-1.3.2 OPENJPEG_VERSION=2.5.0 -LEPTONICA_VERSION=1.83.0 +LEPTONICA_VERSION=1.83.1 download https://download.videolan.org/contrib/nasm/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz download http://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz download http://downloads.sourceforge.net/project/giflib/$GIFLIB.tar.gz $GIFLIB.tar.gz -download http://downloads.sourceforge.net/project/libjpeg-turbo/2.1.4/$LIBJPEG.tar.gz $LIBJPEG.tar.gz -download https://sourceforge.net/projects/libpng/files/libpng16/1.6.39/$LIBPNG.tar.gz $LIBPNG.tar.gz +download http://downloads.sourceforge.net/project/libjpeg-turbo/2.1.5.1/$LIBJPEG.tar.gz $LIBJPEG.tar.gz +download https://sourceforge.net/projects/libpng/files/libpng16/1.6.40/$LIBPNG.tar.gz $LIBPNG.tar.gz download http://download.osgeo.org/libtiff/$LIBTIFF.tar.gz $LIBTIFF.tar.gz download http://downloads.webmproject.org/releases/webp/$LIBWEBP.tar.gz $LIBWEBP.tar.gz download https://github.com/uclouvain/openjpeg/archive/refs/tags/v$OPENJPEG_VERSION.tar.gz openjpeg-$OPENJPEG_VERSION.tar.gz @@ -52,6 +52,7 @@ sedinplace 's/SOVERSION 6..../SOVERSION 6/g' leptonica-$LEPTONICA_VERSION/src/CM sedinplace 's/VERSION ${VERSION_PLAIN}/VERSION 6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt sedinplace 's/leptonica-${VERSION_PLAIN}/leptonica-6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt sedinplace 's/FATAL_ERROR/WARNING/g' leptonica-$LEPTONICA_VERSION/CMakeLists.txt +sedinplace 's/${WEBP_LIBRARY}/${WEBP_LIBRARY} ${CMAKE_INSTALL_PREFIX}\/lib\/libsharpyuv.a/g' leptonica-$LEPTONICA_VERSION/CMakeLists.txt cd nasm-$NASM_VERSION # fix for build with GCC 8.x @@ -101,7 +102,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -146,7 +147,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -190,7 +191,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -234,7 +235,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -275,7 +276,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -316,7 +317,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -361,7 +362,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -403,7 +404,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -445,7 +446,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -486,7 +487,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -526,7 +527,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -566,7 +567,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -606,7 +607,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION diff --git a/leptonica/platform/pom.xml b/leptonica/platform/pom.xml index 0cfa07ffd3e..3be4d6c98ec 100644 --- a/leptonica/platform/pom.xml +++ b/leptonica/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco leptonica-platform - 1.83.0-${project.parent.version} + 1.83.1-${project.parent.version} JavaCPP Presets Platform for Leptonica diff --git a/leptonica/pom.xml b/leptonica/pom.xml index 14e57000ebb..00fa1b3c5a6 100644 --- a/leptonica/pom.xml +++ b/leptonica/pom.xml @@ -11,7 +11,7 @@ org.bytedeco leptonica - 1.83.0-${project.parent.version} + 1.83.1-${project.parent.version} JavaCPP Presets for Leptonica diff --git a/leptonica/samples/pom.xml b/leptonica/samples/pom.xml index ac774b2843e..84dcb9073ca 100644 --- a/leptonica/samples/pom.xml +++ b/leptonica/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco leptonica-platform - 1.83.0-1.5.10-SNAPSHOT + 1.83.1-1.5.10-SNAPSHOT diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/BOX.java b/leptonica/src/gen/java/org/bytedeco/leptonica/BOX.java index c22117b3b31..7f441e49fb8 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/BOX.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/BOX.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/BOXA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/BOXA.java index ce82e5e9141..6a646517ac2 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/BOXA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/BOXA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/BOXAA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/BOXAA.java index 78ba8641645..ab9054c7c1d 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/BOXAA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/BOXAA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/CCBORD.java b/leptonica/src/gen/java/org/bytedeco/leptonica/CCBORD.java index f3fb6d65a23..34ed99c2e41 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/CCBORD.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/CCBORD.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/CCBORDA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/CCBORDA.java index a2c5ebfbb48..4e70c4b4b53 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/CCBORDA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/CCBORDA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/DLLIST.java b/leptonica/src/gen/java/org/bytedeco/leptonica/DLLIST.java index 51d46d64e7a..cf2f345d773 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/DLLIST.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/DLLIST.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/DPIX.java b/leptonica/src/gen/java/org/bytedeco/leptonica/DPIX.java index faf952c34b0..d9aa2b07b6b 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/DPIX.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/DPIX.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/FPIX.java b/leptonica/src/gen/java/org/bytedeco/leptonica/FPIX.java index b006bae4cc3..04bbcbb14fd 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/FPIX.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/FPIX.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/FPIXA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/FPIXA.java index 24f9ecb9a5e..1fa2781a94c 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/FPIXA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/FPIXA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/GPLOT.java b/leptonica/src/gen/java/org/bytedeco/leptonica/GPLOT.java index dd307db57f4..6d8cc832e35 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/GPLOT.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/GPLOT.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/Handler_BytePointer.java b/leptonica/src/gen/java/org/bytedeco/leptonica/Handler_BytePointer.java index 741375902ae..19f866a8d50 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/Handler_BytePointer.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/Handler_BytePointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/Handler_String.java b/leptonica/src/gen/java/org/bytedeco/leptonica/Handler_String.java index a14fa88e507..6649dc83225 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/Handler_String.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/Handler_String.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/JBCLASSER.java b/leptonica/src/gen/java/org/bytedeco/leptonica/JBCLASSER.java index 695c0983797..e452e67bd43 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/JBCLASSER.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/JBCLASSER.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/JBDATA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/JBDATA.java index 4fbc4fef7ba..c6c949eda71 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/JBDATA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/JBDATA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP.java index 6175c8c1925..b0f802b1500 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP_NODE.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP_NODE.java index 46c8b7547bd..43ce0c008f2 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP_NODE.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP_NODE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET.java index d6323292e73..f0fd34231a0 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET_NODE.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET_NODE.java index 2b51e1441c9..c87c15b34b3 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET_NODE.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET_NODE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_BBUFFER.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_BBUFFER.java index 3cc043e02cb..39b74913e4e 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_BBUFFER.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_BBUFFER.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_BMF.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_BMF.java index d77d3f65601..0e79ce986cd 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_BMF.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_BMF.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_BYTEA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_BYTEA.java index baeeb6a95df..c572f967195 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_BYTEA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_BYTEA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_COLORFILL.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_COLORFILL.java index acf446f185c..792582d38a3 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_COLORFILL.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_COLORFILL.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_COMP_DATA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_COMP_DATA.java index db1f97b4f40..b3e1ed2e5fb 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_COMP_DATA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_COMP_DATA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DEWARP.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DEWARP.java index 1fdeeb89586..8ed0018108c 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DEWARP.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DEWARP.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DEWARPA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DEWARPA.java index a3497310716..a21f2959a32 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DEWARPA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DEWARPA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNA.java index 80363e2bd06..53554c7e469 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNAA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNAA.java index b9d951e1d69..8fc80f26d0f 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNAA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNAA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNAHASH.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNAHASH.java index cd695f685d8..70e18945f52 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNAHASH.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_DNAHASH.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_HASHITEM.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_HASHITEM.java index af67394afb0..cfe604dabb3 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_HASHITEM.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_HASHITEM.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_HASHMAP.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_HASHMAP.java index e74389dac76..744ca821350 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_HASHMAP.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_HASHMAP.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_HEAP.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_HEAP.java index 0414f793dfe..4651e3de988 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_HEAP.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_HEAP.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_KERNEL.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_KERNEL.java index 45e520581b7..0c419053876 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_KERNEL.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_KERNEL.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_PDF_DATA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_PDF_DATA.java index 160ee814931..4034b617a59 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_PDF_DATA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_PDF_DATA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_PTRA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_PTRA.java index 67789a89ee0..9b045d98edc 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_PTRA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_PTRA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_PTRAA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_PTRAA.java index c53c202416d..7ac7188442c 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_PTRAA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_PTRAA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_QUEUE.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_QUEUE.java index 102988283af..e94156c4e03 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_QUEUE.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_QUEUE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RBTREE.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RBTREE.java index 40d0b6abe2b..156a1af04e4 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RBTREE.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RBTREE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RBTREE_NODE.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RBTREE_NODE.java index 3411bd314c8..8eb562a7055 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RBTREE_NODE.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RBTREE_NODE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RCH.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RCH.java index 0b62ad7e2a5..1715eedaa8b 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RCH.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RCH.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RCHA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RCHA.java index 76d2d5f897e..de9150fa23f 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RCHA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RCHA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RDID.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RDID.java index 246ada888eb..24a903ff9a0 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RDID.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RDID.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RECOG.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RECOG.java index e28ee1f945f..a0577a8e687 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_RECOG.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_RECOG.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_REGPARAMS.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_REGPARAMS.java index f5250288f4c..0306fe99ce6 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_REGPARAMS.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_REGPARAMS.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_STACK.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_STACK.java index 33651337e43..536e5abe4c5 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_STACK.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_STACK.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_STRCODE.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_STRCODE.java index ec9a2eda969..d68d9f2d1cd 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_STRCODE.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_STRCODE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_SUDOKU.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_SUDOKU.java index 51840565ac8..ec885fa3906 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_SUDOKU.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_SUDOKU.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_TIMER.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_TIMER.java index ba179443075..79a5bf23e91 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_TIMER.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_TIMER.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_WALLTIMER.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_WALLTIMER.java index 70316f40595..36cb056fcf2 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_WALLTIMER.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_WALLTIMER.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/L_WSHED.java b/leptonica/src/gen/java/org/bytedeco/leptonica/L_WSHED.java index 4287fb32e8b..d14a82b51c9 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/L_WSHED.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/L_WSHED.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/NUMA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/NUMA.java index 9e6e10f7122..d1a08e4093d 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/NUMA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/NUMA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/NUMAA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/NUMAA.java index dd9b9527ecc..a26d0fdd77c 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/NUMAA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/NUMAA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PIX.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PIX.java index 034a613ca30..e876ef82c97 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PIX.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PIX.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXA.java index 82e90473d15..dfaebf48792 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXAA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXAA.java index 265d4f9d10a..81aba184bd2 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXAA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXAA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXAC.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXAC.java index 1cdd6b04327..dc5d84b1ec3 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXAC.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXAC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXACC.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXACC.java index f8ec1f94666..56603dfe50d 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXACC.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXACC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXC.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXC.java index 5d5c85078c6..751baa3dadf 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXC.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXCMAP.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXCMAP.java index 85ad525afe9..4e0111a0a3d 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXCMAP.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXCMAP.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXTILING.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXTILING.java index 75005bbfe12..a3c52298e11 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PIXTILING.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PIXTILING.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PTA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PTA.java index 8ad3c82f03d..9c2c7035e9e 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PTA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PTA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/PTAA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/PTAA.java index eb180b7eeb0..25b1f809c64 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/PTAA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/PTAA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/RB_TYPE.java b/leptonica/src/gen/java/org/bytedeco/leptonica/RB_TYPE.java index fb09fd9646b..e71103602f4 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/RB_TYPE.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/RB_TYPE.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/RGBA_QUAD.java b/leptonica/src/gen/java/org/bytedeco/leptonica/RGBA_QUAD.java index 209b4ffff7d..f4986a1f7d9 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/RGBA_QUAD.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/RGBA_QUAD.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/SARRAY.java b/leptonica/src/gen/java/org/bytedeco/leptonica/SARRAY.java index 36bd01abf54..13f1c063681 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/SARRAY.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/SARRAY.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/SEL.java b/leptonica/src/gen/java/org/bytedeco/leptonica/SEL.java index 7551d2af648..913af3a1833 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/SEL.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/SEL.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/SELA.java b/leptonica/src/gen/java/org/bytedeco/leptonica/SELA.java index cdf22548495..18cfee71e16 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/SELA.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/SELA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/alloc_fn.java b/leptonica/src/gen/java/org/bytedeco/leptonica/alloc_fn.java index d9ee6f627c9..673102afe95 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/alloc_fn.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/alloc_fn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/dealloc_fn.java b/leptonica/src/gen/java/org/bytedeco/leptonica/dealloc_fn.java index 4ea6a065eb0..ce06394c5e1 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/dealloc_fn.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/dealloc_fn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica; diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/global/leptonica.java b/leptonica/src/gen/java/org/bytedeco/leptonica/global/leptonica.java index b9ef0789b92..7841b2aff71 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/global/leptonica.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/global/leptonica.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.leptonica.global; @@ -4259,7 +4259,7 @@ public class leptonica extends org.bytedeco.leptonica.presets.leptonica { public static final int LIBLEPT_MAJOR_VERSION = 1; public static final int LIBLEPT_MINOR_VERSION = 83; -public static final int LIBLEPT_PATCH_VERSION = 0; +public static final int LIBLEPT_PATCH_VERSION = 1; // #include "alltypes.h" diff --git a/onnxruntime/README.md b/onnxruntime/README.md index 0a7385a983a..0377102bf2a 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.16.0 https://microsoft.github.io/onnxruntime/ + * ONNX Runtime 1.16.1 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.16.0-1.5.10-SNAPSHOT + 1.16.1-1.5.10-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.16.0-1.5.10-SNAPSHOT + 1.16.1-1.5.10-SNAPSHOT diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index 19ea4536501..29a1b117cbe 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -21,7 +21,7 @@ if [[ "$EXTENSION" == *gpu ]]; then GPU_FLAGS="--use_cuda" fi -ONNXRUNTIME=1.16.0 +ONNXRUNTIME=1.16.1 mkdir -p "$PLATFORM$EXTENSION" cd "$PLATFORM$EXTENSION" @@ -87,7 +87,7 @@ sedinplace 's/-fvisibility=hidden//g' cmake/CMakeLists.txt cmake/adjust_global_c sedinplace 's:/Yucuda_pch.h /FIcuda_pch.h::g' cmake/onnxruntime_providers.cmake sedinplace 's/${PROJECT_SOURCE_DIR}\/external\/cub//g' cmake/onnxruntime_providers.cmake sedinplace 's/ONNXRUNTIME_PROVIDERS_SHARED)/ONNXRUNTIME_PROVIDERS_SHARED onnxruntime_providers_shared)/g' cmake/onnxruntime_providers.cmake -sedinplace 's/DNNL_TAG v.*)/DNNL_TAG v3.2.1)/g' cmake/external/dnnl.cmake +sedinplace 's/DNNL_TAG v.*)/DNNL_TAG v3.3)/g' cmake/external/dnnl.cmake sedinplace 's/DNNL_SHARED_LIB libdnnl.1.dylib/DNNL_SHARED_LIB libdnnl.2.dylib/g' cmake/external/dnnl.cmake sedinplace 's/DNNL_SHARED_LIB libdnnl.so.1/DNNL_SHARED_LIB libdnnl.so.2/g' cmake/external/dnnl.cmake sedinplace 's/ CMAKE_ARGS/CMAKE_ARGS -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_BUILD_TESTS=OFF/g' cmake/external/dnnl.cmake diff --git a/onnxruntime/platform/gpu/pom.xml b/onnxruntime/platform/gpu/pom.xml index 81d46b9f494..d0446cf820a 100644 --- a/onnxruntime/platform/gpu/pom.xml +++ b/onnxruntime/platform/gpu/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform-gpu - 1.16.0-${project.parent.version} + 1.16.1-${project.parent.version} JavaCPP Presets Platform GPU for ONNX Runtime @@ -24,7 +24,7 @@ org.bytedeco dnnl-platform - 3.2.1-${project.parent.version} + 3.3-${project.parent.version} ${project.groupId} diff --git a/onnxruntime/platform/pom.xml b/onnxruntime/platform/pom.xml index bd465efff6c..3177f877f6d 100644 --- a/onnxruntime/platform/pom.xml +++ b/onnxruntime/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform - 1.16.0-${project.parent.version} + 1.16.1-${project.parent.version} JavaCPP Presets Platform for ONNX Runtime @@ -23,7 +23,7 @@ org.bytedeco dnnl-platform - 3.2.1-${project.parent.version} + 3.3-${project.parent.version} ${project.groupId} diff --git a/onnxruntime/pom.xml b/onnxruntime/pom.xml index fca0c6fe9b5..9a4c3c48dc1 100644 --- a/onnxruntime/pom.xml +++ b/onnxruntime/pom.xml @@ -11,7 +11,7 @@ org.bytedeco onnxruntime - 1.16.0-${project.parent.version} + 1.16.1-${project.parent.version} JavaCPP Presets for ONNX Runtime @@ -22,7 +22,7 @@ org.bytedeco dnnl - 3.2.1-${project.parent.version} + 3.3-${project.parent.version} org.bytedeco @@ -49,7 +49,7 @@ org.bytedeco dnnl-platform - 3.2.1-${project.parent.version} + 3.3-${project.parent.version} diff --git a/onnxruntime/samples/pom.xml b/onnxruntime/samples/pom.xml index f9a8c43ff4a..356fa6eb909 100644 --- a/onnxruntime/samples/pom.xml +++ b/onnxruntime/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco onnxruntime-platform - 1.16.0-1.5.10-SNAPSHOT + 1.16.1-1.5.10-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.16.0-1.5.10-SNAPSHOT + 1.16.1-1.5.10-SNAPSHOT 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 ed0891ee75c..2095bd4143f 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.16.0"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.16.1"} ), @Platform( value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"}, - link = {"onnxruntime_providers_shared", "onnxruntime@.1.16.0", "onnxruntime_providers_dnnl"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.16.1", "onnxruntime_providers_dnnl"} ), @Platform( value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"}, extension = "-gpu", - link = {"onnxruntime_providers_shared", "onnxruntime@.1.16.0", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.16.1", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"} ), }, target = "org.bytedeco.onnxruntime", diff --git a/opencv/README.md b/opencv/README.md index 30936023e2c..066c43063de 100644 --- a/opencv/README.md +++ b/opencv/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * OpenCV 4.7.0 http://opencv.org/ + * OpenCV 4.8.1 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.7.0-1.5.10-SNAPSHOT + 4.8.1-1.5.10-SNAPSHOT org.bytedeco opencv-platform-gpu - 4.7.0-1.5.10-SNAPSHOT + 4.8.1-1.5.10-SNAPSHOT diff --git a/opencv/cppbuild.sh b/opencv/cppbuild.sh index 137bc104eba..a577c12d1df 100755 --- a/opencv/cppbuild.sh +++ b/opencv/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENCV_VERSION=4.8.0 +OPENCV_VERSION=4.8.1 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 diff --git a/opencv/platform/gpu/pom.xml b/opencv/platform/gpu/pom.xml index 5b9619888f9..cf870ce9a6e 100644 --- a/opencv/platform/gpu/pom.xml +++ b/opencv/platform/gpu/pom.xml @@ -12,7 +12,7 @@ org.bytedeco opencv-platform-gpu - 4.8.0-${project.parent.version} + 4.8.1-${project.parent.version} JavaCPP Presets Platform GPU for OpenCV diff --git a/opencv/platform/pom.xml b/opencv/platform/pom.xml index 442a19e22a8..fd17db85885 100644 --- a/opencv/platform/pom.xml +++ b/opencv/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco opencv-platform - 4.8.0-${project.parent.version} + 4.8.1-${project.parent.version} JavaCPP Presets Platform for OpenCV diff --git a/opencv/pom.xml b/opencv/pom.xml index 0b248728141..2c1ad828638 100644 --- a/opencv/pom.xml +++ b/opencv/pom.xml @@ -11,7 +11,7 @@ org.bytedeco opencv - 4.8.0-${project.parent.version} + 4.8.1-${project.parent.version} JavaCPP Presets for OpenCV diff --git a/opencv/samples/pom.xml b/opencv/samples/pom.xml index 25e26a76621..965e513d3f6 100644 --- a/opencv/samples/pom.xml +++ b/opencv/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco opencv-platform - 4.7.0-1.5.10-SNAPSHOT + 4.8.1-1.5.10-SNAPSHOT org.bytedeco opencv-platform-gpu - 4.7.0-1.5.10-SNAPSHOT + 4.8.1-1.5.10-SNAPSHOT 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 029cca02dce..554230bb0eb 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 @@ -2008,7 +2008,7 @@ public class opencv_core extends org.bytedeco.opencv.helper.opencv_core { public static final int CV_VERSION_MAJOR = 4; public static final int CV_VERSION_MINOR = 8; -public static final int CV_VERSION_REVISION = 0; +public static final int CV_VERSION_REVISION = 1; public static final String CV_VERSION_STATUS = ""; // #define CVAUX_STR_EXP(__A) #__A 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 89d00441fb6..6419dedcf8d 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 @@ -44,6 +44,9 @@ public class BackgroundSubtractorCNT extends BackgroundSubtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractorCNT(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractorCNT(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); // BackgroundSubtractor interface public native @Override void apply(@ByVal Mat image, @ByVal Mat fgmask, double learningRate/*=-1*/); 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 9d04bb5fa8e..30fe0b8090b 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 @@ -46,6 +46,9 @@ public class BackgroundSubtractorGMG extends BackgroundSubtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractorGMG(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractorGMG(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Returns total number of distinct colors to maintain in histogram. */ 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 b59e35a9a87..cb7ef3d8fa6 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 @@ -41,6 +41,9 @@ public class BackgroundSubtractorGSOC extends BackgroundSubtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractorGSOC(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractorGSOC(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); // BackgroundSubtractor interface public native @Override void apply(@ByVal Mat image, @ByVal Mat fgmask, double learningRate/*=-1*/); 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 e2aa6613b01..3b85b41e6ba 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 @@ -39,6 +39,9 @@ public class BackgroundSubtractorLSBP extends BackgroundSubtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractorLSBP(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractorLSBP(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); // BackgroundSubtractor interface public native @Override void apply(@ByVal Mat image, @ByVal Mat fgmask, double learningRate/*=-1*/); 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 22c1520a3d3..2383ab3c1b3 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 @@ -44,6 +44,9 @@ public class BackgroundSubtractorMOG extends BackgroundSubtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractorMOG(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractorMOG(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native int getHistory(); public native void setHistory(int nframes); 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 f6046d0eec5..dd94ae36bef 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 @@ -42,6 +42,9 @@ public class SyntheticSequenceGenerator extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SyntheticSequenceGenerator(Pointer p) { super(p); } + /** Downcast constructor. */ + public SyntheticSequenceGenerator(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Creates an instance of SyntheticSequenceGenerator.

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 a39a8d07ebb..89f700c70bc 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 @@ -39,6 +39,9 @@ public class LMSolver extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public LMSolver(Pointer p) { super(p); } + /** Downcast constructor. */ + public LMSolver(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public static class Callback extends Pointer { static { Loader.load(); } 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 9bd3a80c702..86e22baefb6 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 @@ -35,6 +35,9 @@ public class StereoBM extends StereoMatcher { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StereoBM(Pointer p) { super(p); } + /** Downcast constructor. */ + public StereoBM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::StereoBM:: */ public static final int PREFILTER_NORMALIZED_RESPONSE = 0, 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 e75b85236bd..f20aedfea53 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 @@ -33,6 +33,9 @@ public class StereoMatcher extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StereoMatcher(Pointer p) { super(p); } + /** Downcast constructor. */ + public StereoMatcher(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::StereoMatcher:: */ public static final int DISP_SHIFT = 4, 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 132bb83a69b..b74e533659a 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 @@ -49,6 +49,9 @@ public class StereoSGBM extends StereoMatcher { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StereoSGBM(Pointer p) { super(p); } + /** Downcast constructor. */ + public StereoSGBM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::StereoSGBM:: */ public static final int 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 310b24cba77..34d95c03a77 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 @@ -30,6 +30,8 @@ public class DMatchVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public DMatch front() { return get(0); } + public DMatch back() { return get(size() - 1); } @Index(function = "at") public native @ByRef DMatch get(@Cast("size_t") long i); public native DMatchVector put(@Cast("size_t") long i, DMatch value); 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 de4cc224a1e..4db2e0dc739 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 @@ -30,6 +30,8 @@ public class DMatchVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public DMatchVector front() { return get(0); } + public DMatchVector back() { return get(size() - 1); } @Index(function = "at") public native @ByRef DMatchVector get(@Cast("size_t") long i); public native DMatchVectorVector put(@Cast("size_t") long i, DMatchVector value); 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 5dc97b29470..5f674436789 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 @@ -30,6 +30,8 @@ public class GpuMatVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public GpuMat front() { return get(0); } + public GpuMat back() { return get(size() - 1); } @Index(function = "at") public native @ByRef GpuMat get(@Cast("size_t") long i); public native GpuMatVector put(@Cast("size_t") long i, GpuMat value); 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 b75b5708583..1e03940494b 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 @@ -30,6 +30,8 @@ public class KeyPointVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public KeyPoint front() { return get(0); } + public KeyPoint back() { return get(size() - 1); } @Index(function = "at") public native @ByRef KeyPoint get(@Cast("size_t") long i); public native KeyPointVector put(@Cast("size_t") long i, KeyPoint value); 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 3ba3fd1c7d6..0694dbe2949 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 @@ -30,6 +30,8 @@ public class KeyPointVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public KeyPointVector front() { return get(0); } + public KeyPointVector back() { return get(size() - 1); } @Index(function = "at") public native @ByRef KeyPointVector get(@Cast("size_t") long i); public native KeyPointVectorVector put(@Cast("size_t") long i, KeyPointVector value); 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 f1802bfc728..8ac0d9627bb 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 @@ -30,6 +30,8 @@ public class MatVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Mat front() { return get(0); } + public Mat back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Mat get(@Cast("size_t") long i); public native MatVector put(@Cast("size_t") long i, Mat value); 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 43a964b59cf..e41afea3480 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 @@ -30,6 +30,8 @@ public class MatVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public MatVector front() { return get(0); } + public MatVector back() { return get(size() - 1); } @Index(function = "at") public native @ByRef MatVector get(@Cast("size_t") long i); public native MatVectorVector put(@Cast("size_t") long i, MatVector value); 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 da4ea8286f9..0d3617ce5d7 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 @@ -30,6 +30,8 @@ public class NodeDataTlsVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public NodeDataTls front() { return get(0); } + public NodeDataTls back() { return get(size() - 1); } @Index(function = "at") public native NodeDataTls get(@Cast("size_t") long i); public native NodeDataTlsVector put(@Cast("size_t") long i, NodeDataTls value); 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 22b0cb3a592..511adefd10d 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 @@ -30,6 +30,8 @@ public class Point2dVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point2d front() { return get(0); } + public Point2d back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Point2d get(@Cast("size_t") long i); public native Point2dVector put(@Cast("size_t") long i, Point2d value); 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 7addaf15915..e82791547ff 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 @@ -30,6 +30,8 @@ public class Point2dVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point2dVector front() { return get(0); } + public Point2dVector back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Point2dVector get(@Cast("size_t") long i); public native Point2dVectorVector put(@Cast("size_t") long i, Point2dVector value); 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 ccc7d638a9c..845de795c9e 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 @@ -30,6 +30,8 @@ public class Point2fVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point2f front() { return get(0); } + public Point2f back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Point2f get(@Cast("size_t") long i); public native Point2fVector put(@Cast("size_t") long i, Point2f value); 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 d6c78a1eac0..8c026d0f905 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 @@ -30,6 +30,8 @@ public class Point2fVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point2fVector front() { return get(0); } + public Point2fVector back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Point2fVector get(@Cast("size_t") long i); public native Point2fVectorVector put(@Cast("size_t") long i, Point2fVector value); 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 a70929ac96f..5ba44af103b 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 @@ -30,6 +30,8 @@ public class Point3fVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point3f front() { return get(0); } + public Point3f back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Point3f get(@Cast("size_t") long i); public native Point3fVector put(@Cast("size_t") long i, Point3f value); 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 60af7683dd9..e9c511a256d 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 @@ -30,6 +30,8 @@ public class Point3fVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point3fVector front() { return get(0); } + public Point3fVector back() { return get(size() - 1); } @Index(function = "at") public native @Cast("std::vector*") @ByRef Point3fVector get(@Cast("size_t") long i); public native Point3fVectorVector put(@Cast("size_t") long i, Point3fVector value); 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 adf53116fcc..16656830ff6 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 @@ -30,6 +30,8 @@ public class Point3iVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point3i front() { return get(0); } + public Point3i back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Point3i get(@Cast("size_t") long i); public native Point3iVector put(@Cast("size_t") long i, Point3i value); 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 bb26683a21c..7ffc2b646c5 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 @@ -30,6 +30,8 @@ public class PointVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point front() { return get(0); } + public Point back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Point get(@Cast("size_t") long i); public native PointVector put(@Cast("size_t") long i, Point value); 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 357b6afec1e..f305c60f32a 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 @@ -30,6 +30,8 @@ public class PointVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public PointVector front() { return get(0); } + public PointVector back() { return get(size() - 1); } @Index(function = "at") public native @ByRef PointVector get(@Cast("size_t") long i); public native PointVectorVector put(@Cast("size_t") long i, PointVector value); 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 490d0107261..ca0d0df1094 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 @@ -30,6 +30,8 @@ public class RangeVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Range front() { return get(0); } + public Range back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Range get(@Cast("size_t") long i); public native RangeVector put(@Cast("size_t") long i, Range value); 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 f6c60b334cb..7e58635678a 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 @@ -30,6 +30,8 @@ public class Rect2dVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Rect2d front() { return get(0); } + public Rect2d back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Rect2d get(@Cast("size_t") long i); public native Rect2dVector put(@Cast("size_t") long i, Rect2d value); 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 6bd2876daaa..6f7c0aeafe3 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 @@ -30,6 +30,8 @@ public class RectVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Rect front() { return get(0); } + public Rect back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Rect get(@Cast("size_t") long i); public native RectVector put(@Cast("size_t") long i, Rect value); 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 ca7348c1c37..bc4ecba528e 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 @@ -30,6 +30,8 @@ public class RectVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public RectVector front() { return get(0); } + public RectVector back() { return get(size() - 1); } @Index(function = "at") public native @ByRef RectVector get(@Cast("size_t") long i); public native RectVectorVector put(@Cast("size_t") long i, RectVector value); 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 64f617d9fa7..9d3735209ac 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 @@ -30,6 +30,8 @@ public class ScalarVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Scalar front() { return get(0); } + public Scalar back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Scalar get(@Cast("size_t") long i); public native ScalarVector put(@Cast("size_t") long i, Scalar value); 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 8eadade7f9d..25b64e5ece6 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 @@ -30,6 +30,8 @@ public class SizeVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Size front() { return get(0); } + public Size back() { return get(size() - 1); } @Index(function = "at") public native @ByRef Size get(@Cast("size_t") long i); public native SizeVector put(@Cast("size_t") long i, Size value); 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 a990e84701c..8cd03532739 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 @@ -32,6 +32,8 @@ public class StringVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public BytePointer front() { return get(0); } + public BytePointer back() { return get(size() - 1); } @Index(function = "at") public native @Str BytePointer get(@Cast("size_t") long i); public native StringVector put(@Cast("size_t") long i, BytePointer value); @ValueSetter @Index(function = "at") public native StringVector put(@Cast("size_t") long i, @Str String value); 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 a6aff3e794b..3bea592f30c 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 @@ -30,6 +30,8 @@ public class UMatVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public UMat front() { return get(0); } + public UMat back() { return get(size() - 1); } @Index(function = "at") public native @ByRef UMat get(@Cast("size_t") long i); public native UMatVector put(@Cast("size_t") long i, UMat value); 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 66857a7e687..f857abcc2a2 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 @@ -34,6 +34,8 @@ public class MatPointerVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Mat front() { return get(0); } + public Mat back() { return get(size() - 1); } @Index(function = "at") public native Mat get(@Cast("size_t") long i); public native MatPointerVector put(@Cast("size_t") long i, Mat value); 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 0fb8c15a50f..9ba08d085a7 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 @@ -34,6 +34,8 @@ public class MatShapeVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public IntPointer front() { return get(0); } + public IntPointer back() { return get(size() - 1); } @Index(function = "at") public native @StdVector IntPointer get(@Cast("size_t") long i); public native MatShapeVector put(@Cast("size_t") long i, IntPointer value); 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 2932a4f053c..70d4ea8a529 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 @@ -34,6 +34,8 @@ public class MatShapeVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public MatShapeVector front() { return get(0); } + public MatShapeVector back() { return get(size() - 1); } @Index(function = "at") public native @ByRef MatShapeVector get(@Cast("size_t") long i); public native MatShapeVectorVector put(@Cast("size_t") long i, MatShapeVector value); 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 1e5afa88df2..5faeaadac2b 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 @@ -43,6 +43,9 @@ public class BasicFaceRecognizer extends FaceRecognizer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BasicFaceRecognizer(Pointer p) { super(p); } + /** Downcast constructor. */ + public BasicFaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** @see setNumComponents */ public native int getNumComponents(); 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 06981e893bf..158e0bb8169 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 @@ -39,6 +39,9 @@ public class EigenFaceRecognizer extends BasicFaceRecognizer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public EigenFaceRecognizer(Pointer p) { super(p); } + /** Downcast constructor. */ + public EigenFaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** @param num_components The number of components (read: Eigenfaces) kept for this Principal 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 6d3c75bd43b..0f7b8d4e8f6 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 @@ -140,6 +140,9 @@ public class FaceRecognizer extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FaceRecognizer(Pointer p) { super(p); } + /** Downcast constructor. */ + public FaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Trains a FaceRecognizer with given data and associated labels.

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 445391b8d15..2ca9d9f2a33 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 @@ -58,6 +58,11 @@ public class Facemark extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Facemark(Pointer p) { super(p); } + /** Downcast constructor. */ + public Facemark(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Facemark pointer); /** \brief A function to load the trained model before the fitting process. 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 f6902acdf8c..15ed33a068b 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 @@ -42,6 +42,9 @@ public class FacemarkAAM extends FacemarkTrain { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FacemarkAAM(Pointer p) { super(p); } + /** Downcast constructor. */ + public FacemarkAAM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); @NoOffset public static class Params extends Pointer { static { Loader.load(); } 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 af64cfcda6c..c555f380019 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 @@ -38,6 +38,9 @@ public class FacemarkKazemi extends Facemark { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FacemarkKazemi(Pointer p) { super(p); } + /** Downcast constructor. */ + public FacemarkKazemi(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); @NoOffset public static class Params extends Pointer { static { Loader.load(); } 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 7d7df559482..03ca2731cf9 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 @@ -42,6 +42,9 @@ public class FacemarkLBF extends FacemarkTrain { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FacemarkLBF(Pointer p) { super(p); } + /** Downcast constructor. */ + public FacemarkLBF(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); @NoOffset public static class Params extends Pointer { static { Loader.load(); } 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 7ef0703df41..2b972dec3ef 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 @@ -66,6 +66,9 @@ public class FacemarkTrain extends Facemark { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FacemarkTrain(Pointer p) { super(p); } + /** Downcast constructor. */ + public FacemarkTrain(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Add one training sample to the trainer.

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 7c75a70150c..9602ae825cd 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 @@ -39,6 +39,9 @@ public class FisherFaceRecognizer extends BasicFaceRecognizer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FisherFaceRecognizer(Pointer p) { super(p); } + /** Downcast constructor. */ + public FisherFaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** @param num_components The number of components (read: Fisherfaces) kept for this Linear 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 246a827ae80..b89f2f3a05f 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 @@ -40,6 +40,9 @@ public class LBPHFaceRecognizer extends FaceRecognizer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public LBPHFaceRecognizer(Pointer p) { super(p); } + /** Downcast constructor. */ + public LBPHFaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** @see setGridX */ public native int getGridX(); 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 2ed149b3a31..d62707ce75c 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 @@ -44,6 +44,9 @@ public class BFMatcher extends DescriptorMatcher { @Override public BFMatcher getPointer(long i) { return new BFMatcher((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public BFMatcher(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Brute-force matcher constructor (obsolete). Please use BFMatcher.create() * 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 2b43bcdef23..f974cba5ab5 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 @@ -41,6 +41,9 @@ public class DescriptorMatcher extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DescriptorMatcher(Pointer p) { super(p); } + /** Downcast constructor. */ + public DescriptorMatcher(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::DescriptorMatcher::MatcherType */ public static final int 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 1f4aba66ed3..9529a3e9adf 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 @@ -48,6 +48,11 @@ public class Feature2D extends Algorithm { @Override public Feature2D getPointer(long i) { return new Feature2D((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public Feature2D(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Feature2D pointer); /** \brief Detects keypoints in an image (first variant) or image set (second variant). 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 6bcb66f3a44..820eb6c0f8f 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 @@ -47,6 +47,9 @@ public class FlannBasedMatcher extends DescriptorMatcher { @Override public FlannBasedMatcher getPointer(long i) { return new FlannBasedMatcher((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public FlannBasedMatcher(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public FlannBasedMatcher( @Ptr IndexParams indexParams/*=makePtr()*/, @Ptr SearchParams searchParams/*=makePtr()*/ ) { super((Pointer)null); allocate(indexParams, searchParams); } 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 5cf17672dfe..4221229a8f8 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 @@ -32,6 +32,8 @@ public class Vec2fVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point2f front() { return get(0); } + public Point2f back() { return get(size() - 1); } @Index(function = "at") public native @Cast("cv::Vec2f*") @ByRef Point2f get(@Cast("size_t") long i); public native Vec2fVector put(@Cast("size_t") long i, Point2f value); 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 5f2a3ae4a0c..c007001908e 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 @@ -32,6 +32,8 @@ public class Vec3fVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Point3f front() { return get(0); } + public Point3f back() { return get(size() - 1); } @Index(function = "at") public native @Cast("cv::Vec3f*") @ByRef Point3f get(@Cast("size_t") long i); public native Vec3fVector put(@Cast("size_t") long i, Point3f value); 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 a28b089a1a9..54ab29d19ce 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 @@ -32,6 +32,8 @@ public class Vec4fVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Scalar4f front() { return get(0); } + public Scalar4f back() { return get(size() - 1); } @Index(function = "at") public native @Cast("cv::Vec4f*") @ByRef Scalar4f get(@Cast("size_t") long i); public native Vec4fVector put(@Cast("size_t") long i, Scalar4f value); 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 82de307301b..d1d7af5ca13 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 @@ -32,6 +32,8 @@ public class Vec4iVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Scalar4i front() { return get(0); } + public Scalar4i back() { return get(size() - 1); } @Index(function = "at") public native @Cast("cv::Vec4i*") @ByRef Scalar4i get(@Cast("size_t") long i); public native Vec4iVector put(@Cast("size_t") long i, Scalar4i value); 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 2101c9651dc..a8c8f2a946a 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 @@ -32,6 +32,8 @@ public class Vec6fVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public FloatPointer front() { return get(0); } + public FloatPointer back() { return get(size() - 1); } @Index(function = "at") public native @Cast("cv::Vec6f*") @ByRef FloatPointer get(@Cast("size_t") long i); public native Vec6fVector put(@Cast("size_t") long i, FloatPointer value); 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 b815326ed69..b67df3c51d0 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 @@ -39,6 +39,9 @@ public class CCheckerDetector extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CCheckerDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public CCheckerDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Set the net which will be used to find the approximate * bounding boxes for the color charts. 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 2b24b045558..04dc49ffd37 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 @@ -48,6 +48,8 @@ public class CCheckerVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public CChecker front() { return get(0); } + public CChecker back() { return get(size() - 1); } @Index(function = "at") public native @Ptr CChecker get(@Cast("size_t") long i); public native CCheckerVector put(@Cast("size_t") long i, CChecker value); 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 8d67fc8446a..0a60e452e9d 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 @@ -51,6 +51,9 @@ public class ArucoDetector extends Algorithm { @Override public ArucoDetector getPointer(long i) { return new ArucoDetector((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public ArucoDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Basic ArucoDetector constructor * 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 c3561d20200..07f24a9fe60 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 @@ -35,6 +35,9 @@ public class BaseCascadeClassifier extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BaseCascadeClassifier(Pointer p) { super(p); } + /** Downcast constructor. */ + public BaseCascadeClassifier(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native @Cast("bool") @Override boolean empty(); public native @Cast("bool") boolean load( @Str BytePointer filename ); 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 d001a1f9a91..18da50e32d6 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 @@ -35,6 +35,9 @@ public class CharucoDetector extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CharucoDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public CharucoDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Basic CharucoDetector constructor * 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 d78e63f2263..d4371574a76 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 @@ -81,6 +81,9 @@ public class DualTVL1OpticalFlow extends DenseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DualTVL1OpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public DualTVL1OpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Time step of the numerical scheme /** @see setTau */ 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 145dd2e3c61..816525a706d 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 @@ -27,6 +27,11 @@ public class PhaseUnwrapping extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public PhaseUnwrapping(Pointer p) { super(p); } + /** Downcast constructor. */ + public PhaseUnwrapping(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(PhaseUnwrapping pointer); /** * \brief Unwraps a 2D phase map. 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 288112686f4..72009421a45 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 @@ -28,6 +28,11 @@ public class QualityBase extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public QualityBase(Pointer p) { super(p); } + /** Downcast constructor. */ + public QualityBase(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(QualityBase pointer); /** \brief Destructor */ 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 a808e6441c8..af501d91235 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 @@ -35,6 +35,9 @@ public class GOSTracker extends Tracker { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public GOSTracker(Pointer p) { super(p); } + /** Downcast constructor. */ + public GOSTracker(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public static native @Ptr OLSTracker create(@ByVal Mat pts3d, @ByVal Mat tris, int histBins/*=4*/, @Cast("uchar") byte sobelThesh/*=10*/); public static native @Ptr OLSTracker create(@ByVal Mat pts3d, @ByVal Mat tris); 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 c28a6acadc1..8f8482b6c63 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 @@ -36,6 +36,9 @@ public class OLSTracker extends Tracker { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public OLSTracker(Pointer p) { super(p); } + /** Downcast constructor. */ + public OLSTracker(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public static native @Ptr OLSTracker create(@ByVal Mat pts3d, @ByVal Mat tris, int histBins/*=8*/, @Cast("uchar") byte sobelThesh/*=10*/); public static native @Ptr OLSTracker create(@ByVal Mat pts3d, @ByVal Mat tris); 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 bc1baf0157b..2d6887a3109 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 @@ -34,6 +34,9 @@ public class Rapid extends Tracker { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Rapid(Pointer p) { super(p); } + /** Downcast constructor. */ + public Rapid(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public static native @Ptr Rapid create(@ByVal Mat pts3d, @ByVal Mat tris); public static native @Ptr Rapid create(@ByVal UMat pts3d, @ByVal UMat tris); 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 6e80dda7ea3..0ff8e0ebab7 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 @@ -34,6 +34,9 @@ public class Tracker extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Tracker(Pointer p) { super(p); } + /** Downcast constructor. */ + public Tracker(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native float compute(@ByVal Mat img, int num, int len, @ByVal Mat K, @ByVal Mat rvec, @ByVal Mat tvec, @Const @ByRef(nullValue = "cv::TermCriteria(cv::TermCriteria::MAX_ITER | cv::TermCriteria::EPS, 5, 1.5)") TermCriteria termcrit); 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 1a01dc16276..ac163cb69ed 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 @@ -32,6 +32,14 @@ public class MotionSaliency extends Saliency { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MotionSaliency(Pointer p) { super(p); } + /** Downcast constructor. */ + public MotionSaliency(Saliency pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Saliency pointer); + /** Downcast constructor. */ + public MotionSaliency(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + public Saliency asSaliency() { return asSaliency(this); } + @Namespace public static native @Name("static_cast") Saliency asSaliency(MotionSaliency pointer); } 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 2c15c6aaac4..b5b9aa2796d 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 @@ -54,6 +54,12 @@ public class MotionSaliencyBinWangApr2014 extends MotionSaliency { @Override public MotionSaliencyBinWangApr2014 getPointer(long i) { return new MotionSaliencyBinWangApr2014((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public MotionSaliencyBinWangApr2014(Saliency pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Saliency pointer); + /** Downcast constructor. */ + public MotionSaliencyBinWangApr2014(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public MotionSaliencyBinWangApr2014() { super((Pointer)null); allocate(); } private native void allocate(); 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 0fb0381be3f..47dd43aa372 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 @@ -32,6 +32,14 @@ public class Objectness extends Saliency { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Objectness(Pointer p) { super(p); } + /** Downcast constructor. */ + public Objectness(Saliency pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Saliency pointer); + /** Downcast constructor. */ + public Objectness(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + public Saliency asSaliency() { return asSaliency(this); } + @Namespace public static native @Name("static_cast") Saliency asSaliency(Objectness pointer); } 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 5887b6dc23a..5a0ed161c4f 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 @@ -49,6 +49,12 @@ public class ObjectnessBING extends Objectness { @Override public ObjectnessBING getPointer(long i) { return new ObjectnessBING((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public ObjectnessBING(Saliency pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Saliency pointer); + /** Downcast constructor. */ + public ObjectnessBING(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public ObjectnessBING() { super((Pointer)null); allocate(); } 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 e890c1d0ae8..e8c8b6c36a5 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 @@ -36,6 +36,11 @@ public class Saliency extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Saliency(Pointer p) { super(p); } + /** Downcast constructor. */ + public Saliency(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Saliency pointer); /** * \brief Destructor 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 bcd3ce2fd64..0dfa5555a1a 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 @@ -32,6 +32,14 @@ public class StaticSaliency extends Saliency { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StaticSaliency(Pointer p) { super(p); } + /** Downcast constructor. */ + public StaticSaliency(Saliency pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Saliency pointer); + /** Downcast constructor. */ + public StaticSaliency(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + public Saliency asSaliency() { return asSaliency(this); } + @Namespace public static native @Name("static_cast") Saliency asSaliency(StaticSaliency pointer); /** \brief This function perform a binary map of given saliency map. This is obtained in this 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 be4109e848e..88fb05cd563 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 @@ -46,6 +46,9 @@ public class StaticSaliencyFineGrained extends StaticSaliency { @Override public StaticSaliencyFineGrained getPointer(long i) { return new StaticSaliencyFineGrained((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public StaticSaliencyFineGrained(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public StaticSaliencyFineGrained() { super((Pointer)null); allocate(); } 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 e4bc1be1cc7..47e14221ccb 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 @@ -52,6 +52,9 @@ public class StaticSaliencySpectralResidual extends StaticSaliency { @Override public StaticSaliencySpectralResidual getPointer(long i) { return new StaticSaliencySpectralResidual((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public StaticSaliencySpectralResidual(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public StaticSaliencySpectralResidual() { super((Pointer)null); allocate(); } 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 ea501d01627..6556ec36dbb 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 @@ -38,6 +38,9 @@ public class AffineTransformer extends ShapeTransformer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AffineTransformer(Pointer p) { super(p); } + /** Downcast constructor. */ + public AffineTransformer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native void setFullAffine(@Cast("bool") boolean fullAffine); public native @Cast("bool") boolean getFullAffine(); 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 b35df7882ab..d05ef9f2036 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 @@ -35,6 +35,9 @@ public class EMDHistogramCostExtractor extends HistogramCostExtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public EMDHistogramCostExtractor(Pointer p) { super(p); } + /** Downcast constructor. */ + public EMDHistogramCostExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native void setNormFlag(int flag); public native int getNormFlag(); 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 0d564d7e77b..0c8a4e8604a 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 @@ -41,6 +41,9 @@ public class HausdorffDistanceExtractor extends ShapeDistanceExtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public HausdorffDistanceExtractor(Pointer p) { super(p); } + /** Downcast constructor. */ + public HausdorffDistanceExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Set the norm used to compute the Hausdorff value between two shapes. It can be L1 or L2 norm.

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 bc21b76d724..fedfd16f4cd 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 @@ -38,6 +38,9 @@ public class HistogramCostExtractor extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public HistogramCostExtractor(Pointer p) { super(p); } + /** Downcast constructor. */ + public HistogramCostExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native void buildCostMatrix(@ByVal Mat descriptors1, @ByVal Mat descriptors2, @ByVal Mat costMatrix); public native void buildCostMatrix(@ByVal UMat descriptors1, @ByVal UMat descriptors2, @ByVal UMat costMatrix); 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 c34a9f70fa0..fc58e36510b 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 @@ -35,6 +35,9 @@ public class NormHistogramCostExtractor extends HistogramCostExtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public NormHistogramCostExtractor(Pointer p) { super(p); } + /** Downcast constructor. */ + public NormHistogramCostExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native void setNormFlag(int flag); public native int getNormFlag(); 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 2a829293191..d3d26291ec5 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 @@ -42,6 +42,9 @@ public class ShapeContextDistanceExtractor extends ShapeDistanceExtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ShapeContextDistanceExtractor(Pointer p) { super(p); } + /** Downcast constructor. */ + public ShapeContextDistanceExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Establish the number of angular bins for the Shape Context Descriptor used in the shape matching pipeline. 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 f2f74ed9c85..99b10e25cfa 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 @@ -41,6 +41,9 @@ public class ShapeDistanceExtractor extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ShapeDistanceExtractor(Pointer p) { super(p); } + /** Downcast constructor. */ + public ShapeDistanceExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Compute the shape distance between two shapes defined by its contours.

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 0515cce4139..7831093ded2 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 @@ -38,6 +38,9 @@ public class ShapeTransformer extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ShapeTransformer(Pointer p) { super(p); } + /** Downcast constructor. */ + public ShapeTransformer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Estimate the transformation parameters of the current transformer algorithm, based on point matches.

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 2db79979b9f..d47454ee088 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 @@ -41,6 +41,9 @@ public class ThinPlateSplineShapeTransformer extends ShapeTransformer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ThinPlateSplineShapeTransformer(Pointer p) { super(p); } + /** Downcast constructor. */ + public ThinPlateSplineShapeTransformer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Set the regularization parameter for relaxing the exact interpolation requirements of the TPS algorithm. 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 cb5138bc3cc..5296c1469eb 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 @@ -58,6 +58,8 @@ public class CameraParamsVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public CameraParams front() { return get(0); } + public CameraParams back() { return get(size() - 1); } @Index(function = "at") public native @ByRef CameraParams get(@Cast("size_t") long i); public native CameraParamsVector put(@Cast("size_t") long i, CameraParams value); 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 6ea074c3bce..f9c33e7ce1b 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 @@ -58,6 +58,8 @@ public class ImageFeaturesVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public ImageFeatures front() { return get(0); } + public ImageFeatures back() { return get(size() - 1); } @Index(function = "at") public native @ByRef ImageFeatures get(@Cast("size_t") long i); public native ImageFeaturesVector put(@Cast("size_t") long i, ImageFeatures value); 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 5fb10eee4f9..9860659cfc3 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 @@ -58,6 +58,8 @@ public class MatchesInfoVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public MatchesInfo front() { return get(0); } + public MatchesInfo back() { return get(size() - 1); } @Index(function = "at") public native @ByRef MatchesInfo get(@Cast("size_t") long i); public native MatchesInfoVector put(@Cast("size_t") long i, MatchesInfo value); 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 17d1ad42f1b..a1f892528fb 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 @@ -52,6 +52,9 @@ public class GrayCodePattern extends StructuredLightPattern { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public GrayCodePattern(Pointer p) { super(p); } + /** Downcast constructor. */ + public GrayCodePattern(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Parameters of StructuredLightPattern constructor. 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 b3a2b034bce..7bb8e253a56 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 @@ -40,6 +40,9 @@ public class SinusoidalPattern extends StructuredLightPattern { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SinusoidalPattern(Pointer p) { super(p); } + /** Downcast constructor. */ + public SinusoidalPattern(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** * \brief Parameters of SinusoidalPattern constructor 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 45a97f08518..e5c9886d326 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 @@ -37,6 +37,11 @@ public class StructuredLightPattern extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StructuredLightPattern(Pointer p) { super(p); } + /** Downcast constructor. */ + public StructuredLightPattern(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(StructuredLightPattern pointer); /** \brief Generates the structured light pattern to project.

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 f1f44ad5256..31b61b889eb 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 @@ -44,6 +44,14 @@ public class BroxOpticalFlow extends DenseOpticalFlowExt { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BroxOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public BroxOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + /** Downcast constructor. */ + public BroxOpticalFlow(DenseOpticalFlowExt pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(DenseOpticalFlowExt pointer); + public DenseOpticalFlowExt asDenseOpticalFlowExt() { return asDenseOpticalFlowExt(this); } + @Namespace public static native @Name("static_cast") DenseOpticalFlowExt asDenseOpticalFlowExt(BroxOpticalFlow pointer); /** \brief Flow smoothness /** @see setAlpha */ 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 94e01c83840..6e17f5c63f9 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 @@ -46,6 +46,9 @@ public class DenseOpticalFlowExt extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DenseOpticalFlowExt(Pointer p) { super(p); } + /** Downcast constructor. */ + public DenseOpticalFlowExt(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native void calc(@ByVal Mat frame0, @ByVal Mat frame1, @ByVal Mat flow1, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") Mat flow2); public native void calc(@ByVal Mat frame0, @ByVal Mat frame1, @ByVal Mat flow1); 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 308049af8da..101666cf119 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 @@ -44,6 +44,14 @@ public class PyrLKOpticalFlow extends DenseOpticalFlowExt { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public PyrLKOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public PyrLKOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + /** Downcast constructor. */ + public PyrLKOpticalFlow(DenseOpticalFlowExt pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(DenseOpticalFlowExt pointer); + public DenseOpticalFlowExt asDenseOpticalFlowExt() { return asDenseOpticalFlowExt(this); } + @Namespace public static native @Name("static_cast") DenseOpticalFlowExt asDenseOpticalFlowExt(PyrLKOpticalFlow pointer); /** @see setWindowSize */ public native int getWindowSize(); 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 7cbbeba11b2..cdfb35b6631 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 @@ -47,6 +47,14 @@ public class SuperResDualTVL1OpticalFlow extends DenseOpticalFlowExt { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SuperResDualTVL1OpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public SuperResDualTVL1OpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + /** Downcast constructor. */ + public SuperResDualTVL1OpticalFlow(DenseOpticalFlowExt pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(DenseOpticalFlowExt pointer); + public DenseOpticalFlowExt asDenseOpticalFlowExt() { return asDenseOpticalFlowExt(this); } + @Namespace public static native @Name("static_cast") DenseOpticalFlowExt asDenseOpticalFlowExt(SuperResDualTVL1OpticalFlow pointer); /** @see setTau */ public native double getTau(); 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 91e323d5af3..35950e7112a 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 @@ -44,6 +44,14 @@ public class SuperResFarnebackOpticalFlow extends DenseOpticalFlowExt { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SuperResFarnebackOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public SuperResFarnebackOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + /** Downcast constructor. */ + public SuperResFarnebackOpticalFlow(DenseOpticalFlowExt pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(DenseOpticalFlowExt pointer); + public DenseOpticalFlowExt asDenseOpticalFlowExt() { return asDenseOpticalFlowExt(this); } + @Namespace public static native @Name("static_cast") DenseOpticalFlowExt asDenseOpticalFlowExt(SuperResFarnebackOpticalFlow pointer); /** @see setPyrScale */ public native double getPyrScale(); 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 405285701ed..4957c8192e8 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 @@ -48,6 +48,9 @@ public class SuperResolution extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SuperResolution(Pointer p) { super(p); } + /** Downcast constructor. */ + public SuperResolution(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public FrameSource asFrameSource() { return asFrameSource(this); } @Namespace public static native @Name("static_cast") FrameSource asFrameSource(SuperResolution pointer); 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 985a3544179..540f233aadf 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 @@ -48,6 +48,8 @@ public class DoubleVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public double front() { return get(0); } + public double back() { return get(size() - 1); } @Index(function = "at") public native double get(@Cast("size_t") long i); public native DoubleVector put(@Cast("size_t") long i, double value); 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 c5e5317c1c4..dcd9e6e297e 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 @@ -40,6 +40,9 @@ public class ERFilter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ERFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public ERFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Callback with the classifier is made a class. 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 e5544526f83..861a3fc8229 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 @@ -48,6 +48,8 @@ public class ERStatVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public ERStat front() { return get(0); } + public ERStat back() { return get(size() - 1); } @Index(function = "at") public native @ByRef ERStat get(@Cast("size_t") long i); public native ERStatVector put(@Cast("size_t") long i, ERStat value); 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 976e1b69eb3..0f25145d679 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 @@ -48,6 +48,8 @@ public class ERStatVectorVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public ERStatVector front() { return get(0); } + public ERStatVector back() { return get(size() - 1); } @Index(function = "at") public native @ByRef ERStatVector get(@Cast("size_t") long i); public native ERStatVectorVector put(@Cast("size_t") long i, ERStatVector value); 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 788106fe208..cde09505c15 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 @@ -48,6 +48,8 @@ public class FloatVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public float front() { return get(0); } + public float back() { return get(size() - 1); } @Index(function = "at") public native float get(@Cast("size_t") long i); public native FloatVector put(@Cast("size_t") long i, float value); 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 7346b340d94..6566462bab3 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 @@ -47,6 +47,8 @@ public class IntDeque extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public int front() { return get(0); } + public int back() { return get(size() - 1); } @Index(function = "at") public native int get(@Cast("size_t") long i); public native IntDeque put(@Cast("size_t") long i, int value); 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 b217792c0db..659dbabded2 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 @@ -47,6 +47,8 @@ public class IntVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public int front() { return get(0); } + public int back() { return get(size() - 1); } @Index(function = "at") public native int get(@Cast("size_t") long i); public native IntVector put(@Cast("size_t") long i, int value); 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 c3a14710dc1..aa7cc094b0e 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 @@ -46,6 +46,8 @@ public class SizeTPointVectorMap extends Pointer { public boolean empty() { return size() == 0; } public native long size(); + public PointVector front() { return get(0); } + public PointVector back() { return get(size() - 1); } @Index public native @ByRef PointVector get(@Cast("size_t") long i); public native SizeTPointVectorMap put(@Cast("size_t") long i, PointVector value); 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 16b5e266f3d..24b586faa32 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 @@ -46,6 +46,8 @@ public class SizeTTrackMap extends Pointer { public boolean empty() { return size() == 0; } public native long size(); + public Track front() { return get(0); } + public Track back() { return get(size() - 1); } @Index public native @ByRef Track get(@Cast("size_t") long i); public native SizeTTrackMap put(@Cast("size_t") long i, Track value); 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 bc30ee1b0d6..21f34c7a356 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 @@ -52,6 +52,8 @@ public class TrackedObjectDeque extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public TrackedObject front() { return get(0); } + public TrackedObject back() { return get(size() - 1); } @Index(function = "at") public native @ByRef TrackedObject get(@Cast("size_t") long i); public native TrackedObjectDeque put(@Cast("size_t") long i, TrackedObject value); 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 38b773f150a..33e76597d04 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 @@ -43,6 +43,9 @@ public class BackgroundSubtractor extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractor(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Computes a foreground mask.

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 63e18b99e53..f0c34982366 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 @@ -40,6 +40,9 @@ public class BackgroundSubtractorKNN extends BackgroundSubtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractorKNN(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractorKNN(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Returns the number of last frames that affect the background model */ 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 53179caf979..b76811ab6fa 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 @@ -41,6 +41,9 @@ public class BackgroundSubtractorMOG2 extends BackgroundSubtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractorMOG2(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractorMOG2(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Returns the number of last frames that affect the background model */ 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 06e3ba132fb..332fcf3eefb 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 @@ -47,6 +47,9 @@ public class DISOpticalFlow extends DenseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DISOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public DISOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::DISOpticalFlow:: */ public static final int 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 114596440d7..29c98394a6b 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 @@ -38,6 +38,9 @@ public class DenseOpticalFlow extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DenseOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public DenseOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Calculates an optical flow.

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 5bd47a8fa3f..b2b56d6a08d 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 @@ -38,6 +38,9 @@ public class FarnebackOpticalFlow extends DenseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FarnebackOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public FarnebackOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native int getNumLevels(); public native void setNumLevels(int numLevels); 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 f45994e8900..4e90346d385 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 @@ -37,6 +37,9 @@ public class SparseOpticalFlow extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SparseOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public SparseOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Calculates a sparse optical flow.

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 a67349845f1..c76544be002 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 @@ -43,6 +43,9 @@ public class SparsePyrLKOpticalFlow extends SparseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SparsePyrLKOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public SparsePyrLKOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public native @ByVal Size getWinSize(); public native void setWinSize(@ByVal Size winSize); 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 105c452dafc..b205ec83ef7 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 @@ -45,6 +45,9 @@ public class VariationalRefinement extends DenseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public VariationalRefinement(Pointer p) { super(p); } + /** Downcast constructor. */ + public VariationalRefinement(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief \ref calc function overload to handle separate horizontal (u) and vertical (v) flow components (to avoid extra splits/merges) */ 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 f9e4c1fa0b2..177e6be4203 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 @@ -56,6 +56,9 @@ public class PCTSignatures extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public PCTSignatures(Pointer p) { super(p); } + /** Downcast constructor. */ + public PCTSignatures(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** * \brief Lp distance function selector. 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 4301d8ab7c0..04bd3662f1d 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 @@ -45,6 +45,9 @@ public class PCTSignaturesSQFD extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public PCTSignaturesSQFD(Pointer p) { super(p); } + /** Downcast constructor. */ + public PCTSignaturesSQFD(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** 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 782b31a73f1..ace95c4f9b3 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 @@ -58,6 +58,9 @@ public class AdaptiveManifoldFilter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AdaptiveManifoldFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public AdaptiveManifoldFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Apply high-dimensional filtering using adaptive manifolds.

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 4a2f08b527c..13a4f71912b 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 @@ -53,6 +53,9 @@ public class ContourFitting extends Algorithm { @Override public ContourFitting getPointer(long i) { return new ContourFitting((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public ContourFitting(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Fit two closed curves using fourier descriptors. More details in \cite PersoonFu1977 and \cite BergerRaghunathan1998

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 97734591276..82d9aed7741 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 @@ -42,6 +42,9 @@ public class DTFilter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DTFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public DTFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Produce domain transform filtering operation on source image. 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 34d689d97e0..1cc5cd589ae 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 @@ -42,6 +42,9 @@ public class DisparityFilter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DisparityFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public DisparityFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Apply filtering to the disparity map. 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 abe896aa8e5..6a0bdebcef4 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 @@ -41,6 +41,9 @@ public class DisparityWLSFilter extends DisparityFilter { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DisparityWLSFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public DisparityWLSFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** filter parameters */ 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 222de33cf09..8b96c7a08ba 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 @@ -40,6 +40,9 @@ public class EdgeAwareInterpolator extends SparseMatchInterpolator { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public EdgeAwareInterpolator(Pointer p) { super(p); } + /** Downcast constructor. */ + public EdgeAwareInterpolator(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Interface to provide a more elaborated cost map, i.e. edge map, for the edge-aware term. * This implementation is based on a rather simple gradient-based edge map estimation. 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 6b498dc6c50..9c45f31998e 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 @@ -39,6 +39,9 @@ public class EdgeBoxes extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public EdgeBoxes(Pointer p) { super(p); } + /** Downcast constructor. */ + public EdgeBoxes(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Returns array containing proposal boxes. 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 47b7372627c..f2b1cd28584 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 @@ -44,6 +44,9 @@ public class FastBilateralSolverFilter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FastBilateralSolverFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public FastBilateralSolverFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Apply smoothing operation to the source image.

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 e66a1568686..4bf086abb0e 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 @@ -44,6 +44,9 @@ public class FastGlobalSmootherFilter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FastGlobalSmootherFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public FastGlobalSmootherFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Apply smoothing operation to the source image.

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 1d0f3c2bfef..21f8dfba542 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 @@ -46,6 +46,9 @@ public class FastLineDetector extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FastLineDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public FastLineDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \example fld_lines.cpp An example using the FastLineDetector 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 33b3c908e35..78cd823d4c0 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 @@ -42,6 +42,9 @@ public class GraphSegmentation extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public GraphSegmentation(Pointer p) { super(p); } + /** Downcast constructor. */ + public GraphSegmentation(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Segment an image and store output in dst @param src The input image. Any number of channel (1 (Eg: Gray), 3 (Eg: RGB), 4 (Eg: RGB-D)) can be provided 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 8c22290a0d2..f2fcbca6693 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 @@ -44,6 +44,9 @@ public class GuidedFilter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public GuidedFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public GuidedFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Apply Guided Filter to the filtering image. 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 40c604d185e..1976637a306 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 @@ -43,6 +43,9 @@ public class RFFeatureGetter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public RFFeatureGetter(Pointer p) { super(p); } + /** Downcast constructor. */ + public RFFeatureGetter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** 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 6d3a25b4af2..97bdfae1768 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 @@ -43,6 +43,9 @@ public class RICInterpolator extends SparseMatchInterpolator { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public RICInterpolator(Pointer p) { super(p); } + /** Downcast constructor. */ + public RICInterpolator(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief K is a number of nearest-neighbor matches considered, when fitting a locally affine *model for a superpixel segment. However, lower values would make the interpolation 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 b0be235b34e..9f5514b9308 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 @@ -46,6 +46,9 @@ public class RidgeDetectionFilter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public RidgeDetectionFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public RidgeDetectionFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Create pointer to the Ridge detection filter. 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 918e2d13a3e..617620a5d63 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 @@ -40,6 +40,9 @@ public class SelectiveSearchSegmentation extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SelectiveSearchSegmentation(Pointer p) { super(p); } + /** Downcast constructor. */ + public SelectiveSearchSegmentation(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Set a image used by switch* functions to initialize the class 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 da730361ed4..45ea729a2b3 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 @@ -40,6 +40,9 @@ public class SelectiveSearchSegmentationStrategy extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SelectiveSearchSegmentationStrategy(Pointer p) { super(p); } + /** Downcast constructor. */ + public SelectiveSearchSegmentationStrategy(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Set a initial image, with a segmentation. @param img The input image. Any number of channel can be provided 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 e557c96721b..ad378f0d5cc 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 @@ -39,6 +39,9 @@ public class SelectiveSearchSegmentationStrategyMultiple extends SelectiveSearch static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SelectiveSearchSegmentationStrategyMultiple(Pointer p) { super(p); } + /** Downcast constructor. */ + public SelectiveSearchSegmentationStrategyMultiple(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Add a new sub-strategy 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 44a4d8ad1db..9efbdcbc4ea 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 @@ -43,6 +43,9 @@ public class SparseMatchInterpolator extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SparseMatchInterpolator(Pointer p) { super(p); } + /** Downcast constructor. */ + public SparseMatchInterpolator(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Interpolate input sparse matches.

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 46bd43777ba..58452293862 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 @@ -41,6 +41,9 @@ public class StructuredEdgeDetection extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StructuredEdgeDetection(Pointer p) { super(p); } + /** Downcast constructor. */ + public StructuredEdgeDetection(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief The function detects edges in src and draw them to dst. 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 527e5e01487..fff684fc757 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 @@ -51,6 +51,9 @@ public class SuperpixelLSC extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SuperpixelLSC(Pointer p) { super(p); } + /** Downcast constructor. */ + public SuperpixelLSC(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Calculates the actual amount of superpixels on a given segmentation computed 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 e0d0a4ed263..b410acd5b2d 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 @@ -50,6 +50,9 @@ public class SuperpixelSEEDS extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SuperpixelSEEDS(Pointer p) { super(p); } + /** Downcast constructor. */ + public SuperpixelSEEDS(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Calculates the superpixel segmentation on a given image stored in SuperpixelSEEDS object. 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 3dfe4a17947..22f2f70aa0c 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 @@ -49,6 +49,9 @@ public class SuperpixelSLIC extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SuperpixelSLIC(Pointer p) { super(p); } + /** Downcast constructor. */ + public SuperpixelSLIC(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Calculates the actual amount of superpixels on a given segmentation computed diff --git a/platform/pom.xml b/platform/pom.xml index 608fe7e3f34..92e43ca0549 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -87,7 +87,7 @@ org.bytedeco opencv-platform - 4.8.0-${project.version} + 4.8.1-${project.version} org.bytedeco @@ -182,7 +182,7 @@ org.bytedeco dnnl-platform - 3.2.1-${project.version} + 3.3-${project.version} org.bytedeco @@ -252,12 +252,12 @@ org.bytedeco leptonica-platform - 1.83.0-${project.version} + 1.83.1-${project.version} org.bytedeco tesseract-platform - 5.3.1-${project.version} + 5.3.3-${project.version} @@ -317,7 +317,7 @@ org.bytedeco tritonserver-platform - 2.34-${project.version} + 2.38-${project.version} @@ -342,7 +342,7 @@ org.bytedeco onnxruntime-platform - 1.16.0-${project.version} + 1.16.1-${project.version} org.bytedeco diff --git a/tensorflow-lite/cppbuild.sh b/tensorflow-lite/cppbuild.sh index cabdb33666e..b1e5b91211d 100755 --- a/tensorflow-lite/cppbuild.sh +++ b/tensorflow-lite/cppbuild.sh @@ -12,7 +12,7 @@ if [[ "$EXTENSION" == *gpu ]]; then export CMAKE_FLAGS="-DTFLITE_ENABLE_GPU=ON" fi -TENSORFLOW_VERSION=2.14.0-rc0 +TENSORFLOW_VERSION=2.14.0 download https://github.com/tensorflow/tensorflow/archive/v$TENSORFLOW_VERSION.tar.gz tensorflow-$TENSORFLOW_VERSION.tar.gz mkdir -p "$PLATFORM$EXTENSION" diff --git a/tensorflow-lite/pom.xml b/tensorflow-lite/pom.xml index 672fdcd4121..b7b460ecc57 100644 --- a/tensorflow-lite/pom.xml +++ b/tensorflow-lite/pom.xml @@ -17,7 +17,7 @@ tensorflowlite 2.14.0 - ${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/tensorflow-${tensorflow.version}-rc0/ + ${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/tensorflow-${tensorflow.version}/ diff --git a/tesseract/README.md b/tesseract/README.md index f45ab275f44..02b3bc15ccf 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.1 https://github.com/tesseract-ocr + * Tesseract 5.3.3 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.9 + 1.5.10-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.1-1.5.9 + 5.3.3-1.5.10-SNAPSHOT diff --git a/tesseract/cppbuild.sh b/tesseract/cppbuild.sh index d2155641a36..207a77f2b59 100755 --- a/tesseract/cppbuild.sh +++ b/tesseract/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -TESSERACT_VERSION=5.3.1 +TESSERACT_VERSION=5.3.3 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 115aebf39e5..d44038c4929 100644 --- a/tesseract/platform/pom.xml +++ b/tesseract/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tesseract-platform - 5.3.1-${project.parent.version} + 5.3.3-${project.parent.version} JavaCPP Presets Platform for Tesseract @@ -23,7 +23,7 @@ org.bytedeco leptonica-platform - 1.83.0-${project.parent.version} + 1.83.1-${project.parent.version} ${project.groupId} diff --git a/tesseract/pom.xml b/tesseract/pom.xml index 9837705aeba..ccd218e6f57 100644 --- a/tesseract/pom.xml +++ b/tesseract/pom.xml @@ -11,14 +11,14 @@ org.bytedeco tesseract - 5.3.1-${project.parent.version} + 5.3.3-${project.parent.version} JavaCPP Presets for Tesseract org.bytedeco leptonica - 1.83.0-${project.parent.version} + 1.83.1-${project.parent.version} org.bytedeco @@ -41,12 +41,12 @@ org.bytedeco leptonica - 1.83.0-${project.parent.version} + 1.83.1-${project.parent.version} org.bytedeco leptonica - 1.83.0-${project.parent.version} + 1.83.1-${project.parent.version} ${javacpp.platform} diff --git a/tesseract/samples/pom.xml b/tesseract/samples/pom.xml index e9b18e85ddb..50090462132 100644 --- a/tesseract/samples/pom.xml +++ b/tesseract/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tesseract-platform - 5.3.1-1.5.10-SNAPSHOT + 5.3.3-1.5.10-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 e973f3477e9..0f8a1cbd447 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 2eecf0cbefa..04d3430da56 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 2a8e459c85e..21f41004a72 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 d9a1ed09048..c2851a17e68 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; @@ -30,6 +30,8 @@ public class ByteVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public byte front() { return get(0); } + public byte back() { return get(size() - 1); } @Index(function = "at") public native @Cast("char") byte get(@Cast("size_t") long i); public native ByteVector put(@Cast("size_t") long i, byte value); 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 1970e23d096..701197df511 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 99ada61217c..998d1b47917 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 dcf5643ebc3..466a307c272 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 997d6ace052..47ce7f9dfd7 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 916d14cfa18..a9e06a1db74 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 9cb70a2e9e1..4cf161b2411 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 8fd75e4326a..62976a37f77 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 829fed1ad4c..5b6c0477f50 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 f9112388cd9..0a7e2f966bb 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 14085ae0a27..cf3e066c137 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 9543318fc76..ebfd28ae73b 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 c6e60c377c0..1b22a07a7d3 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 6dab092f0d4..341ff38fe9d 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 40fa9d23e90..f3c0baf6a97 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 eff6eee6670..2a0c04684c3 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 25cb13d8ec8..3aa63c0b0b3 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 a7c00e61c44..70dc906a8e8 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 a8ffb13defa..433298ddf70 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 0e27b4e113a..ad2186e78d0 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 ef0887525aa..779d58c4415 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 dc0a6f91a5a..0a57ed1f1a9 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 d5e437813aa..703fda7673f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 0b82ce2fc2d..d754a145562 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 db17b1b9acc..cf5c8c3701c 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; @@ -32,6 +32,8 @@ public class StringVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public BytePointer front() { return get(0); } + public BytePointer back() { return get(size() - 1); } @Index(function = "at") public native @StdString BytePointer get(@Cast("size_t") long i); public native StringVector put(@Cast("size_t") long i, BytePointer value); @ValueSetter @Index(function = "at") public native StringVector put(@Cast("size_t") long i, @StdString String value); diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessAltoRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessAltoRenderer.java index 6b6cad39844..02d50b1d08e 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 08731648f66..6945a50d325 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessBoxTextRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessBoxTextRenderer.java index ac72ff9b0da..4bb6f0f2236 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 dc63f3fe715..8279090966a 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 ef59d7bb242..c2e51bbd9c1 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 6e16860acbd..7bdfa70aae3 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 81f5468ea04..99fa07bb67e 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessPDFRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessPDFRenderer.java index dea3def4709..ecda3cade5f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 d8e6633749f..8889c32b661 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 333f5241a9d..e8c14573eaf 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 ad6dce868f1..6d2f794b70e 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 7af3aa5aab5..3105c2bc07d 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract; diff --git a/tesseract/src/gen/java/org/bytedeco/tesseract/TessUnlvRenderer.java b/tesseract/src/gen/java/org/bytedeco/tesseract/TessUnlvRenderer.java index 82b4c6bbeff..2b1f50b4c81 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 e8668dff910..51e99f50b93 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 1646115e6c5..22812142d8f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 9cde8bb0a39..c2fd34bb3d3 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 68cba4d57c5..aa5c44d77cc 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 d1d633396b7..f548cf434ec 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 6027cbf7084..95172de03a4 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 36b36c13a0e..03f38d2eae1 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.tesseract.global; @@ -146,14 +146,14 @@ public class tesseract extends org.bytedeco.tesseract.presets.tesseract { public static final int TESSERACT_MAJOR_VERSION = 5; public static final int TESSERACT_MINOR_VERSION = 3; -public static final int TESSERACT_MICRO_VERSION = 1; +public static final int TESSERACT_MICRO_VERSION = 3; 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.1"; +public static final String TESSERACT_VERSION_STR = "5.3.3"; // clang-format on @@ -762,7 +762,7 @@ public class tesseract extends org.bytedeco.tesseract.presets.tesseract { // class TessBaseAPI. -/** Escape a char string - remove &<>"' with HTML codes. */ +/** Escape a char string - replace &<>"' with HTML codes. */ // namespace tesseract diff --git a/tritonserver/platform/pom.xml b/tritonserver/platform/pom.xml index b55d3024caa..786f800fe42 100644 --- a/tritonserver/platform/pom.xml +++ b/tritonserver/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tritonserver-platform - 2.34-${project.parent.version} + 2.38-${project.parent.version} JavaCPP Presets Platform for Triton Inference Server diff --git a/tritonserver/platform/redist/pom.xml b/tritonserver/platform/redist/pom.xml index e5c0166c62f..b98f2993993 100644 --- a/tritonserver/platform/redist/pom.xml +++ b/tritonserver/platform/redist/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tritonserver-platform-redist - 2.34-${project.parent.version} + 2.38-${project.parent.version} JavaCPP Presets Platform Redist for Triton Inference Server diff --git a/tritonserver/pom.xml b/tritonserver/pom.xml index 63814515a60..88e4f37e2f0 100644 --- a/tritonserver/pom.xml +++ b/tritonserver/pom.xml @@ -11,7 +11,7 @@ org.bytedeco tritonserver - 2.34-${project.parent.version} + 2.38-${project.parent.version} JavaCPP Presets for Triton Inference Server diff --git a/tritonserver/samples/simple/pom.xml b/tritonserver/samples/simple/pom.xml index 69045de1082..3a9b12e480b 100644 --- a/tritonserver/samples/simple/pom.xml +++ b/tritonserver/samples/simple/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tritonserver-platform - 2.34-1.5.10-SNAPSHOT + 2.38-1.5.10-SNAPSHOT shaded diff --git a/tritonserver/samples/simplecpp/pom.xml b/tritonserver/samples/simplecpp/pom.xml index 57e53303f3f..b6c7b77bbd1 100644 --- a/tritonserver/samples/simplecpp/pom.xml +++ b/tritonserver/samples/simplecpp/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tritonserver-platform - 2.34-1.5.10-SNAPSHOT + 2.38-1.5.10-SNAPSHOT shaded diff --git a/tritonserver/samples/unsupported/pom.xml b/tritonserver/samples/unsupported/pom.xml index b5d3cdd4ed7..05a476ed333 100644 --- a/tritonserver/samples/unsupported/pom.xml +++ b/tritonserver/samples/unsupported/pom.xml @@ -23,7 +23,7 @@ org.bytedeco tritonserver-platform - 2.34-1.5.10-SNAPSHOT + 2.38-1.5.10-SNAPSHOT shaded