diff --git a/configure.ac b/configure.ac index 6705ca98..5bc9ab88 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # ---------------------------------------- AC_PREREQ(2.50) -AC_INIT([tesseract], [3.03], [http://code.google.com/p/tesseract-ocr/issues/list]) +AC_INIT([tesseract], [3.04], [http://code.google.com/p/tesseract-ocr/issues/list]) CXXFLAGS=${CXXFLAGS:-""} AC_CONFIG_MACRO_DIR([m4]) AC_REVISION([$Revision$]) @@ -19,7 +19,7 @@ AC_PREFIX_DEFAULT(/usr/local) # documentation. # TODO(luc) Generate good documentation using doxygen or equivalent PACKAGE_YEAR=2014 -PACKAGE_DATE="01/14" +PACKAGE_DATE="08/13" AC_DEFINE_UNQUOTED(PACKAGE_NAME,["${PACKAGE_NAME}"],[Name of package]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION,["${PACKAGE_VERSION}"],[Version number]) @@ -35,7 +35,7 @@ GENERIC_LIBRARY_NAME=tesseract # Release versioning GENERIC_MAJOR_VERSION=3 -GENERIC_MINOR_VERSION=3 +GENERIC_MINOR_VERSION=4 GENERIC_MICRO_VERSION=0 # API version (often = GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION) diff --git a/vs2010/libtesseract/libtesseract303.rc b/vs2010/libtesseract/libtesseract.rc similarity index 87% rename from vs2010/libtesseract/libtesseract303.rc rename to vs2010/libtesseract/libtesseract.rc index 141c8d9c..a159fc41 100644 --- a/vs2010/libtesseract/libtesseract303.rc +++ b/vs2010/libtesseract/libtesseract.rc @@ -1,101 +1,101 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "windows.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,2,3,0 - PRODUCTVERSION 3,2,3,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x7L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "Tesseract OCR library" - VALUE "FileVersion", "3, 3, 0, 0" - VALUE "InternalName", "libtesseract" - VALUE "LegalCopyright", "Copyright (C) 2012 Google, Inc. Licensed under the Apache License, Version 2.0" - VALUE "OriginalFilename", "libtesseract" - VALUE "ProductName", "Tesseract OCR Library" - VALUE "ProductVersion", "3, 3, 0, 0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "windows.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 3,4,0,0 + PRODUCTVERSION 3,4,0,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x7L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Tesseract OCR library" + VALUE "FileVersion", "3, 4, 0, 0" + VALUE "InternalName", "libtesseract" + VALUE "LegalCopyright", "Copyright (C) 2014 Google, Inc. Licensed under the Apache License, Version 2.0" + VALUE "OriginalFilename", "libtesseract" + VALUE "ProductName", "Tesseract OCR Library" + VALUE "ProductVersion", "3, 4, 0, 0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/vs2010/libtesseract/libtesseract.vcxproj b/vs2010/libtesseract/libtesseract.vcxproj index 0c3749c0..48e0e451 100644 --- a/vs2010/libtesseract/libtesseract.vcxproj +++ b/vs2010/libtesseract/libtesseract.vcxproj @@ -27,7 +27,7 @@ - libtesseract303 + libtesseract304 {D14F28C7-0CAE-4C37-B174-40FDEFBD4FE0} libtesseract @@ -869,7 +869,7 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib - + diff --git a/vs2010/libtesseract/libtesseract.vcxproj.filters b/vs2010/libtesseract/libtesseract.vcxproj.filters index 42a6580b..b5a35d2c 100644 --- a/vs2010/libtesseract/libtesseract.vcxproj.filters +++ b/vs2010/libtesseract/libtesseract.vcxproj.filters @@ -1645,7 +1645,7 @@ - + Resource Files diff --git a/vs2010/libtesseract/resource.h b/vs2010/libtesseract/resource.h index a054e1ad..6824c386 100644 --- a/vs2010/libtesseract/resource.h +++ b/vs2010/libtesseract/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by libtesseract303.rc +// Used by libtesseract.rc // Next default values for new objects // diff --git a/vs2010/tesseract.sln b/vs2010/tesseract.sln index 19f7d09b..32962b91 100644 --- a/vs2010/tesseract.sln +++ b/vs2010/tesseract.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtesseract303", "libtesseract\libtesseract.vcxproj", "{D14F28C7-0CAE-4C37-B174-40FDEFBD4FE0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtesseract304", "libtesseract\libtesseract.vcxproj", "{D14F28C7-0CAE-4C37-B174-40FDEFBD4FE0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tesseract", "tesseract\tesseract.vcxproj", "{C76996CB-C4CB-4D89-9F67-F605DF129618}" EndProject diff --git a/vs2010/tesseract/tesseract.rc b/vs2010/tesseract/tesseract.rc index 85cf8695..94388811 100644 --- a/vs2010/tesseract/tesseract.rc +++ b/vs2010/tesseract/tesseract.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,3,0,0 - PRODUCTVERSION 3,3,0,0 + FILEVERSION 3,4,0,0 + PRODUCTVERSION 3,4,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Tesseract command-line OCR engine" - VALUE "FileVersion", "3,3,0,0" + VALUE "FileVersion", "3,4,0,0" VALUE "InternalName", "tesseract" - VALUE "LegalCopyright", "Copyright (C) 2013 Google, Inc. Licensed under the Apache License, Version 2.0" + VALUE "LegalCopyright", "Copyright (C) 2014 Google, Inc. Licensed under the Apache License, Version 2.0" VALUE "OriginalFilename", "tesseract.exe" VALUE "ProductName", "Tesseract-OCR" - VALUE "ProductVersion", "3.03" + VALUE "ProductVersion", "3.04" END END BLOCK "VarFileInfo"