Updated tesseract to 3.03 (prerelease)

Notes: * x86 only (no x64 build yet) * based on rev 987 * Highly likely that tesseract and leptonica have different VS Runtimes (tesseract was compiled with VS 2013, while leptonica VS 2012) this will be fixed when I generate the x64 builds. * Confirmed Issue #52 has been resolved. * Could be Interop incompatibilities UNTESTED
charlesw · Jan 14, 2014 · fe2b5ce · fe2b5ce
1 parent 8a500a3
commit fe2b5ce
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 deletions.
diff --git a/src/Tesseract.Tests/Data/processing/numbers.png b/src/Tesseract.Tests/Data/processing/numbers.png
diff --git a/src/Tesseract.Tests/EngineTests.cs b/src/Tesseract.Tests/EngineTests.cs
@@ -128,6 +128,27 @@ public void CanSetStringVariable(string variableName, string variableValue)
         	}
         }
 
+        /// <summary>
+        /// As per Bug #52 setting 'classify_bln_numeric_mode' variable to '1' causes the engine to fail on processing.
+        /// </summary>
+        [Test]
+        public void CanSetClassifyBlnNumericModeVariable()
+        {
+        	using (var engine = new TesseractEngine(@"./tessdata", "eng", EngineMode.Default)) {
+        		engine.SetVariable("classify_bln_numeric_mode", 1);
+
+        		using(var img = Pix.LoadFromFile("./Data/processing/numbers.png")) {
+                    using(var page = engine.Process(img)) {
+                        var text = page.GetText();
+
+                        const string expectedText = "1234567890\n\n";
+
+                        Assert.That(text, Is.EqualTo(expectedText));
+                    }
+                }
+        	}
+        }
+
         #endregion
 	}
 }
diff --git a/src/Tesseract.Tests/Tesseract.Tests.csproj b/src/Tesseract.Tests/Tesseract.Tests.csproj
@@ -30,7 +30,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release40|AnyCPU' ">
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug40Client|AnyCPU' ">
-  </PropertyGroup>	
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release40Client|AnyCPU' ">
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
@@ -88,10 +88,6 @@
       <Link>x86\liblept168.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\lib\TesseractOcr\x86\libtesseract302.dll">
-      <Link>x86\libtesseract302.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Data\Binarization\neo-32bit.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -130,9 +126,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Data\processing" />
     <Folder Include="tessdata" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\lib\TesseractOcr\x86\libtesseract303.dll">
+      <Link>x86\libtesseract303.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Data\processing\numbers.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="tessdata\eng.cube.bigrams">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/src/Tesseract/Interop/Constants.cs b/src/Tesseract/Interop/Constants.cs
@@ -8,7 +8,7 @@ namespace Tesseract.Interop
 	/// </summary>
 	public static class Constants
 	{
-        public const string TesseractDllName = "libtesseract302";
+        public const string TesseractDllName = "libtesseract303";
         public const string LeptonicaDllName = "liblept168";
 	}
 }
diff --git a/src/Tesseract/Tesseract.csproj b/src/Tesseract/Tesseract.csproj
@@ -114,8 +114,8 @@
       <Link>x86\liblept168.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\lib\TesseractOcr\x86\libtesseract302.dll">
-      <Link>x86\libtesseract302.dll</Link>
+    <None Include="..\lib\TesseractOcr\x86\libtesseract303.dll">
+      <Link>x86\libtesseract303.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/src/lib/TesseractOcr/x86/libtesseract302.dll b/src/lib/TesseractOcr/x86/libtesseract302.dll
diff --git a/src/lib/TesseractOcr/x86/libtesseract303.dll b/src/lib/TesseractOcr/x86/libtesseract303.dll