Updated version Tesseract4Delphi 1.2.2

Use a synchronization object to protect the TLists in TTesseractLoader.
Added a simple benchmark to the SimpleOCR demos for VCL and LCL

Author: salvadordf

demos/Lazarus_Windows/SimpleOCR/uMainForm.lfm

@@ -195,6 +195,9 @@ object MainForm: TMainForm
     Panels = <    
       item
         Width = 500
+      end    
+      item
+        Width = 100
       end>
     SimplePanel = False
   end

demos/Lazarus_Windows/SimpleOCR/uMainForm.pas

@@ -102,18 +102,23 @@ procedure TMainForm.OpenSampleBtnClick(Sender: TObject);
   OpenImage('..\assets\samples\eng-text.bmp');
 end;
 
-procedure TMainForm.RecognizeBtnClick(Sender: TObject);
+procedure TMainForm.RecognizeBtnClick(Sender: TObject);      
+var
+  TempTicks : cardinal;
 begin
   if not(TesseractOCR1.Initialized) then exit;
 
   ButtonPnl.Enabled := False;
   StatusBar1.Panels[0].Text := 'Recognizing text...';
   Refresh;
 
-  TesseractOCR1.BaseAPI.PageSegMode := TessPageSegMode(ModeCb.ItemIndex);
+  TesseractOCR1.BaseAPI.PageSegMode := TessPageSegMode(ModeCb.ItemIndex);      
+
+  TempTicks := GetTickCount;
 
   if TesseractOCR1.Recognize then
-    begin
+    begin                  
+      StatusBar1.Panels[1].Text := FloatToStrF((GetTickCount - TempTicks) / 1000, ffFixed, 18, 2) + ' seconds';
       Memo1.Lines.SetText(PChar(TesseractOCR1.BaseAPI.GetText));
       AnalyzeLayout;
     end

packages/tesseract4delphi.lpk

@@ -16,7 +16,7 @@
     </CompilerOptions>
     <Description Value="Tesseract4Delphi"/>
     <License Value="MIT"/>
-    <Version Major="1" Minor="2" Release="1"/>
+    <Version Major="1" Minor="2" Release="2"/>
     <Files>
       <Item>
         <Filename Value="..\source\tesseract.inc"/>

source/uTesseractLoader.pas

@@ -11,9 +11,9 @@ interface
 uses
   {$IFDEF DELPHI16_UP}
     {$IFDEF MSWINDOWS}WinApi.Windows, System.Win.Registry,{$ENDIF}
-    System.Classes, System.SysUtils,
+    System.Classes, System.SysUtils, System.SyncObjs,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows, Registry,{$ENDIF} Classes, SysUtils,
+    {$IFDEF MSWINDOWS}Windows, Registry,{$ENDIF} Classes, SysUtils, SyncObjs,
     {$IFDEF FPC}dynlibs,{$ENDIF}
   {$ENDIF}
   uTesseractLibFunctions, uTesseractTypes;
@@ -35,6 +35,7 @@   TTesseractLoader = class
       FLastErrorMessage                  : string;
       FMonitors                          : TList;
       FComponents                        : TList;
+      FSyncObj                           : TCriticalSection;
 
       function  GetInitialized : boolean;
 
@@ -53,6 +54,8 @@   TTesseractLoader = class
       function  LoadResultIteratorFunctions : boolean;
       function  LoadChoiceIteratorFunctions : boolean;
       function  LoadProgressMonitorFunctions : boolean;
+      function  Lock : boolean;
+      procedure Unlock;
 
     public
       constructor Create;
@@ -148,6 +151,7 @@ constructor TTesseractLoader.Create;
   FLastErrorMessage  := '';
   FMonitors          := nil;
   FComponents        := nil;
+  FSyncObj           := nil;
   FCheckRequiredLibs := True;
   FMustFreeLibrary   := {$IFDEF LINUXFPC}False{$ELSE}True{$ENDIF};
 
@@ -165,6 +169,9 @@ destructor TTesseractLoader.Destroy;
     if assigned(FComponents) then
       FreeAndNil(FComponents);
 
