Skip to content

Commit

Permalink
Merge branch 'release/2.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@charlesw
charlesw committed Mar 29, 2015
2 parents 436d21a + 58a6537 commit 1423c4e
Show file tree
Hide file tree
Showing 21 changed files with 1,165 additions and 764 deletions.
9 changes: 7 additions & 2 deletions ChangeLog.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

### Version 2.3.0

* Support for OsdOnly mode - [Issue 156](https://github.com/charlesw/tesseract/issues/156)
* Support for saving the thresholded image to tessinput.tif when tessedit_write_images is set - [Issue 160](https://github.com/charlesw/tesseract/issues/160)
* Support for specifying custom search directory for dlls and improved logging - [Issue 157](https://github.com/charlesw/tesseract/issues/157)

### Version 2.2.0

* Improved error message when dll failed to load - [Issue 141](https://github.com/charlesw/tesseract/issues/141)
Expand All @@ -17,7 +22,7 @@
### Version 2.0.0

*Note:* Version 2 was initially going to introduce support for Tesseract 3.03 however as that hasn't been released yet and we have a few minor breaking changes
due to Mono support which require a version incremment (we use semantic versioning). Once the next version of tesseract is released we'll add it.
due to Mono support which require a version increment (we use semantic versioning). Once the next version of tesseract is released we'll add it.

#### Breaking changes from 1.0

Expand Down
30 changes: 8 additions & 22 deletions Samples/Tesseract.ConsoleDemo/Tesseract.ConsoleDemo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="Tesseract, Version=2.1.0.1, Culture=neutral, PublicKeyToken=ebeb3d86bef60cbe, processorArchitecture=MSIL">
<Reference Include="Tesseract, Version=2.3.0.0, Culture=neutral, PublicKeyToken=ebeb3d86bef60cbe, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Tesseract.2.1.0.1\lib\net40\Tesseract.dll</HintPath>
<IlMerge>True</IlMerge>
<IlMerge>True</IlMerge>
<HintPath>..\packages\Tesseract.2.3.0.0\lib\net40\Tesseract.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -92,20 +92,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" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand All @@ -115,10 +101,10 @@
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<Target Name="MergeAssemblies" AfterTargets="AfterBuild">
<CreateItem Include="@(ReferencePath)" Condition="'%(CopyLocal)'=='true' and '%(ReferencePath.IlMerge)'=='true'">
<Output TaskParameter="Include" ItemName="IlmergeAssemblies"/>
</CreateItem>
<Message Text="MERGING: @(IlmergeAssemblies->'%(Filename)')" Importance="High" />
<Exec Command="&quot;$(SolutionDir)\packages\ILMerge.2.14.1208\tools\Ilmerge.exe&quot; /lib:&quot;$(MSBuildBinPath)&quot; /targetplatform:v4 /out:&quot;@(MainAssembly)&quot; &quot;@(IntermediateAssembly)&quot; @(IlmergeAssemblies->'&quot;%(FullPath)&quot;', ' ')" />
<CreateItem Include="@(ReferencePath)" Condition="'%(CopyLocal)'=='true' and '%(ReferencePath.IlMerge)'=='true'">
<Output TaskParameter="Include" ItemName="IlmergeAssemblies" />
</CreateItem>
<Message Text="MERGING: @(IlmergeAssemblies->'%(Filename)')" Importance="High" />
<Exec Command="&quot;$(SolutionDir)packages\ILMerge.2.14.1208\tools\Ilmerge.exe&quot; /lib:&quot;$(MSBuildBinPath)&quot; /targetplatform:v4 /out:&quot;@(MainAssembly)&quot; &quot;@(IntermediateAssembly)&quot; @(IlmergeAssemblies->'&quot;%(FullPath)&quot;', ' ')" />
</Target>
</Project>
16 changes: 16 additions & 0 deletions Samples/Tesseract.ConsoleDemo/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,20 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
</startup>
<sources>
<source name="Tesseract" switchValue="Verbose">
<listeners>
<clear />
<add name="console" />
<!--<add name="file" />-->
</listeners>
</source>
</sources>
<sharedListeners>
<add name="console" type="System.Diagnostics.ConsoleTraceListener" />

<!--<add name="file"
type="System.Diagnostics.TextWriterTraceListener"
initializeData="c:\log\tesseract.consoledemo.log" />-->
</sharedListeners>
</configuration>
2 changes: 1 addition & 1 deletion Samples/Tesseract.ConsoleDemo/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILMerge" version="2.14.1208" targetFramework="net40" />
<package id="Tesseract" version="2.1.0.1" targetFramework="net40" />
<package id="Tesseract" version="2.3.0.0" targetFramework="net40" />
</packages>
1 change: 1 addition & 0 deletions Samples/Tesseract.WebDemo/Global.asax
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<%@ Application Codebehind="Global.asax.cs" Inherits="Tesseract.WebDemo.Global" Language="C#" %>
49 changes: 49 additions & 0 deletions Samples/Tesseract.WebDemo/Global.asax.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Security;
using System.Web.SessionState;
using Tesseract;

namespace Tesseract.WebDemo
{
public class Global : System.Web.HttpApplication
{

protected void Application_Start(object sender, EventArgs e)
{
TesseractEnviornment.CustomSearchPath = Server.MapPath("~");
}

protected void Session_Start(object sender, EventArgs e)
{

}

protected void Application_BeginRequest(object sender, EventArgs e)
{

}

protected void Application_AuthenticateRequest(object sender, EventArgs e)
{

}

protected void Application_Error(object sender, EventArgs e)
{

}

protected void Session_End(object sender, EventArgs e)
{

}

protected void Application_End(object sender, EventArgs e)
{

}
}
}
8 changes: 6 additions & 2 deletions Samples/Tesseract.WebDemo/Tesseract.WebDemo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="Tesseract, Version=2.1.0.1, Culture=neutral, PublicKeyToken=ebeb3d86bef60cbe, processorArchitecture=MSIL">
<Reference Include="Tesseract, Version=2.3.0.0, Culture=neutral, PublicKeyToken=ebeb3d86bef60cbe, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Tesseract.2.1.0.1\lib\net40\Tesseract.dll</HintPath>
<HintPath>..\packages\Tesseract.2.3.0.0\lib\net40\Tesseract.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -81,6 +81,9 @@
<DependentUpon>Default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="Content\bootstrap-theme.css" />
Expand Down Expand Up @@ -112,6 +115,7 @@
<None Include="Web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Global.asax" />
<Content Include="x64\liblept168.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand Down
110 changes: 55 additions & 55 deletions Samples/Tesseract.WebDemo/Web.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<system.web>

<!-- DYNAMIC DEBUG COMPILATION
<!-- DYNAMIC DEBUG COMPILATION
Set compilation debug="true" to enable ASPX debugging. Otherwise, setting this value to
false will improve runtime performance of this application.
Set compilation debug="true" to insert debugging symbols (.pdb information)
Expand All @@ -11,12 +11,12 @@
false at all other times. For more information, refer to the documentation about
debugging ASP.NET files.
-->
<compilation
defaultLanguage="c#"
debug="true"
<compilation
defaultLanguage="c#"
debug="true"
/>

<!-- CUSTOM ERROR MESSAGES
<!-- CUSTOM ERROR MESSAGES
Set customErrors mode="On" or "RemoteOnly" to enable custom error messages, "Off" to disable.
Add <error> tags for each of the errors you want to handle.
Expand All @@ -26,9 +26,9 @@
on the local Web server. This setting is recommended for security purposes, so
that you do not display application detail information to remote clients.
-->
<customErrors mode="RemoteOnly" />
<customErrors mode="RemoteOnly" />

<!-- AUTHENTICATION
<!-- AUTHENTICATION
This section sets the authentication policies of the application. Possible modes are "Windows",
"Forms", "Passport" and "None"
Expand All @@ -40,79 +40,79 @@
"Passport" Authentication is performed via a centralized authentication service provided
by Microsoft that offers a single logon and core profile services for member sites.
-->
<authentication mode="None" />
<authentication mode="None" />

<!-- AUTHORIZATION
<!-- AUTHORIZATION
This section sets the authorization policies of the application. You can allow or deny access
to application resources by user or role. Wildcards: "*" mean everyone, "?" means anonymous
(unauthenticated) users.
-->

<authorization>
<allow users="*" /> <!-- Allow all users -->
<!-- <allow users="[comma separated list of users]"
roles="[comma separated list of roles]"/>
<authorization>
<allow users="*" />
<!-- Allow all users -->
<!-- <allow users="[comma separated list of users]"
roles="[comma separated list of roles]" />
<deny users="[comma separated list of users]"
roles="[comma separated list of roles]"/>
roles="[comma separated list of roles]" />
-->
</authorization>
</authorization>

<!-- APPLICATION-LEVEL TRACE LOGGING
<!-- APPLICATION-LEVEL TRACE LOGGING
Application-level tracing enables trace log output for every page within an application.
Set trace enabled="true" to enable application trace logging. If pageOutput="true", the
trace information will be displayed at the bottom of each page. Otherwise, you can view the
application trace log by browsing the "trace.axd" page from your web application
root.
-->
<trace
enabled="false"
requestLimit="10"
pageOutput="false"
traceMode="SortByTime"
localOnly="true"
<trace
enabled="false"
requestLimit="10"
pageOutput="false"
traceMode="SortByTime"
localOnly="true"
/>

<!-- SESSION STATE SETTINGS
<!-- SESSION STATE SETTINGS
By default ASP.NET uses cookies to identify which requests belong to a particular session.
If cookies are not available, a session can be tracked by adding a session identifier to the URL.
To disable cookies, set sessionState cookieless="true".
-->
<sessionState
mode="InProc"
cookieless="true"
timeout="20"
<sessionState
mode="InProc"
cookieless="true"
timeout="20"
/>

<!-- GLOBALIZATION
<!-- GLOBALIZATION
This section sets the globalization settings of the application.
-->
<globalization
requestEncoding="utf-8"
responseEncoding="utf-8"
/>
<globalization
requestEncoding="utf-8"
responseEncoding="utf-8" />
</system.web>

</system.web>

<appSettings>

<add key="SqlConnectionString"
value="Server=localhost; Database=; Uid=root; Pwd=;"
/>
<appSettings>

</appSettings>
<system.diagnostics>
<trace autoflush="true" indentsize="4">
<listeners>
<add name="configConsoleListener"
type="System.Diagnostics.ConsoleTraceListener" />
<!--
<add name="textTraceListener"
type="System.Diagnostics.TextWriterTraceListener"
initializeData="c:\log\webdemo.log" />
-->
</listeners>
</trace>
</system.diagnostics>

</configuration>
<add key="SqlConnectionString"
value="Server=localhost; Database=; Uid=root; Pwd=;" />
</appSettings>
<system.diagnostics>
<sources>
<source name="Tesseract" switchValue="Verbose">
<listeners>
<clear />
<add name="console" />
<!--<add name="file" />-->
</listeners>
</source>
</sources>
<sharedListeners>
<add name="console" type="System.Diagnostics.ConsoleTraceListener" />

<!--<add name="file"
type="System.Diagnostics.TextWriterTraceListener"
initializeData="c:\log\tesseract.webdemo.log" />-->
</sharedListeners>
</system.diagnostics>
</configuration>
2 changes: 1 addition & 1 deletion Samples/Tesseract.WebDemo/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<packages>
<package id="bootstrap" version="3.0.3" targetFramework="net451" />
<package id="jQuery" version="1.9.1" targetFramework="net451" />
<package id="Tesseract" version="2.1.0.1" targetFramework="net40" />
<package id="Tesseract" version="2.3.0.0" targetFramework="net40" />
<package id="Twitter.Bootstrap" version="3.0.1.1" targetFramework="net451" />
</packages>
2 changes: 1 addition & 1 deletion build.proj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Version>2.2.0.0</Version>
<Version>2.3.0.0</Version>
<SourceDir>$(MSBuildProjectDirectory)\src</SourceDir>
<BuildDir>$(MSBuildProjectDirectory)\bin</BuildDir>
<ReleaseDir>$(MSBuildProjectDirectory)\release</ReleaseDir>
Expand Down
Loading

0 comments on commit 1423c4e

Please sign in to comment.