Update action uses versions

ollydev · May 17, 2024 · ac03dca · ac03dca
1 parent 727d26c
commit ac03dca
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 27 deletions.
diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -14,7 +14,7 @@ jobs:
         include:
           - binary: libtesseract.so.aarch64
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v4.1.6
     - name: Install Dependencies
       run: |
         sudo apt-get update
@@ -47,7 +47,7 @@ jobs:
         cmake --build build --config Release
         mv build/libtesseract64.so build/libtesseract.so.aarch64 
 
-    - uses: actions/upload-artifact@v3.1.0
+    - uses: actions/upload-artifact@v4.3.3
       with:
           name: ${{ matrix.binary }}
           path: build/${{ matrix.binary }}

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -14,7 +14,7 @@ jobs:
         include:
           - binary: libtesseract64.so
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v4.1.6
     - name: Install Dependencies
       run: |
         sudo apt-get update
@@ -50,7 +50,7 @@ jobs:
       run: |
         ldd build/${{ matrix.binary }}        
            
-    - uses: actions/upload-artifact@v3.1.0
+    - uses: actions/upload-artifact@v4.3.3
       with:
           name: ${{ matrix.binary }}
           path: build/${{ matrix.binary }}
@@ -71,8 +71,8 @@ jobs:
               https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.2.4/fpc-src_3.2.2-210709_amd64.deb
 
     steps:
-    - uses: actions/checkout@v3.1.0
-    - uses: actions/download-artifact@v3
+    - uses: actions/checkout@v4.1.6
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ matrix.binary }}
 

diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -14,7 +14,7 @@ jobs:
         include:
           - binary: libtesseract.dylib.aarch64
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.6
 
       - name: Install Dependencies
         run: |
@@ -51,7 +51,7 @@ jobs:
         run: |
           otool -L build/${{ matrix.binary }} 
 
-      - uses: actions/upload-artifact@v3.1.0
+      - uses: actions/upload-artifact@v4.3.3
         with:
           name: ${{ matrix.binary }}
           path: build/${{ matrix.binary }}

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -14,7 +14,7 @@ jobs:
         include:
           - binary: libtesseract64.dylib
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.6
 
       - name: Install Dependencies
         run: |
@@ -50,7 +50,7 @@ jobs:
         run: |
           otool -L build/${{ matrix.binary }} 
 
-      - uses: actions/upload-artifact@v3.1.0
+      - uses: actions/upload-artifact@v4.3.3
         with:
           name: ${{ matrix.binary }}
           path: build/${{ matrix.binary }}
@@ -71,8 +71,8 @@ jobs:
               https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20x86-64/Lazarus%202.2.4/fpc-src-3.2.2-20210709-macosx.dmg
 
     steps:
-    - uses: actions/checkout@v3.1.0
-    - uses: actions/download-artifact@v3
+    - uses: actions/checkout@v4.1.6
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ matrix.binary }}
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -23,7 +23,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v4.1.6
 
     - uses: msys2/setup-msys2@v2
       with:
@@ -76,7 +76,7 @@ jobs:
       run: |
         ldd build/${{ matrix.binary }}  
 
-    - uses: actions/upload-artifact@v3.1.0
+    - uses: actions/upload-artifact@v4.3.3
       with:
           name: ${{ matrix.binary }}
           path: build/${{ matrix.binary }}
@@ -97,8 +97,8 @@ jobs:
             laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Windows%2032%20bits/Lazarus%202.2.4/lazarus-2.2.4-fpc-3.2.2-win32.exe
 
     steps:
-    - uses: actions/checkout@v3.1.0
-    - uses: actions/download-artifact@v3
+    - uses: actions/checkout@v4.1.6
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ matrix.binary }}
 