+    if assigned(FSyncObj) then
+      FreeAndNil(FSyncObj);
+
     FreeTesseractLibrary;
   finally
     inherited Destroy;
@@ -177,6 +184,23 @@ procedure TTesseractLoader.AfterConstruction;
 
   FMonitors   := TList.Create;
   FComponents := TList.Create;
+  FSyncObj    := TCriticalSection.Create;
+end;
+
+function TTesseractLoader.Lock : boolean;
+begin
+  Result := False;
+
+  if assigned(FSyncObj) then
+    begin
+      FSyncObj.Acquire;
+      Result := True;
+    end;
+end;
+
+procedure TTesseractLoader.Unlock;
+begin
+  if assigned(FSyncObj) then FSyncObj.Release;
 end;
 
 function TTesseractLoader.GetInitialized : boolean;
@@ -708,14 +732,19 @@ function TTesseractLoader.InternalSearchMonitor(const aHandle: PETEXT_DESC; var
 begin
   Result := False;
 
-  if assigned(FMonitors) and assigned(FComponents) then
-    begin
-      i := FMonitors.IndexOf(aHandle);
-      if (i >= 0) then
+  if Lock then
+    try
+      if assigned(FMonitors) and assigned(FComponents) then
         begin
-          aComponent := TComponent(FComponents[i]);
-          Result     := True;
+          i := FMonitors.IndexOf(aHandle);
+          if (i >= 0) then
+            begin
+              aComponent := TComponent(FComponents[i]);
+              Result     := True;
+            end;
         end;
+    finally
+      Unlock;
     end;
 end;
 
@@ -725,15 +754,20 @@ function TTesseractLoader.InternalRegisterMonitor(const aHandle: PETEXT_DESC; co
 begin
   Result := False;
 
-  if assigned(FMonitors) and assigned(FComponents) then
-    begin
-      i := FMonitors.IndexOf(aHandle);
-      if (i < 0) then
+  if Lock then
+    try
+      if assigned(FMonitors) and assigned(FComponents) then
         begin
-          FMonitors.Add(aHandle);
-          FComponents.Add(aComponent);
-          Result := True;
+          i := FMonitors.IndexOf(aHandle);
+          if (i < 0) then
+            begin
+              FMonitors.Add(aHandle);
+              FComponents.Add(aComponent);
+              Result := True;
+            end;
         end;
+    finally
+      Unlock;
     end;
 end;
 
@@ -743,15 +777,20 @@ function TTesseractLoader.InternalUnregisterMonitor(const aHandle: PETEXT_DESC):
 begin
   Result := False;
 
-  if assigned(FMonitors) and assigned(FComponents) then
-    begin
-      i := FMonitors.IndexOf(aHandle);
-      if (i >= 0) then
+  if Lock then
+    try
+      if assigned(FMonitors) and assigned(FComponents) then
         begin
-          FMonitors.Delete(i);
-          FComponents.Delete(i);
-          Result := True;
+          i := FMonitors.IndexOf(aHandle);
+          if (i >= 0) then
+            begin
+              FMonitors.Delete(i);
+              FComponents.Delete(i);
+              Result := True;
+            end;
         end;
+    finally
+      Unlock;
     end;
 end;
 

source/uTesseractVersion.inc

@@ -4,5 +4,5 @@
 
   TESSERACT4DELPHI_MAJOR_VERSION   = 1;
   TESSERACT4DELPHI_MINOR_VERSION   = 2;
-  TESSERACT4DELPHI_RELEASE_VERSION = 1;
+  TESSERACT4DELPHI_RELEASE_VERSION = 2;
   TESSERACT4DELPHI_BUILD_VERSION   = 0;

update_Tesseract4Delphi.json

@@ -2,9 +2,9 @@
   "UpdateLazPackages" : [
     {
       "ForceNotify" : true,
-      "InternalVersion" : 8,
+      "InternalVersion" : 9,
       "Name" : "virtualtouchkeyboard4delphi.lpk",
-      "Version" : "1.2.1"
+      "Version" : "1.2.2"
     }
   ],
   "UpdatePackageData" : {