Merge branch 'release/v3.03'

.gitignore

@@ -12,6 +12,7 @@
 [Rr]elease/
 x64/
 build/
+dist/
 [Bb]in/
 [Oo]bj/
 

README.md

@@ -1,11 +1,13 @@
-tesseract-vs2012
+tesseract-vs2013
 ================
 
-Tesseract OCR engine and dependencies with VS 2012 support, both 64 and 32 bit.
+Tesseract OCR engine dependencies with VS 2013 support, both 64 and 32 bit.
 
-This repository contains the from Google's [Tesseract OCR project](https://code.google.com/p/tesseract-ocr/) for tesseract 3.02 and leptonica 1.68, along with dependencies for everything but GIF support.
+This repository contains the dependencies for Google's [Tesseract OCR project](https://code.google.com/p/tesseract-ocr/) for tesseract 3.03 and leptonica 1.70, along with dependencies for everything but WEBP support.
 
-What is not included is the VS 2008 build system.
+### Build Instructions
 
+1. Open VS 2013 Developer Command Prompt and change the directory to this repository.
+2. Execute the following command ``msbuild build.proj``
 
-Currently only liblept168.dll, libtesseract302.dll and tesseract.exe are built. You'll need to use the original distribution for training purposes.
+The build libraries and headers will be copied to ``~\release`` when done.

build.proj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<SourceDir>$(MSBuildProjectDirectory)</SourceDir>
+		<BuildDir>$(MSBuildProjectDirectory)\build</BuildDir>
+		<ReleaseDir>$(MSBuildProjectDirectory)\release</ReleaseDir>
+		<ZLibDir>$(MSBuildProjectDirectory)\zlib</ZLibDir>
+		<LibJpegDir>$(MSBuildProjectDirectory)\libjpeg</LibJpegDir>
+		<LibPngDir>$(MSBuildProjectDirectory)\libpng</LibPngDir>
+		<LibGifDir>$(MSBuildProjectDirectory)\giflib</LibGifDir>
+		<LibTiffDir>$(MSBuildProjectDirectory)\libtiff\libtiff</LibTiffDir>	
+		<LibLeptDir>$(MSBuildProjectDirectory)\liblept</LibLeptDir>
+	</PropertyGroup>
+	<ItemGroup>
+		<Template Include="$(SourceDir)\AssemblyVersionInfo.template.cs" />
+
+		<Flavor Include="$(SourceDir)\Tesseract.sln">
+			<Configuration>DLL_Debug</Configuration>
+			<Platform>Win32</Platform>
+		</Flavor>
+		<Flavor Include="$(SourceDir)\Tesseract.sln">
+			<Configuration>DLL_Release</Configuration>
+			<Platform>Win32</Platform>
+		</Flavor>
+		<Flavor Include="$(SourceDir)\Tesseract.sln">
+			<Configuration>DLL_Debug</Configuration>
+			<Platform>x64</Platform>
+		</Flavor>
+		<Flavor Include="$(SourceDir)\Tesseract.sln">
+			<Configuration>DLL_Release</Configuration>
+			<Platform>x64</Platform>
+		</Flavor>
+
+
+		<Flavor Include="$(SourceDir)\Tesseract.sln">
+			<Configuration>LIB_Debug</Configuration>
+			<Platform>Win32</Platform>
+		</Flavor>
+		<Flavor Include="$(SourceDir)\Tesseract.sln">
+			<Configuration>LIB_Release</Configuration>
+			<Platform>Win32</Platform>
+		</Flavor>
+		<Flavor Include="$(SourceDir)\Tesseract.sln">
+			<Configuration>LIB_Debug</Configuration>
+			<Platform>x64</Platform>
+		</Flavor>
+		<Flavor Include="$(SourceDir)\Tesseract.sln">
+			<Configuration>LIB_Release</Configuration>
+			<Platform>x64</Platform>
+		</Flavor>
+
+		<Header Include="$(ZLibDir)\include\zconf.h" />
+		<Header Include="$(ZLibDir)\include\zlib.h" />
+
+		<Header Include="$(LibPngDir)\include\png.h" />
+		<Header Include="$(LibPngDir)\include\pngconf.h" />
+
+		<Header Include="$(LibJpegDir)\include\jconfig.h" />
+		<Header Include="$(LibJpegDir)\include\jerror.h" />
+		<Header Include="$(LibJpegDir)\include\jmorecfg.h" />
+		<Header Include="$(LibJpegDir)\include\jpeglib.h" />
+
+		<Header Include="$(LibTiffDir)\include\tif_config.h" />
+		<Header Include="$(LibTiffDir)\include\tiff.h" />
+		<Header Include="$(LibTiffDir)\include\tiffconf.h" />
+		<Header Include="$(LibTiffDir)\include\tiffio.h" />
+		<Header Include="$(LibTiffDir)\include\tiffvers.h" />
+
+		<Header Include="$(LibGifDir)\include\gif_lib.h" />
+
+		<LeptHeader Include="$(LibLeptDir)\include\*.h" />
+	</ItemGroup>
+	<Target Name="ExpandFlavors">
+		<CreateItem Include="@(Flavor)" AdditionalMetadata="Properties=Configuration=%(Flavor.Configuration)%3BPlatform=%(Flavor.Platform)">
+			<Output TaskParameter="Include" ItemName="ProjectToBuild" />
+		</CreateItem>
+	</Target>
+	<Target Name="Clean" DependsOnTargets="ExpandFlavors">
+		<MSBuild Projects="@(ProjectToBuild)" Targets="Clean" />
+		<RemoveDir Directories="$(BuildDir)" />
+	</Target>
+	<Target Name="Build" DependsOnTargets="ExpandFlavors">
+		<MSBuild Projects="@(ProjectToBuild)" Targets="Build" />
+		<ItemGroup>
+			<LibFile Include="$(BuildDir)\lib\**\*.dll;
+							  $(BuildDir)\lib\**\*.lib;"/>
+		</ItemGroup>
+	</Target>
+	<Target Name="Package" DependsOnTargets="Build">
+		<RemoveDir Directories='$(ReleaseDir)'/>
+		<MakeDir Directories='$(ReleaseDir)'/>		
+		<Copy SourceFiles="@(Header)" DestinationFolder="$(ReleaseDir)\include" />
+		<Copy SourceFiles="@(LeptHeader)" DestinationFolder="$(ReleaseDir)\include\leptonica" />	
+		<Copy SourceFiles="@(LibFile)" DestinationFolder="$(ReleaseDir)\lib\%(RecursiveDir)" />
+	</Target>
+
+</Project>

