diff --git a/ChangeLog b/ChangeLog index bcc09819ca48f1fb3fffff2d2958584110e15ac9..aad47b271935b748e9e1d8a232603210f06413d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,4 +17,8 @@ Feb 2 2007 - V1.03 Added ifdefs to eliminate graphics code and add embedded platform support. Incorporated several patches, including 64-bit builds, Mac builds. Minor accuracy improvements. - +May 15 2007 - V1.04 + Added dll exports for Windows. + Fixed name collisions with stl etc. + Made some preliminary changes ready for unicodeization. + Several bug fixes discovered during unicodeization. diff --git a/Makefile.am b/Makefile.am index 3c63a1d32a737214e8914ef08bd1fb79674569e8..5e5020683bdcff2e028f77d4263365a572e54920 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # TODO(luc) Add 'doc' to this list when ready SUBDIRS = ccstruct ccutil classify cutil dict display image textord viewer wordrec ccmain training tessdata -EXTRA_DIST = tessdata phototest.tif tesseract.dsp tesseract.dsw +EXTRA_DIST = tessdata phototest.tif tesseract.dsp tesseract.dsw StdAfx.cpp StdAfx.h tessdll.cpp tessdll.h tessdll.dsp tessdll.dll tessdll.lib #EXTRA_DIST = doc/html doc/@PACKAGE_NAME@_@PACKAGE_VERSION@.pdf doc/@PACKAGE_NAME@_@PACKAGE_VERSION@.ps.gz dist-hook: diff --git a/ReleaseNotes b/ReleaseNotes index f21f7afb08089224170a892a150fd77134faded0..26d8dfbc3a6b59aae72fa16614a426d448bbe332 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -1,3 +1,18 @@ +Tesseract release notes May 15, 2007 - V1.04. +Added a dll interface for windows. Thanks to Glen at Jetsoft for contributing +this. To use the dll, include tessdll.h, import tessdll.lib and put tessdll.dll +somewhere where the system can find it. +Fixed a bunch of name collisions - mostly with stl. +Made some preliminary changes for unicode compatibility. Includes a new data +file (unicharset) and renaming of the other data files to eng.* to support +different languages. +There are also several other minor bug fixes and portability improvements +for 64 bit, the latest visual studio compiler etc. Thanks to all who have +contributed these fixes. + +NOTE: This is likely to be the last English-only release! + + Tesseract release notes Feb 2, 2007 - V1.03. Added mftraining and cntraining. Using an image with a box file, tesseract generates .tr output files. cntraining runs on the .tr files to make diff --git a/ccutil/Makefile.am b/ccutil/Makefile.am index c9e90484eb882b486219cd7c86f6ab46192d230c..5fb4dc1f6230257710344563b6d82c79f575eb94 100644 --- a/ccutil/Makefile.am +++ b/ccutil/Makefile.am @@ -3,15 +3,17 @@ AM_CXXFLAGS = -DTESSDATA_PREFIX=@datadir@/ include_HEADERS = \ basedir.h bits16.h clst.h debugwin.h elst2.h elst.h errcode.h \ - fileerr.h getopt.h globaloc.h hashfn.h host.h hosthplb.h lsterr.h \ + fileerr.h tessopt.h globaloc.h hashfn.h host.h hosthplb.h lsterr.h \ mainblk.h memblk.h memryerr.h memry.h mfcpch.h ndminx.h notdll.h \ nwmain.h ocrclass.h ocrshell.h platform.h secname.h serialis.h \ stderr.h strngs.h tessclas.h tprintf.h varable.h \ - mfcpch.cpp scanutils.cpp scanutils.h unichar.h + mfcpch.cpp scanutils.cpp scanutils.h unichar.h \ + unicharmap.h unicharset.h lib_LIBRARIES = libtesseract_ccutil.a libtesseract_ccutil_a_SOURCES = \ basedir.cpp bits16.cpp clst.cpp debugwin.cpp elst.cpp \ elst2.cpp errcode.cpp globaloc.cpp hashfn.cpp mainblk.cpp \ memblk.cpp memry.cpp ocrshell.cpp serialis.cpp strngs.cpp \ - tprintf.cpp varable.cpp unichar.cpp getopt.cpp + tprintf.cpp varable.cpp unichar.cpp tessopt.cpp \ + unicharmap.cpp unicharset.cpp diff --git a/configure.ac b/configure.ac index adeb5230510c309265ef9b53a0cb0d1b3f5c9410..eeee2feaf472e6f13961f9798fc8edec470984e3 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # ---------------------------------------- AC_PREREQ(2.50) -AC_INIT(Tesseract, 1.03, theraysmith@users.sourceforge.net) +AC_INIT(Tesseract, 1.04, theraysmith@gmail.com) AC_REVISION($Id: configure.ac,v 1.4 2007/02/02 22:38:17 theraysmith Exp $) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR(ccmain/tesseractmain.cpp) @@ -17,8 +17,8 @@ AC_CANONICAL_HOST # Define date of package, etc. Could be useful in auto-generated # documentation. # TODO(luc) Generate good documentation using doxygen or equivalent -PACKAGE_YEAR=2006 -PACKAGE_DATE="06/2006" +PACKAGE_YEAR=2007 +PACKAGE_DATE="05/2007" AC_DEFINE_UNQUOTED(PACKAGE_NAME,["${PACKAGE_NAME}"],[Name of package]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION,["${PACKAGE_VERSION}"],[Version number]) diff --git a/tesseract.dsp b/tesseract.dsp index 598cb3267e56865ed014f06f634e15efc9c4f95e..0c7b90fef1399e58382d4b437d56235abb465730 100755 --- a/tesseract.dsp +++ b/tesseract.dsp @@ -39,7 +39,8 @@ RSC=rc.exe # PROP Use_MFC 2 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "bin.rel" -# PROP Intermediate_Dir "Release" +# PROP Intermediate_Dir "tess.Release" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "aspirin" /I "ccutil" /I "ccstruct" /I "classify" /I "cutil" /I "dict" /I "display" /I "image" /I "textord" /I "viewer" /I "wordrec" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "__MSW32__" /D "_AFXDLL" /Yu"mfcpch.h" /FD /c @@ -52,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 /nologo /subsystem:windows /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:windows /machine:I386 /out:"tesseract.exe" !ELSEIF "$(CFG)" == "tesseract - Win32 Debug" @@ -64,7 +65,8 @@ LINK32=link.exe # PROP Use_MFC 2 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "bin.dbg" -# PROP Intermediate_Dir "Debug" +# PROP Intermediate_Dir "tess.Debug" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "aspirin" /I "ccutil" /I "ccstruct" /I "classify" /I "cutil" /I "dict" /I "display" /I "image" /I "textord" /I "viewer" /I "wordrec" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "__MSW32__" /D "_AFXDLL" /Yu"mfcpch.h" /FD /GZ /c @@ -77,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ENDIF @@ -366,10 +368,6 @@ SOURCE=.\ccutil\errcode.cpp # End Source File # Begin Source File -SOURCE=.\ccutil\getopt.cpp -# End Source File -# Begin Source File - SOURCE=.\ccutil\globaloc.cpp # End Source File # Begin Source File @@ -407,10 +405,24 @@ SOURCE=.\ccutil\strngs.cpp # End Source File # Begin Source File +SOURCE=.\ccutil\tessopt.cpp +# End Source File +# Begin Source File + SOURCE=.\ccutil\tprintf.cpp # End Source File # Begin Source File +SOURCE=.\ccutil\unicharmap.cpp +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\ccutil\unicharset.cpp +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + SOURCE=.\ccutil\varable.cpp # End Source File # End Group @@ -1033,6 +1045,10 @@ SOURCE=.\ccmain\applybox.h # End Source File # Begin Source File +SOURCE=.\ccmain\baseapi.h +# End Source File +# Begin Source File + SOURCE=.\ccmain\blobcmp.h # End Source File # Begin Source File @@ -1077,6 +1093,10 @@ SOURCE=.\ccmain\matmatch.h # End Source File # Begin Source File +SOURCE=.\ccmain\output.h +# End Source File +# Begin Source File + SOURCE=.\ccmain\paircmp.h # End Source File # Begin Source File @@ -1097,6 +1117,14 @@ SOURCE=.\ccmain\tessedit.h # End Source File # Begin Source File +SOURCE=.\ccmain\tessembedded.h +# End Source File +# Begin Source File + +SOURCE=.\ccmain\tesseractmain.h +# End Source File +# Begin Source File + SOURCE=.\ccmain\tessvars.h # End Source File # Begin Source File @@ -1301,6 +1329,10 @@ SOURCE=.\ccutil\clst.h # End Source File # Begin Source File +SOURCE=.\cutil\cutil.h +# End Source File +# Begin Source File + SOURCE=.\ccutil\debugwin.h # End Source File # Begin Source File @@ -1321,10 +1353,6 @@ SOURCE=.\ccutil\fileerr.h # End Source File # Begin Source File -SOURCE=.\ccutil\getopt.h -# End Source File -# Begin Source File - SOURCE=.\ccutil\globaloc.h # End Source File # Begin Source File @@ -1389,6 +1417,10 @@ SOURCE=.\ccutil\platform.h # End Source File # Begin Source File +SOURCE=.\ccutil\scanutils.h +# End Source File +# Begin Source File + SOURCE=.\ccutil\secname.h # End Source File # Begin Source File @@ -1405,10 +1437,26 @@ SOURCE=.\ccutil\strngs.h # End Source File # Begin Source File +SOURCE=.\ccutil\tessopt.h +# End Source File +# Begin Source File + SOURCE=.\ccutil\tprintf.h # End Source File # Begin Source File +SOURCE=.\ccutil\unichar.h +# End Source File +# Begin Source File + +SOURCE=.\ccutil\unicharmap.h +# End Source File +# Begin Source File + +SOURCE=.\ccutil\unicharset.h +# End Source File +# Begin Source File + SOURCE=.\ccutil\varable.h # End Source File # End Group @@ -1661,6 +1709,10 @@ SOURCE=.\dict\hyphen.h # End Source File # Begin Source File +SOURCE=.\dict\matchdefs.h +# End Source File +# Begin Source File + SOURCE=.\dict\permdawg.h # End Source File # Begin Source File @@ -1709,6 +1761,14 @@ SOURCE=.\display\sbdmenu.h # End Source File # Begin Source File +SOURCE=.\display\submen.h +# End Source File +# Begin Source File + +SOURCE=.\display\tessio.h +# End Source File +# Begin Source File + SOURCE=.\display\varabled.h # End Source File # Begin Source File @@ -2020,10 +2080,6 @@ SOURCE=.\wordrec\wordclass.h # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\ccmain\tesseractmain.h -# End Source File # End Group # Begin Group "Resource Files" diff --git a/tesseract.dsw b/tesseract.dsw index d9d14eb7f791c730964bc6bec02b0b21b961963d..91fbf8b920ec0f46c8f7484c26dd031bcd82d91d 100755 --- a/tesseract.dsw +++ b/tesseract.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "cnTraining"=.\training\cnTraining.dsp - Package Owner=<4> +Project: "cnTraining"=".\training\cnTraining.dsp" - Package Owner=<4> Package=<5> {{{ @@ -15,7 +15,7 @@ Package=<4> ############################################################################### -Project: "mfTraining"=.\training\mfTraining.dsp - Package Owner=<4> +Project: "mfTraining"=".\training\mfTraining.dsp" - Package Owner=<4> Package=<5> {{{ @@ -27,7 +27,19 @@ Package=<4> ############################################################################### -Project: "tesseract"=.\tesseract.dsp - Package Owner=<4> +Project: "tessdll"=".\tessdll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "tesseract"=".\tesseract.dsp" - Package Owner=<4> Package=<5> {{{