Skip to content

Commit bf4a851

Browse files
iText-CIiText-CI
committed
[RELEASE] iText pdfOCR 4.1.0
2 parents 853490c + 1efff5f commit bf4a851

File tree

332 files changed

+168918
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

332 files changed

+168918
-546
lines changed

‎.gitattributes

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
###############################################################################
2-
# Set default behavior to automatically normalize line endings.
3-
###############################################################################
1+
# Set the default behavior, in case people don't have core.autocrlf set.
42
* text=auto
53

6-
###############################################################################
7-
# Set default behavior for command prompt diff.
8-
#
9-
# This is need for earlier builds of msysgit that does not have it on by
10-
# default for csharp files.
11-
# Note: This is only used by command line
12-
###############################################################################
13-
#*.cs diff=csharp
4+
# Explicitly declare text files you want to always be normalized and converted
5+
# to LF line endings on checkout.
6+
*.afm text eol=lf
7+
*.cmap text eol=lf
8+
*.cs text eol=lf ident
9+
*.css text eol=lf
10+
*.htm text eol=lf
11+
*.html text eol=lf
12+
*.java text eol=lf ident
13+
*.lng text eol=lf
14+
*.md text eol=lf
15+
*.pom text eol=lf
16+
*.properties text eol=lf
17+
*.svg text eol=lf
18+
*.txt text eol=lf
19+
*.xfdf text eol=lf
20+
*.xht text eol=lf
21+
*.xhtml text eol=lf
22+
*.xml text eol=lf
23+
*.json text eol=lf
24+
port-hash text eol=lf
1425

15-
###############################################################################
16-
# Set the merge driver for project and solution files
17-
#
18-
# Merging from the command prompt will add diff markers to the files if there
19-
# are conflicts (Merging from VS is not affected by the settings below, in VS
20-
# the diff markers are never inserted). Diff markers may cause the following
21-
# file extensions to fail to load in VS. An alternative would be to treat
22-
# these files as binary and thus will always conflict and require user
23-
# intervention with every merge. To do so, just uncomment the entries below
24-
###############################################################################
25-
#*.sln merge=binary
26-
#*.csproj merge=binary
27-
#*.vbproj merge=binary
28-
#*.vcxproj merge=binary
29-
#*.vcproj merge=binary
30-
#*.dbproj merge=binary
31-
#*.fsproj merge=binary
32-
#*.lsproj merge=binary
33-
#*.wixproj merge=binary
34-
#*.modelproj merge=binary
35-
#*.sqlproj merge=binary
36-
#*.wwaproj merge=binary
26+
# Declare files that will always have CRLF line endings on checkout.
27+
*.bat text eol=crlf
28+
*.csproj text eol=crlf
29+
*.sln text eol=crlf
3730

38-
###############################################################################
39-
# behavior for image files
40-
#
41-
# image files are treated as binary by default.
42-
###############################################################################
43-
#*.jpg binary
44-
#*.png binary
45-
#*.gif binary
46-
47-
###############################################################################
48-
# diff behavior for common document formats
49-
#
50-
# Convert binary document formats to text before diffing them. This feature
51-
# is only available from the command line. Turn it on by uncommenting the
52-
# entries below.
53-
###############################################################################
54-
#*.doc diff=astextplain
55-
#*.DOC diff=astextplain
56-
#*.docx diff=astextplain
57-
#*.DOCX diff=astextplain
58-
#*.dot diff=astextplain
59-
#*.DOT diff=astextplain
60-
#*.pdf diff=astextplain
61-
#*.PDF diff=astextplain
62-
#*.rtf diff=astextplain
63-
#*.RTF diff=astextplain
31+
# Denote all files that are truly binary and should not be modified.
32+
*.aif binary
33+
*.aiff binary
34+
*.bmp binary
35+
*.cer binary
36+
*.cmp binary
37+
*.crt binary
38+
*.dib binary
39+
*.gif binary
40+
*.icc binary
41+
*.j2k binary
42+
*.jb2 binary
43+
*.jp2 binary
44+
*.jpc binary
45+
*.jpg binary
46+
*.key binary
47+
*.otf binary
48+
*.p12 binary
49+
*.pdf binary
50+
*.pfb binary
51+
*.pfm binary
52+
*.png binary
53+
*.snd binary
54+
*.tif binary
55+
*.tiff binary
56+
*.ttc binary
57+
*.ttf binary
58+
*.u3d binary
59+
*.wav binary
60+
*.wmf binary
61+
*.woff binary
62+
*.woff2 binary
63+
*.dat binary

‎Jenkinsfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
def repoName = "pdfOcr"
55
def dependencyRegex = "itextcore"
66
def solutionFile = "i7n-ocr.sln"
7-
def csprojFramework = "net461"
7+
def frameworksToTest = "net461"
8+
def frameworksToTestForMainBranches = "net461;netcoreapp2.0"
89

9-
automaticDotnetBuild(repoName, dependencyRegex, solutionFile, csprojFramework)
10+
11+
automaticDotnetBuild(repoName, dependencyRegex, solutionFile, frameworksToTest, frameworksToTestForMainBranches)

‎doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
3232
# title of most generated pages and in a few other places.
3333
# The default value is: My Project.
3434

35-
PROJECT_NAME = "pdfOCR 4.0.2 API"
35+
PROJECT_NAME = "pdfOCR 4.1.0 API"
3636

3737
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
3838
# could be handy for archiving the generated documentation or if some version