diff --git a/README.md b/README.md
@@ -4,7 +4,18 @@ Downloads are available here https://github.com/ollydev/libtesseract/releases
 
 This is a shared library (dll, so, dylib) which exports basic C [Tesseract-OCR](https://github.com/tesseract-ocr/tesseract) functions for basic text recognition. Tesseract and it's dependencies have been statically linked so only a single library is required.
 
-The following methods are exported:
+Many optional features are not built to make static linking much easier these are:
+```
+'--without-libpng' '--without-zlib' '--without-jpeg' '--without-libtiff' '--without-giflib' '--without-libwebp' '--without-libwebpmux' '--without-libopenjpeg'
+'--disable-legacy' '--disable-graphics' '--disable-openmp' '--without-curl' '--without-archive'
+```
+All these exports should be available:
+
+https://github.com/tesseract-ocr/tesseract/blob/main/include/tesseract/capi.h
+
+----
+
+In addition the following "simple" methods are exported for basic text recognition:
 ```c++
 tesseract::TessBaseAPI* Tesseract_Create();
 void Tesseract_Delete(tesseract::TessBaseAPI* &tesseract_ptr);
@@ -27,6 +38,7 @@ Example Pascal header:
 ```pascal
 function Tesseract_Init(ptr: Pointer; datapath, language: PChar): Int32; external 'libtesseract32.dll'
 ```
+
 ----
 
-See the [Github Action](https://github.com/ollydev/libTesseract/blob/master/.github/workflows/build.yml) to see how this is built. Thanks to [SoftwareNetwork](https://github.com/SoftwareNetwork/sw) for making this a lot easier than it used to be. 
+See the [Github Actions](https://github.com/ollydev/libTesseract/tree/master/.github/workflows) to see how this is built.
diff --git a/exports.h b/exports.h
@@ -37,29 +37,28 @@ static const char* PascalExports[] =
 {
 	(char*)"Tesseract_Create",            (char*)"function Tesseract_Create: Pointer;",
 	(char*)"Tesseract_Delete",            (char*)"procedure Tesseract_Delete(var Tess: Pointer);",
-	(char*)"Tesseract_Init",              (char*)"function Tesseract_Init(Tess: Pointer; DataPath, Language: TessTextPtr): Int32;",
+	(char*)"Tesseract_Init",              (char*)"function Tesseract_Init(Tess: Pointer; DataPath, Language: Pointer): Int32;",
 	(char*)"Tesseract_End",               (char*)"procedure Tesseract_End(var Tess: Pointer);",
 	(char*)"Tesseract_SetPageSegMode",    (char*)"procedure Tesseract_SetPageSegMode(Tess: Pointer; Mode: Int32);",
 	(char*)"Tesseract_GetPageSegMode",    (char*)"function Tesseract_GetPageSegMode(Tess: Pointer): Int32;",
 	(char*)"Tesseract_MeanTextConf",      (char*)"function Tesseract_MeanTextConf(Tess: Pointer): Single;",
 	(char*)"Tesseract_SetImage",          (char*)"procedure Tesseract_SetImage(Tess: Pointer; ImageData: Pointer; Width, Height, BytesPerPixel, BytesPerLine: Int32);",
-	(char*)"Tesseract_GetUTF8Text",       (char*)"function Tesseract_GetUTF8Text(Tess: Pointer; var Len: Int32): TessTextPtr;",
-	(char*)"Tesseract_FreeUTF8Text",      (char*)"procedure Tesseract_FreeUTF8Text(var Text: TessTextPtr);",
-	(char*)"Tesseract_SetVariable",       (char*)"function Tesseract_SetVariable(Tess: Pointer; Name, Value: TessTextPtr): Boolean;",
+	(char*)"Tesseract_GetUTF8Text",       (char*)"function Tesseract_GetUTF8Text(Tess: Pointer; var Len: Int32): Pointer;",
+	(char*)"Tesseract_FreeUTF8Text",      (char*)"procedure Tesseract_FreeUTF8Text(var Text: Pointer);",
+	(char*)"Tesseract_SetVariable",       (char*)"function Tesseract_SetVariable(Tess: Pointer; Name, Value: Pointer): Boolean;",
 	(char*)"Tesseract_Clear",             (char*)"procedure Tesseract_Clear(Tess: Pointer);",
 	(char*)"Tesseract_GetBlockCount",     (char*)"function Tesseract_GetBlockCount(Tess: Pointer): Int32;",
 	(char*)"Tesseract_GetLineCount",      (char*)"function Tesseract_GetLineCount(Tess: Pointer): Int32;",
 	(char*)"Tesseract_GetWordCount",      (char*)"function Tesseract_GetWordCount(Tess: Pointer): Int32;",
 	(char*)"Tesseract_GetCharacterCount", (char*)"function Tesseract_GetCharacterCount(Tess: Pointer): Int32;",
-	(char*)"Tesseract_GetBlockMatch",     (char*)"procedure Tesseract_GetBlockMatch(Tess: Pointer; Index: Int32; var Text: TessTextPtr; var Len: Int32; var Confidence: Single; var X1, Y1, X2, Y2: Int32);",
-	(char*)"Tesseract_GetLineMatch",      (char*)"procedure Tesseract_GetLineMatch(Tess: Pointer; Index: Int32; var Text: TessTextPtr; var Len: Int32; var Confidence: Single; var X1, Y1, X2, Y2: Int32);",
-	(char*)"Tesseract_GetWordMatch",      (char*)"procedure Tesseract_GetWordMatch(Tess: Pointer; Index: Int32; var Text: TessTextPtr; var Len: Int32; var Confidence: Single; var X1, Y1, X2, Y2: Int32);",
-	(char*)"Tesseract_GetCharacterMatch", (char*)"procedure Tesseract_GetCharacterMatch(Tess: Pointer; Index: Int32; var Text: TessTextPtr; var Len: Int32; var Confidence: Single; var X1, Y1, X2, Y2: Int32);",
+	(char*)"Tesseract_GetBlockMatch",     (char*)"procedure Tesseract_GetBlockMatch(Tess: Pointer; Index: Int32; var Text: Pointer; var Len: Int32; var Confidence: Single; var X1, Y1, X2, Y2: Int32);",
+	(char*)"Tesseract_GetLineMatch",      (char*)"procedure Tesseract_GetLineMatch(Tess: Pointer; Index: Int32; var Text: Pointer; var Len: Int32; var Confidence: Single; var X1, Y1, X2, Y2: Int32);",
+	(char*)"Tesseract_GetWordMatch",      (char*)"procedure Tesseract_GetWordMatch(Tess: Pointer; Index: Int32; var Text: Pointer; var Len: Int32; var Confidence: Single; var X1, Y1, X2, Y2: Int32);",
+	(char*)"Tesseract_GetCharacterMatch", (char*)"procedure Tesseract_GetCharacterMatch(Tess: Pointer; Index: Int32; var Text: Pointer; var Len: Int32; var Confidence: Single; var X1, Y1, X2, Y2: Int32);",
 };   
 
 static const char* PascalTypes[] =
 {
-	(char*)"TessTextPtr", (char*)"type PChar",
 };
 
 static const long int PascalExportCount = sizeof(PascalExports) / (sizeof(PascalExports[0]) * 2);