Merge branch 'develop' of github.com:charlesw/tesseract into develop

charlesw · Mar 20, 2018 · 2eb5414 · 2eb5414
2 parents 7d5322f + 6aebd9a
commit 2eb5414
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 6 deletions.
diff --git a/build.proj b/build.proj
@@ -60,7 +60,7 @@
     </CreateItem>
   </Target>
   <Target Name="RestorePackages">
-    <Exec Command='$(ToolsDir)\NuGet.exe restore "$(SourceDir)\Tesseract.sln"' />
+    <Exec Command='"$(ToolsDir)\NuGet.exe" restore "$(SourceDir)\Tesseract.sln"' />
   </Target>
   <Target Name="Clean" DependsOnTargets="ExpandFlavors;RestorePackages">
     <MSBuild Projects="@(ProjectToBuild)" Targets="Clean" />

diff --git a/src/Tesseract.Net45Tests/Tesseract.Net45Tests.csproj b/src/Tesseract.Net45Tests/Tesseract.Net45Tests.csproj
@@ -183,13 +183,13 @@
     <None Include="..\Tesseract.Tests\tessdata\pdf.ttx" Link="tessdata\pdf.ttx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\Tesseract\x64\liblept1742.dll" Link="x64\liblept1742.dll">
+    <None Include="..\Tesseract\x64\liblept1744.dll" Link="x64\liblept1744.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Tesseract\x64\libtesseract3051.dll" Link="x64\libtesseract3051.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\Tesseract\x86\liblept1742.dll" Link="x86\liblept1742.dll">
+    <None Include="..\Tesseract\x86\liblept1744.dll" Link="x86\liblept1744.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Tesseract\x86\libtesseract3051.dll" Link="x86\libtesseract3051.dll">

diff --git a/src/Tesseract.NetCore2Tests/Tesseract.NetCore2Tests.csproj b/src/Tesseract.NetCore2Tests/Tesseract.NetCore2Tests.csproj
@@ -180,13 +180,13 @@
     <None Include="..\Tesseract.Tests\tessdata\pdf.ttx" Link="tessdata\pdf.ttx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\Tesseract\x64\liblept1742.dll" Link="x64\liblept1742.dll">
+    <None Include="..\Tesseract\x64\liblept1744.dll" Link="x64\liblept1744.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Tesseract\x64\libtesseract3051.dll" Link="x64\libtesseract3051.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\Tesseract\x86\liblept1742.dll" Link="x86\liblept1742.dll">
+    <None Include="..\Tesseract\x86\liblept1744.dll" Link="x86\liblept1744.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Tesseract\x86\libtesseract3051.dll" Link="x86\libtesseract3051.dll">

diff --git a/src/Tesseract.Tests/ResultRendererTests.cs b/src/Tesseract.Tests/ResultRendererTests.cs
@@ -58,6 +58,20 @@ public void CanRenderResultsIntoPdfFile()
             Assert.That(File.Exists(expectedOutputFilename), $"Expected a PDF file \"{expectedOutputFilename}\" to have been created; but none was found.");
         }
 
+        [Test]
+        public void CanRenderResultsIntoPdfFile1()
+        {
+            var resultPath = TestResultRunFile(@"ResultRenderers\PDF\phototest");
+            using (var renderer = ResultRenderer.CreatePdfRenderer(resultPath, DataPath))
+            {
+                var examplePixPath = TestFilePath("Ocr/phototest.tif");
+                ProcessImageFile(renderer, examplePixPath);
+            }
+
+            var expectedOutputFilename = Path.ChangeExtension(resultPath, "pdf");
+            Assert.That(File.Exists(expectedOutputFilename), $"Expected a PDF file \"{expectedOutputFilename}\" to have been created; but none was found.");
+        }
+
         [Test]
         public void CanRenderMultiplePageDocumentToPdfFile()
         {
@@ -71,6 +85,20 @@ public void CanRenderMultiplePageDocumentToPdfFile()
             Assert.That(File.Exists(expectedOutputFilename), $"Expected a PDF file \"{expectedOutputFilename}\" to have been created; but none was found.");
         }
 
+        [Test]
+        public void CanRenderMultiplePageDocumentToPdfFile1()
+        {
+            var resultPath = TestResultRunFile(@"ResultRenderers\PDF\multi-page");
+            using (var renderer = ResultRenderer.CreatePdfRenderer(resultPath, DataPath))
+            {
+                var examplePixPath = TestFilePath("processing/multi-page.tif");
+                ProcessImageFile(renderer, examplePixPath);
+            }
+
+            var expectedOutputFilename = Path.ChangeExtension(resultPath, "pdf");
+            Assert.That(File.Exists(expectedOutputFilename), $"Expected a PDF file \"{expectedOutputFilename}\" to have been created; but none was found.");
+        }
+
         [Test]
         public void CanRenderResultsIntoHOcrFile()
         {
@@ -184,5 +212,45 @@ private void ProcessFile(IResultRenderer renderer, string filename)
                 Assert.AreEqual(renderer.PageNumber, 0);
             }
         }
+
+        private void ProcessImageFile(IResultRenderer renderer, string filename)
+        {
+            var imageName = Path.GetFileNameWithoutExtension(filename);
+            using (var pixA = ReadImageFileIntoPixArray(filename))
+            {
+                int expectedPageNumber = -1;
+                using (renderer.BeginDocument(imageName))
+                {
+                    Assert.AreEqual(renderer.PageNumber, expectedPageNumber);
+                    foreach (var pix in pixA)
+                    {
+                        using (var page = _engine.Process(pix, imageName))
+                        {
+                            var addedPage = renderer.AddPage(page);
+                            expectedPageNumber++;
+
+                            Assert.That(addedPage, Is.True);
+                            Assert.That(renderer.PageNumber, Is.EqualTo(expectedPageNumber));
+                        }
+                    }
+                }
+
+                Assert.That(renderer.PageNumber, Is.EqualTo(expectedPageNumber));
+            }
+        }
+
+        private PixArray ReadImageFileIntoPixArray(string filename)
+        {
+            if (filename.ToLower().EndsWith(".tif") || filename.ToLower().EndsWith(".tiff"))
+            {
+                return PixArray.LoadMultiPageTiffFromFile(filename);
+            }
+            else
+            {
+                PixArray pa = PixArray.Create(0);
+                pa.Add(Pix.LoadFromFile(filename));
+                return pa;
+            }
+        }
     }
 }
diff --git a/src/Tesseract/Interop/Constants.cs b/src/Tesseract/Interop/Constants.cs
@@ -7,7 +7,7 @@ namespace Tesseract.Interop
     /// </summary>
     internal static class Constants
     {
-        public const string LeptonicaDllName = "liblept1742";
+        public const string LeptonicaDllName = "liblept1744";
         public const string TesseractDllName = "libtesseract3051";
 
         // tesseract uses an int to represent true false values.

diff --git a/src/Tesseract/x64/liblept1742.dll → src/Tesseract/x64/liblept1744.dll b/src/Tesseract/x64/liblept1742.dll → src/Tesseract/x64/liblept1744.dll
diff --git a/src/Tesseract/x64/libtesseract3051.dll b/src/Tesseract/x64/libtesseract3051.dll
diff --git a/src/Tesseract/x86/liblept1742.dll → src/Tesseract/x86/liblept1744.dll b/src/Tesseract/x86/liblept1742.dll → src/Tesseract/x86/liblept1744.dll
diff --git a/src/Tesseract/x86/libtesseract3051.dll b/src/Tesseract/x86/libtesseract3051.dll