diff --git a/TesseractOCR.Net45Tests/x64/leptonica-1.85.0.dll b/TesseractOCR.Net45Tests/x64/leptonica-1.85.0.dll index 6984770..09992eb 100644 Binary files a/TesseractOCR.Net45Tests/x64/leptonica-1.85.0.dll and b/TesseractOCR.Net45Tests/x64/leptonica-1.85.0.dll differ diff --git a/TesseractOCR.Net45Tests/x64/tesseract54.dll b/TesseractOCR.Net45Tests/x64/tesseract54.dll index f826994..dc2e88b 100644 Binary files a/TesseractOCR.Net45Tests/x64/tesseract54.dll and b/TesseractOCR.Net45Tests/x64/tesseract54.dll differ diff --git a/TesseractOCR.Net45Tests/x86/leptonica-1.85.0.dll b/TesseractOCR.Net45Tests/x86/leptonica-1.85.0.dll index 11cb7ca..1bdcebd 100644 Binary files a/TesseractOCR.Net45Tests/x86/leptonica-1.85.0.dll and b/TesseractOCR.Net45Tests/x86/leptonica-1.85.0.dll differ diff --git a/TesseractOCR.Net45Tests/x86/tesseract54.dll b/TesseractOCR.Net45Tests/x86/tesseract54.dll index f7345f8..3ef0191 100644 Binary files a/TesseractOCR.Net45Tests/x86/tesseract54.dll and b/TesseractOCR.Net45Tests/x86/tesseract54.dll differ diff --git a/TesseractOCR.NetCore31Tests/x64/leptonica-1.85.0.dll b/TesseractOCR.NetCore31Tests/x64/leptonica-1.85.0.dll index 6984770..09992eb 100644 Binary files a/TesseractOCR.NetCore31Tests/x64/leptonica-1.85.0.dll and b/TesseractOCR.NetCore31Tests/x64/leptonica-1.85.0.dll differ diff --git a/TesseractOCR.NetCore31Tests/x64/tesseract54.dll b/TesseractOCR.NetCore31Tests/x64/tesseract54.dll index f826994..dc2e88b 100644 Binary files a/TesseractOCR.NetCore31Tests/x64/tesseract54.dll and b/TesseractOCR.NetCore31Tests/x64/tesseract54.dll differ diff --git a/TesseractOCR.NetCore31Tests/x86/leptonica-1.85.0.dll b/TesseractOCR.NetCore31Tests/x86/leptonica-1.85.0.dll index 11cb7ca..1bdcebd 100644 Binary files a/TesseractOCR.NetCore31Tests/x86/leptonica-1.85.0.dll and b/TesseractOCR.NetCore31Tests/x86/leptonica-1.85.0.dll differ diff --git a/TesseractOCR.NetCore31Tests/x86/tesseract54.dll b/TesseractOCR.NetCore31Tests/x86/tesseract54.dll index f7345f8..3ef0191 100644 Binary files a/TesseractOCR.NetCore31Tests/x86/tesseract54.dll and b/TesseractOCR.NetCore31Tests/x86/tesseract54.dll differ diff --git a/TesseractOCR/InteropDotNet/LibraryLoader.cs b/TesseractOCR/InteropDotNet/LibraryLoader.cs index 853a0e3..c4cd957 100644 --- a/TesseractOCR/InteropDotNet/LibraryLoader.cs +++ b/TesseractOCR/InteropDotNet/LibraryLoader.cs @@ -115,8 +115,8 @@ public IntPtr LoadLibrary(string fileName, string platformName = null) fileName = FixUpLibraryName(fileName); lock (_syncLock) { - if (_loadedAssemblies.ContainsKey(fileName)) - return _loadedAssemblies[fileName]; + if (_loadedAssemblies.TryGetValue(fileName, out var library)) + return library; if (platformName == null) platformName = SystemManager.GetPlatformName(); diff --git a/TesseractOCR/TesseractOCR.csproj b/TesseractOCR/TesseractOCR.csproj index 383d1e8..97d03d3 100644 --- a/TesseractOCR/TesseractOCR.csproj +++ b/TesseractOCR/TesseractOCR.csproj @@ -4,12 +4,12 @@ TesseractOCR Charles Weld & Kees van Spelde Tesseract - Tesseract 5.3.2 adds a new neural net (LSTM) based OCR engine which is focused on line recognition, but also still supports the legacy Tesseract OCR engine of Tesseract 3 + Tesseract 5.4.1 adds a new neural net (LSTM) based OCR engine which is focused on line recognition, but also still supports the legacy Tesseract OCR engine of Tesseract 3 which works by recognizing character patterns. Compatibility with Tesseract 3 is enabled by using the Legacy OCR Engine mode (--oem 0). It also needs traineddata files which support the legacy engine, for example those from the tessdata repository. Copyright 2012-2021 Charles Weld - Copyright 2021-2023 Kees van Spelde - - Updated to Tesseract 5.3.2 -- Updated to Leptonica 1.83.1 + - Updated to Tesseract 5.4.1 +- Updated to Leptonica 1.85.0 - Updated nuget packages https://github.com/Sicos1977/TesseractOCR https://github.com/Sicos1977/TesseractOCR @@ -18,10 +18,10 @@ which support the legacy engine, for example those from the tessdata repository. false netstandard21;net461;net48;net5.0;net6.0;net8.0 True - 5.3.6.0 - 5.3.6.0 + 5.4.1.0 + 5.4.1.0 False - 5.3.6-preview-6 + 5.4.1 ocr.png true bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml diff --git a/TesseractOCR/x64/leptonica-1.85.0.dll b/TesseractOCR/x64/leptonica-1.85.0.dll index 6984770..09992eb 100644 Binary files a/TesseractOCR/x64/leptonica-1.85.0.dll and b/TesseractOCR/x64/leptonica-1.85.0.dll differ diff --git a/TesseractOCR/x64/tesseract54.dll b/TesseractOCR/x64/tesseract54.dll index f826994..dc2e88b 100644 Binary files a/TesseractOCR/x64/tesseract54.dll and b/TesseractOCR/x64/tesseract54.dll differ diff --git a/TesseractOCR/x86/leptonica-1.85.0.dll b/TesseractOCR/x86/leptonica-1.85.0.dll index 11cb7ca..1bdcebd 100644 Binary files a/TesseractOCR/x86/leptonica-1.85.0.dll and b/TesseractOCR/x86/leptonica-1.85.0.dll differ diff --git a/TesseractOCR/x86/tesseract54.dll b/TesseractOCR/x86/tesseract54.dll index f7345f8..3ef0191 100644 Binary files a/TesseractOCR/x86/tesseract54.dll and b/TesseractOCR/x86/tesseract54.dll differ