Skip to content

Commit

Permalink
* Upgrade presets for Tesseract 5.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Jan 19, 2024
1 parent 99d110e commit f5db168
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>tesseract-platform</artifactId>
<version>5.3.3-${project.version}</version>
<version>5.3.4-${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.bytedeco</groupId>-->
Expand Down
4 changes: 2 additions & 2 deletions tesseract/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -47,7 +47,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>tesseract-platform</artifactId>
<version>5.3.3-1.5.10-SNAPSHOT</version>
<version>5.3.4-1.5.10-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion tesseract/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tesseract/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>tesseract-platform</artifactId>
<version>5.3.3-${project.parent.version}</version>
<version>5.3.4-${project.parent.version}</version>
<name>JavaCPP Presets Platform for Tesseract</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion tesseract/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>tesseract</artifactId>
<version>5.3.3-${project.parent.version}</version>
<version>5.3.4-${project.parent.version}</version>
<name>JavaCPP Presets for Tesseract</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion tesseract/samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>tesseract-platform</artifactId>
<version>5.3.3-1.5.10-SNAPSHOT</version>
<version>5.3.4-1.5.10-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "[email protected].3"/*, resource = {"include", "lib"}*/),
compiler = "cpp11", link = "[email protected].4"/*, resource = {"include", "lib"}*/),
@Platform(value = "android", link = "tesseract"),
@Platform(value = "windows", link = "tesseract53", preload = "libtesseract53") })
public class tesseract implements InfoMapper {
Expand Down

0 comments on commit f5db168

Please sign in to comment.