From 70fb8ae5d39364daf04e8d8805b26be46444b3bc Mon Sep 17 00:00:00 2001 From: Kees van Spelde Date: Tue, 22 Oct 2024 18:46:54 +0200 Subject: [PATCH] Update package info --- .../x64/leptonica-1.85.0.dll | Bin 4299776 -> 4299776 bytes TesseractOCR.Net45Tests/x64/tesseract54.dll | Bin 2799616 -> 2799616 bytes .../x86/leptonica-1.85.0.dll | Bin 3525120 -> 3525120 bytes TesseractOCR.Net45Tests/x86/tesseract54.dll | Bin 2369024 -> 2369024 bytes .../x64/leptonica-1.85.0.dll | Bin 4299776 -> 4299776 bytes .../x64/tesseract54.dll | Bin 2799616 -> 2799616 bytes .../x86/leptonica-1.85.0.dll | Bin 3525120 -> 3525120 bytes .../x86/tesseract54.dll | Bin 2369024 -> 2369024 bytes TesseractOCR/InteropDotNet/LibraryLoader.cs | 4 ++-- TesseractOCR/TesseractOCR.csproj | 12 ++++++------ TesseractOCR/x64/leptonica-1.85.0.dll | Bin 4299776 -> 4299776 bytes TesseractOCR/x64/tesseract54.dll | Bin 2799616 -> 2799616 bytes TesseractOCR/x86/leptonica-1.85.0.dll | Bin 3525120 -> 3525120 bytes TesseractOCR/x86/tesseract54.dll | Bin 2369024 -> 2369024 bytes 14 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TesseractOCR.Net45Tests/x64/leptonica-1.85.0.dll b/TesseractOCR.Net45Tests/x64/leptonica-1.85.0.dll index 6984770ef576a6f7baf012fe3d2d13495346bad2..09992eb7ab612f0892f8bd05db45a3acb780b240 100644 GIT binary patch delta 298 zcmWm9Hx7aT06@`z4aMFI_KpovEZFbheIzlF(W|)O;;M-UGLC+ScYtTzFQSE8M-Z=% zvntrC@F&6rH$3pd2MK-zAR~wn!iXS>7~)7Ei4@YvAd4LGC_q6GC6rM?6*bh+Koc#r z(Lom~dgx<-Ax4fWXzwQv`}5K;hK>oQFfhX$3oKz`g*7(L=e3oOzL{w(OkKAnWrw{Z IDTnXr2aR}J3IG5A delta 298 zcmWm9#|?sD0D#f_*ih`fVDH#FV&B10yh~ytt9bN=6KLW<#-pEyH^4I=SINY^C8X2s zq6teAe-a#U!UZ=xkl}?73j7Elh!DbvAc`2`NFa$6(#Rl-98}~{KoKRBQ9%_o)X_i_ zEwrJbgD!gLV_<7y_!VPd(e#J9i z{pkA;5njHqF6mtftwhd(jRJ}&p$rEVR3TAA9St)+BOwef|MeJ~re4 delta 212 zcmWm8sS(0J06@{%gd?zAAsk`3LbwqKFtmZC3QEWfVpZCRU=R#u9T8Ll72vS^h-bd~ z(f2AM+%2AA{>-ZhC~Hb)KEtQE}HPrLK_`);iCtIJ_Zup%muh%hiu!6HBbH#s*vLU||nCjN-#Z*G{f;b{*TdR4265ZH8`XrO9Yz|B2j}SvQ4M}Q3Ay<4qh_Rl;69Q zctsLC-!~PfQVS5GfhJmLqk}Gb=wpB(Mi?W)1d13_%rM6SORTWQ#;YWcEIc2MuCfWX bzOv>T*Tu`loRlY*7X~||*dz0KVL!h==sPP% delta 188 zcmWm8I}Unw~z$aK~Zia$ukS{%hfeD!O=I? Z+~c-*xtUyfaz$xyLW(moUzGOq`vc5rD**ri diff --git a/TesseractOCR.NetCore31Tests/x64/leptonica-1.85.0.dll b/TesseractOCR.NetCore31Tests/x64/leptonica-1.85.0.dll index 6984770ef576a6f7baf012fe3d2d13495346bad2..09992eb7ab612f0892f8bd05db45a3acb780b240 100644 GIT binary patch delta 298 zcmWm9Hx7aT06@`z4aMFI_KpovEZFbheIzlF(W|)O;;M-UGLC+ScYtTzFQSE8M-Z=% zvntrC@F&6rH$3pd2MK-zAR~wn!iXS>7~)7Ei4@YvAd4LGC_q6GC6rM?6*bh+Koc#r z(Lom~dgx<-Ax4fWXzwQv`}5K;hK>oQFfhX$3oKz`g*7(L=e3oOzL{w(OkKAnWrw{Z IDTnXr2aR}J3IG5A delta 298 zcmWm9#|?sD0D#f_*ih`fVDH#FV&B10yh~ytt9bN=6KLW<#-pEyH^4I=SINY^C8X2s zq6teAe-a#U!UZ=xkl}?73j7Elh!DbvAc`2`NFa$6(#Rl-98}~{KoKRBQ9%_o)X_i_ zEwrJbgD!gLV_<7y_!VPd(e#J9i z{pkA;5njHqF6mtftwhd(jRJ}&p$rEVR3TAA9St)+BOwef|MeJ~re4 delta 212 zcmWm8sS(0J06@{%gd?zAAsk`3LbwqKFtmZC3QEWfVpZCRU=R#u9T8Ll72vS^h-bd~ z(f2AM+%2AA{>-ZhC~Hb)KEtQE}HPrLK_`);iCtIJ_Zup%muh%hiu!6HBbH#s*vLU||nCjN-#Z*G{f;b{*TdR4265ZH8`XrO9Yz|B2j}SvQ4M}Q3Ay<4qh_Rl;69Q zctsLC-!~PfQVS5GfhJmLqk}Gb=wpB(Mi?W)1d13_%rM6SORTWQ#;YWcEIc2MuCfWX bzOv>T*Tu`loRlY*7X~||*dz0KVL!h==sPP% delta 188 zcmWm8I}Unw~z$aK~Zia$ukS{%hfeD!O=I? Z+~c-*xtUyfaz$xyLW(moUzGOq`vc5rD**ri 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 6984770ef576a6f7baf012fe3d2d13495346bad2..09992eb7ab612f0892f8bd05db45a3acb780b240 100644 GIT binary patch delta 298 zcmWm9Hx7aT06@`z4aMFI_KpovEZFbheIzlF(W|)O;;M-UGLC+ScYtTzFQSE8M-Z=% zvntrC@F&6rH$3pd2MK-zAR~wn!iXS>7~)7Ei4@YvAd4LGC_q6GC6rM?6*bh+Koc#r z(Lom~dgx<-Ax4fWXzwQv`}5K;hK>oQFfhX$3oKz`g*7(L=e3oOzL{w(OkKAnWrw{Z IDTnXr2aR}J3IG5A delta 298 zcmWm9#|?sD0D#f_*ih`fVDH#FV&B10yh~ytt9bN=6KLW<#-pEyH^4I=SINY^C8X2s zq6teAe-a#U!UZ=xkl}?73j7Elh!DbvAc`2`NFa$6(#Rl-98}~{KoKRBQ9%_o)X_i_ zEwrJbgD!gLV_<7y_!VPd(e#J9i z{pkA;5njHqF6mtftwhd(jRJ}&p$rEVR3TAA9St)+BOwef|MeJ~re4 delta 212 zcmWm8sS(0J06@{%gd?zAAsk`3LbwqKFtmZC3QEWfVpZCRU=R#u9T8Ll72vS^h-bd~ z(f2AM+%2AA{>-ZhC~Hb)KEtQE}HPrLK_`);iCtIJ_Zup%muh%hiu!6HBbH#s*vLU||nCjN-#Z*G{f;b{*TdR4265ZH8`XrO9Yz|B2j}SvQ4M}Q3Ay<4qh_Rl;69Q zctsLC-!~PfQVS5GfhJmLqk}Gb=wpB(Mi?W)1d13_%rM6SORTWQ#;YWcEIc2MuCfWX bzOv>T*Tu`loRlY*7X~||*dz0KVL!h==sPP% delta 188 zcmWm8I}Unw~z$aK~Zia$ukS{%hfeD!O=I? Z+~c-*xtUyfaz$xyLW(moUzGOq`vc5rD**ri