‎i7n-ocr.sln

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.pdfocr.api.tests", "i
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.pdfocr.tesseract4.tests", "itext.tests\itext.pdfocr.tesseract4.tests\itext.pdfocr.tesseract4.tests.csproj", "{50AC143E-76D9-4288-BFDD-9F8002716546}"
1313
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.pdfocr.onnxtr", "itext\itext.pdfocr.onnxtr\itext.pdfocr.onnxtr.csproj", "{A34A368A-5F0F-45D6-8BAB-2E6AAC815706}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.pdfocr.onnxtr.tests", "itext.tests\itext.pdfocr.onnxtr.tests\itext.pdfocr.onnxtr.tests.csproj", "{2B8F8A5C-A480-4BF9-9CC4-274DE8E9242E}"
17+
EndProject
1418
Global
1519
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1620
Debug|Any CPU = Debug|Any CPU
@@ -33,6 +37,14 @@ Global
3337
{50AC143E-76D9-4288-BFDD-9F8002716546}.Debug|Any CPU.Build.0 = Debug|Any CPU
3438
{50AC143E-76D9-4288-BFDD-9F8002716546}.Release|Any CPU.ActiveCfg = Release|Any CPU
3539
{50AC143E-76D9-4288-BFDD-9F8002716546}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{A34A368A-5F0F-45D6-8BAB-2E6AAC815706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{A34A368A-5F0F-45D6-8BAB-2E6AAC815706}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{A34A368A-5F0F-45D6-8BAB-2E6AAC815706}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{A34A368A-5F0F-45D6-8BAB-2E6AAC815706}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{2B8F8A5C-A480-4BF9-9CC4-274DE8E9242E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{2B8F8A5C-A480-4BF9-9CC4-274DE8E9242E}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{2B8F8A5C-A480-4BF9-9CC4-274DE8E9242E}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{2B8F8A5C-A480-4BF9-9CC4-274DE8E9242E}.Release|Any CPU.Build.0 = Release|Any CPU
3648
EndGlobalSection
3749
GlobalSection(SolutionProperties) = preSolution
3850
HideSolutionNode = FALSE

‎itext.tests/itext.pdfocr.api.tests/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515

1616
[assembly: Guid("d6a6ea97-1f23-448f-b700-eff62971d234")]
1717

18-
[assembly: AssemblyVersion("4.0.2.0")]
19-
[assembly: AssemblyFileVersion("4.0.2.0")]
20-
[assembly: AssemblyInformationalVersion("4.0.2")]
18+
[assembly: AssemblyVersion("4.1.0.0")]
19+
[assembly: AssemblyFileVersion("4.1.0.0")]
20+
[assembly: AssemblyInformationalVersion("4.1.0")]

‎itext.tests/itext.pdfocr.api.tests/itext.pdfocr.api.tests.csproj

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,57 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
3-
<PropertyGroup>
4-
<RootNamespace>itext.pdfocr.api.tests</RootNamespace>
5-
<AssemblyName>itext.pdfocr.api.tests</AssemblyName>
6-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
3+
<PropertyGroup Label="Configuration">
4+
<SignAssembly>True</SignAssembly>
5+
<DelaySign>False</DelaySign>
6+
<RootNamespace />
77
</PropertyGroup>
88
<PropertyGroup>
9+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
10+
<IsTestProject>true</IsTestProject>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
913
<OutputType>library</OutputType>
1014
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
16+
<OutputType>Library</OutputType>
17+
<DefineConstants>NETSTANDARD2_0</DefineConstants>
18+
</PropertyGroup>
1119
<PropertyGroup>
12-
<TargetFramework>net461</TargetFramework>
20+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
21+
<ApplicationIcon />
22+
<OutputTypeEx>library</OutputTypeEx>
23+
<StartupObject />
24+
<AssemblyName>itext.pdfocr.api.tests</AssemblyName>
1325
</PropertyGroup>
1426
<PropertyGroup>
15-
<SignAssembly>true</SignAssembly>
16-
<DelaySign>False</DelaySign>
1727
<AssemblyOriginatorKeyFile>itext.snk</AssemblyOriginatorKeyFile>
1828
</PropertyGroup>
1929
<ItemGroup>
30+
<None Include="itext.snk" />
31+
</ItemGroup>
32+
<PropertyGroup>
33+
<NoWarn>1701;1702;1591;1570;1572;1573;1574;1580;1584;1658</NoWarn>
34+
<!-- TODO DEVSIX-9075: remove this suppression -->
35+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
36+
</PropertyGroup>
37+
38+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
2039
<Reference Include="System" />
2140
<Reference Include="System.Core" />
2241
</ItemGroup>
23-
<ItemGroup>
24-
<None Include="itext.snk" />
42+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
43+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
2544
</ItemGroup>
2645
<ItemGroup>
27-
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
28-
<PackageReference Include="itext.pdftest" Version="9.2.0" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
29-
<ProjectReference Include="..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
30-
<PackageReference Include="itext.bouncy-castle-adapter" Version="9.2.0" Condition="!Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
31-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" />
32-
<PackageReference Include="NUnit" Version="3.12.0" />
33-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
34-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
35-
<PrivateAssets>all</PrivateAssets>
36-
</PackageReference>
46+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
47+
<PackageReference Include="NUnit" Version="3.11.0" />
48+
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
3749
</ItemGroup>
3850
<ItemGroup>
3951
<ProjectReference Include="..\..\itext\itext.pdfocr.api\itext.pdfocr.api.csproj" />
52+
<PackageReference Include="itext.pdftest" Version="9.3.0" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
53+
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
54+
<PackageReference Include="itext.bouncy-castle-adapter" Version="9.3.0" Condition="!Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
55+
<ProjectReference Include="..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
4056
</ItemGroup>
4157
</Project>

0 commit comments

Comments
 (0)