Matchtemplate: Fix small multithreading bug

Villavu · Jul 2, 2023 · b7fb8b8 · b7fb8b8
1 parent 586c22d
commit b7fb8b8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/Source/matchtemplate/simba.matchtemplate.pas b/Source/matchtemplate/simba.matchtemplate.pas
@@ -105,7 +105,7 @@ function Multithread(Image, Templ: TIntegerMatrix; MatchTemplate: TMatchTemplate
   );
   RowSize := Result.Width * SizeOf(Single);
 
-  SimbaThreadPool.RunParallel(CalculateSlices(Image.Width, Image.Height), 0, Image.Height, @Execute);
+  SimbaThreadPool.RunParallel(CalculateSlices(Image.Width, Image.Height), 0, Image.Height - Templ.Height, @Execute);
 end;
 
 procedure Validate(ImageWidth, ImageHeight, TemplateWidth, TemplateHeight: Integer);

diff --git a/Source/matchtemplate/simba.matchtemplate_ccoeff.pas b/Source/matchtemplate/simba.matchtemplate_ccoeff.pas
@@ -315,7 +315,7 @@ function MatchTemplateMask_CCOEFF_Cache(ACache: TMatchTemplateCacheBase; Templat
   );
   RowSize := Result.Width * SizeOf(Single);
 
-  SimbaThreadPool.RunParallel(CalculateSlices(Cache.Width, Cache.Height), 0, Cache.Height, @Execute);
+  SimbaThreadPool.RunParallel(CalculateSlices(Cache.Width, Cache.Height), 0, Cache.Height - Template.Height, @Execute);
 end;
 
 end.

diff --git a/Source/matchtemplate/simba.matchtemplate_ccorr.pas b/Source/matchtemplate/simba.matchtemplate_ccorr.pas
@@ -280,7 +280,7 @@ function MatchTemplateMask_CCORR_Cache(ACache: TMatchTemplateCacheBase; Template
   );
   RowSize := Result.Width * SizeOf(Single);
 
-  SimbaThreadPool.RunParallel(CalculateSlices(Cache.Width, Cache.Height), 0, Cache.Height, @Execute);
+  SimbaThreadPool.RunParallel(CalculateSlices(Cache.Width, Cache.Height), 0, Cache.Height - Template.Height, @Execute);
 end;
 
 end.

diff --git a/Source/matchtemplate/simba.matchtemplate_helpers.pas b/Source/matchtemplate/simba.matchtemplate_helpers.pas
@@ -28,7 +28,7 @@ implementation
 
 uses
   simba.FFTPACK4, simba.threadpool,
-  simba.singlematrix, simba.integermatrix;
+  simba.singlematrix;
 
 function DoFFT2(const Matrix: TSingleMatrix; const outW, outH: Integer): TComplexMatrix;
 var
@@ -41,7 +41,7 @@ function DoFFT2(const Matrix: TSingleMatrix; const outW, outH: Integer): TComple
   H := Matrix.Height - 1;
   for Y := 0 to H do
     for X := 0 to W do
-      Spec[Y, X].Re := Matrix[Y, X];
+      Spec[Y, X].Re := Matrix[Y, X];  // WTF!!
 
   Result := FFTPACK.FFT2(Spec);
 end;

diff --git a/Source/matchtemplate/simba.matchtemplate_sqdiff.pas b/Source/matchtemplate/simba.matchtemplate_sqdiff.pas
@@ -283,7 +283,7 @@ function MatchTemplateMask_SQDIFF_Cache(ACache: TMatchTemplateCacheBase; Templat
   );
   RowSize := Result.Width * SizeOf(Single);
 
-  SimbaThreadPool.RunParallel(CalculateSlices(Cache.Width, Cache.Height), 0, Cache.Height, @Execute);
+  SimbaThreadPool.RunParallel(CalculateSlices(Cache.Width, Cache.Height), 0, Cache.Height - Template.Height, @Execute);
 end;
 
 function MatchTemplateMask_SQDIFF_CreateCache(Image, Template: TIntegerMatrix): TMatchTemplateCacheBase;

diff --git a/Source/simba.threadpool.pas b/Source/simba.threadpool.pas
@@ -70,7 +70,12 @@ procedure TSimbaThreadPool_Thread.Execute;
       Method(Index, Lo, Hi);
     except
       on E: Exception do
-        DebugLn('Exception whilst invoking method in thread pool: ' + E.Message);
+      begin
+        DebugLn('[SimbaThreadPool]: Exception occurred while executing a method: ' + E.Message);
+        {$IFDEF SIMBA_HAS_DEBUGINFO}
+        DumpExceptionBacktrace(Output);
+        {$ENDIF}
+      end;
     end;
 
     Method := nil;