giflib/AUTHORS

@@ -0,0 +1,39 @@
+Lennie Araki
+	Windows code providing a nicer interface and example program
+
+Michael Brown <michael_brown_uk[AT]hotmail.com>
+        callbacks to write data via user defined function
+
+Daniel Eisenbud <eisenbud[AT]google.com>
+	Fixes for crashes with invalid gif files and double freeing of
+	colormaps
+
+Gershon Elber
+	original giflib code
+
+Marc Ewing <marc[AT]redhat.com>
+        spec file (for rpms) updates
+
+Toshio Kuratomi <toshio[AT]tiki-lounge.com>
+        uncompressed gif writing code
+        autoconf/automake process
+        current maintainer
+
+marek <marwaw[AT]users.sourceforge.net>
+	Gif initialization fix
+	windows build code
+
+Peter Mehlitz <peter[AT]transvirtual.com>
+        callbacks to read data from arbitrary sources (like libjpeg/libpng)
+
+Dick Porter <dick[AT]cymru.net>
+        int/pointer fixes for Alpha
+
+Eric Raymond <esr[AT]snark.thyrsus.com>
+        long time former maintainer of giflib code
+
+Petter Reinholdtsen <pere[AT]hungry.com>
+	Tru64 build fixs
+
+Georg Schwarz <geos[AT]epost.de>
+	IRIX fixes

giflib/BUGS

@@ -0,0 +1,2 @@
+Please report BUGS to the bug tracker on sourceforge:
+http://sourceforge.net/tracker/?group_id=102202

giflib/COPYING

@@ -0,0 +1,19 @@
+The GIFLIB distribution is Copyright (c) 1997  Eric S. Raymond
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.