diff --git a/CHANGELOG.md b/CHANGELOG.md index 33cdcdae712..2d6174fc5f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,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.9.0, FFmpeg 6.1.1, HDF5 1.14.3, MKL 2024.0, DNNL 3.3.4, OpenBLAS 0.3.26, ARPACK-NG 3.9.1, CPython 3.12.1, NumPy 1.26.3, SciPy 1.11.4, LLVM 17.0.6, Leptonica 1.84.1, Tesseract 5.3.3, CUDA 12.3.2, cuDNN 8.9.7, NCCL 2.19.3, OpenCL 3.0.15, PyTorch 2.1.2 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.15.0, Triton Inference Server 2.41.0, DepthAI 2.24.0, ONNX 1.15.0, ONNX Runtime 1.16.3, TVM 0.14.0, and their dependencies + * Upgrade presets for OpenCV 4.9.0, FFmpeg 6.1.1, HDF5 1.14.3, MKL 2024.0, DNNL 3.3.4, OpenBLAS 0.3.26, ARPACK-NG 3.9.1, CPython 3.12.1, NumPy 1.26.3, SciPy 1.11.4, LLVM 17.0.6, Leptonica 1.84.1, Tesseract 5.3.4, CUDA 12.3.2, cuDNN 8.9.7, NCCL 2.19.3, OpenCL 3.0.15, PyTorch 2.1.2 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.15.0, Triton Inference Server 2.41.0, DepthAI 2.24.0, ONNX 1.15.0, ONNX Runtime 1.16.3, TVM 0.14.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/platform/pom.xml b/platform/pom.xml index 2af61fcd85b..45d518d7513 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -257,7 +257,7 @@ org.bytedeco tesseract-platform - 5.3.3-${project.version} + 5.3.4-${project.version} diff --git a/tesseract/README.md b/tesseract/README.md index 02b3bc15ccf..bb79056070c 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.3 https://github.com/tesseract-ocr + * Tesseract 5.3.4 https://github.com/tesseract-ocr Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -47,7 +47,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco tesseract-platform - 5.3.3-1.5.10-SNAPSHOT + 5.3.4-1.5.10-SNAPSHOT diff --git a/tesseract/cppbuild.sh b/tesseract/cppbuild.sh index c52cde2ca77..8e4b44ed149 100755 --- a/tesseract/cppbuild.sh +++ b/tesseract/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -TESSERACT_VERSION=5.3.3 +TESSERACT_VERSION=5.3.4 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 5c821f007ef..a3476d29042 100644 --- a/tesseract/platform/pom.xml +++ b/tesseract/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tesseract-platform - 5.3.3-${project.parent.version} + 5.3.4-${project.parent.version} JavaCPP Presets Platform for Tesseract diff --git a/tesseract/pom.xml b/tesseract/pom.xml index 905ceafaad7..86ca7a2affb 100644 --- a/tesseract/pom.xml +++ b/tesseract/pom.xml @@ -11,7 +11,7 @@ org.bytedeco tesseract - 5.3.3-${project.parent.version} + 5.3.4-${project.parent.version} JavaCPP Presets for Tesseract diff --git a/tesseract/samples/pom.xml b/tesseract/samples/pom.xml index 50090462132..e08c04f8477 100644 --- a/tesseract/samples/pom.xml +++ b/tesseract/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco tesseract-platform - 5.3.3-1.5.10-SNAPSHOT + 5.3.4-1.5.10-SNAPSHOT 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 03f38d2eae1..650677ba6a3 100644 --- a/tesseract/src/gen/java/org/bytedeco/tesseract/global/tesseract.java +++ b/tesseract/src/gen/java/org/bytedeco/tesseract/global/tesseract.java @@ -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 = 3; +public static final int TESSERACT_MICRO_VERSION = 4; 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.3"; +public static final String TESSERACT_VERSION_STR = "5.3.4"; // clang-format on @@ -229,7 +229,7 @@ public class tesseract extends org.bytedeco.tesseract.presets.tesseract { PT_NOISE = 14, // Lies outside of any column. PT_COUNT = 15; -/** Returns true if PolyBlockType is of horizontal line type */ +/** Returns true if PolyBlockType is of line type */ @Namespace("tesseract") public static native @Cast("bool") boolean PTIsLineType(@Cast("tesseract::PolyBlockType") int type); /** Returns true if PolyBlockType is of image type */ @Namespace("tesseract") public static native @Cast("bool") boolean PTIsImageType(@Cast("tesseract::PolyBlockType") int type); diff --git a/tesseract/src/main/java/org/bytedeco/tesseract/presets/tesseract.java b/tesseract/src/main/java/org/bytedeco/tesseract/presets/tesseract.java index 19591bb59c2..940732bcb0e 100644 --- a/tesseract/src/main/java/org/bytedeco/tesseract/presets/tesseract.java +++ b/tesseract/src/main/java/org/bytedeco/tesseract/presets/tesseract.java @@ -42,7 +42,7 @@ @Platform(define = "TESS_CAPI_INCLUDE_BASEAPI", include = {"tesseract/export.h", /*"tesseract/osdetect.h",*/ "tesseract/unichar.h", "tesseract/version.h", "tesseract/publictypes.h", "tesseract/pageiterator.h", "tesseract/ocrclass.h", "tesseract/ltrresultiterator.h", "tesseract/renderer.h", "tesseract/resultiterator.h", "tesseract/baseapi.h", "tesseract/capi.h", "locale.h"}, - compiler = "cpp11", link = "tesseract@.5.3.3"/*, resource = {"include", "lib"}*/), + compiler = "cpp11", link = "tesseract@.5.3.4"/*, resource = {"include", "lib"}*/), @Platform(value = "android", link = "tesseract"), @Platform(value = "windows", link = "tesseract53", preload = "libtesseract53") }) public class tesseract implements InfoMapper {