Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev 3.03 : Implement OpenCL #178

Merged
merged 31 commits into from
Dec 19, 2015
+1,075 −11,700
Merged

Dev 3.03 : Implement OpenCL #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
fe2b5ce
Updated tesseract to 3.03 (prerelease)
charlesw Jan 14, 2014
6bcd059
Fixed #65 - OtsuBinarization (x64)
charlesw Jan 24, 2014
433b279
Updated tesseract binaries
charlesw Jan 31, 2014
4a6a4e2
Merge remote-tracking branch 'origin/master' into dev_3.03
charlesw Jan 31, 2014
4cfa996
Support for setting params on init
charlesw Feb 1, 2014
a8b7913
Updated binaries tesseract to rev 1039
charlesw Feb 2, 2014
a04e525
Updated project refs to tesseract libs
charlesw Feb 2, 2014
8a52037
- Tweaked TesseractEngine.cs to account for when varValues is null (w…
amferguson Feb 19, 2014
5c7802e
- Updated LeptonicaApi.cs to reference the new version included
amferguson Feb 19, 2014
9bdaf07
- Exposed pixaDestroy in LeptonicaApi.cs
amferguson Feb 20, 2014
52d4818
Merge pull request #80 from amferguson/dev_3.03_multipage_tiff
charlesw Feb 20, 2014
c679165
Multi-page pix improvements.
charlesw Feb 20, 2014
e201016
Made PixArray Enumerable.
charlesw Feb 20, 2014
eb94702
Removed Pix.LoadMultiPageTiffFromFile
charlesw Feb 20, 2014
50dbefc
Fixed null reference exception for partially iterated PixArray enumer…
charlesw Feb 20, 2014
9159f87
Updated sample to do full iteration through src.
charlesw Mar 5, 2014
da357c6
Variables are now sent as a UTF8 encoded string - Issue #68
charlesw Mar 5, 2014
102fb11
Improved demo program.
charlesw May 17, 2014
8ba4183
Merge branch 'develop' into dev_3.03
charlesw Jun 22, 2014
e9308b2
Merge branch 'develop' into dev_3.03
charlesw Aug 30, 2014
19e1ba2
Merge branch 'develop' into dev_3.03
charlesw Mar 17, 2015
f14737f
Updated english trainedata
charlesw Mar 17, 2015
85a45ab
Cleaned up file contents using code maid to match dev (make it easier…
charlesw Mar 29, 2015
50e7934
Merge branch 'develop' into dev_3.03
charlesw Mar 29, 2015
271c5c9
added ChoiceIterator to BaseApi
jhuntsman Apr 16, 2015
b35c7ab
Merge pull request #165 from jhuntsman/feature_3.04/choice-iterator
charlesw Apr 19, 2015
e302d6e
Use invariant culture when testing output of result iterator so we do…
charlesw Apr 19, 2015
1d11b34
Updated to latest version of tesseract 3.04.
charlesw May 21, 2015
035a31b
Merge branch 'develop' into dev_3.03
charlesw May 21, 2015
961c9a4
Merge branch 'develop' into dev_3.03
charlesw Aug 22, 2015
2a9a692
Updated tesseract build to official 3.04 release.
charlesw Aug 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,8 @@ pip-log.txt

/*.Log
*.sdsettings
###############
# GIT Change files
################
*.orig

41 changes: 21 additions & 20 deletions Samples/Tesseract.ConsoleDemo/Tesseract.ConsoleDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,35 @@
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="Tesseract, Version=2.3.0.0, Culture=neutral, PublicKeyToken=ebeb3d86bef60cbe, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Tesseract.2.3.0.0\lib\net40\Tesseract.dll</HintPath>
<IlMerge>True</IlMerge>
</Reference>
<ProjectReference Include="..\..\src\Tesseract\Tesseract.csproj">
<Project>{DA780CA0-2606-4259-91C4-3F38C5C90592}</Project>
<Name>Tesseract</Name>
<IlMerge>True</IlMerge>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="FormattedConsoleLogger.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\lib\TesseractOcr\x64\liblept171.dll">
<Link>x64\liblept171.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\src\lib\TesseractOcr\x64\libtesseract304.dll">
<Link>x64\libtesseract304.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\src\lib\TesseractOcr\x86\liblept171.dll">
<Link>x86\liblept171.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\src\lib\TesseractOcr\x86\libtesseract304.dll">
<Link>x86\libtesseract304.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="phototest.tif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -91,20 +106,6 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="x64\liblept168.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="x64\libtesseract302.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="x86\liblept168.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="x86\libtesseract302.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="MergeAssemblies" AfterTargets="AfterBuild">
<CreateItem Include="@(ReferencePath)" Condition="'%(CopyLocal)'=='true' and '%(ReferencePath.IlMerge)'=='true'">
Expand Down
Binary file removed Samples/Tesseract.ConsoleDemo/x64/liblept168.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Samples/Tesseract.ConsoleDemo/x64/libtesseract302.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Samples/Tesseract.ConsoleDemo/x86/liblept168.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Samples/Tesseract.ConsoleDemo/x86/libtesseract302.dll
View file
Open in desktop
Binary file not shown.
38 changes: 20 additions & 18 deletions Samples/Tesseract.WebDemo/Tesseract.WebDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="Tesseract, Version=2.3.0.0, Culture=neutral, PublicKeyToken=ebeb3d86bef60cbe, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Tesseract.2.3.0.0\lib\net40\Tesseract.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\src\Tesseract\Tesseract.csproj">
<Project>{DA780CA0-2606-4259-91C4-3F38C5C90592}</Project>
<Name>Tesseract</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
Expand All @@ -85,6 +85,22 @@
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\lib\TesseractOcr\x64\liblept171.dll">
<Link>x64\liblept171.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\src\lib\TesseractOcr\x64\libtesseract304.dll">
<Link>x64\libtesseract304.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\src\lib\TesseractOcr\x86\liblept171.dll">
<Link>x86\liblept171.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\src\lib\TesseractOcr\x86\libtesseract304.dll">
<Link>x86\libtesseract304.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\bootstrap-theme.css" />
<None Include="Content\bootstrap-theme.min.css" />
<None Include="Content\bootstrap.css" />
Expand Down Expand Up @@ -112,21 +128,7 @@
<None Include="tessdata\eng.traineddata" />
<None Include="Tesseract.WebDemo.css" />
<None Include="Web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Global.asax" />
<Content Include="x64\liblept168.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="x64\libtesseract302.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="x86\liblept168.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="x86\libtesseract302.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand Down
Binary file removed Samples/Tesseract.WebDemo/x64/liblept168.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Samples/Tesseract.WebDemo/x64/libtesseract302.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Samples/Tesseract.WebDemo/x86/liblept168.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Samples/Tesseract.WebDemo/x86/libtesseract302.dll
View file
Open in desktop
Binary file not shown.
Binary file added Samples/UpgradeLog.htm
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions src/Tesseract.Tests.Console/Tesseract.Tests.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@
<!-- Load the common target, this does the real work for supporting multiple builds -->
<Import Project="..\Common.net45.targets" />
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tesseract.Tests.Console/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.3" targetFramework="net451" />
<package id="NUnit" version="2.6.4" targetFramework="net451" />
</packages>
4 changes: 2 additions & 2 deletions src/Tesseract.Tests/AnalyseResultTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ public void DetectOrientation_RotatedImage(float rotation)
{
using (var img = Pix.LoadFromFile(@".\phototest.tif")) {
using (var rotatedPix = img.Rotate(rotation / 360 * (float)Math.PI * 2)) {
var destFilename = String.Format("RotatedPix_{0}.tif", rotation);
rotatedPix.Save(Path.Combine(ResultsDirectory, destFilename), ImageFormat.Tiff);
//var destFilename = String.Format("RotatedPix_{0}.tif", rotation);
//rotatedPix.Save(Path.Combine(ResultsDirectory, destFilename), ImageFormat.Tiff);

using (var page = engine.Process(rotatedPix, PageSegMode.OsdOnly)) {
Orientation expectedOrientation;
Expand Down
25 changes: 12 additions & 13 deletions src/Tesseract.Tests/BaseApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@

using NUnit.Framework;
using System;
using System.Diagnostics;
using NUnit.Framework;

namespace Tesseract.Tests
{
[TestFixture]
public class BaseApiTests
{
[Test,
Ignore("GetVersion doesn't work for x64, probably compilation related.")]
public void GetVersion_Is302()
{
[TestFixture]
public class BaseApiTests
{
[Test,
Ignore("GetVersion doesn't work for x64, probably compilation related.")]
public void GetVersion_Is304()
{
var version = Interop.TessApi.Native.GetVersion();
Assert.That(version, Is.EqualTo("3.02"));
}
}
}
Assert.That(version, Is.EqualTo("3.04"));
}
}
}
Binary file added src/Tesseract.Tests/Data/processing/numbers.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading