put info about (API) version; fix typo

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1117 d0cd1f9f-072b-0410-8dd7-cf729c803f20
tesseract-ocr · Jun 22, 2014 · 905e616 · 905e616
1 parent 41bd040
commit 905e616
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 74 deletions.
diff --git a/api/baseapi.cpp b/api/baseapi.cpp
@@ -48,10 +48,6 @@
 #include <iterator>
 #include <fstream>
 
-#if !defined(VERSION)
-#include "version.h"
-#endif
-
 #include "allheaders.h"
 
 #include "baseapi.h"
@@ -142,7 +138,7 @@ TessBaseAPI::~TessBaseAPI() {
  * Returns the version identifier as a static string. Do not delete.
  */
 const char* TessBaseAPI::Version() {
-  return VERSION;
+  return TESSERACT_VERSION_STR;
 }
 
 /**
@@ -1948,7 +1944,7 @@ void TessBaseAPI::SetFillLatticeFunc(FillLatticeFunc f) {
 /** Common code for setting the image. */
 bool TessBaseAPI::InternalSetImage() {
   if (tesseract_ == NULL) {
-    tprintf("Please call Init before attempting to send an image.");
+    tprintf("Please call Init before attempting to set an image.");
     return false;
   }
   if (thresholder_ == NULL)

diff --git a/api/baseapi.h b/api/baseapi.h
@@ -20,6 +20,11 @@
 #ifndef TESSERACT_API_BASEAPI_H__
 #define TESSERACT_API_BASEAPI_H__
 
+#define TESSERACT_VERSION_STR "3.03.00"
+#define TESSERACT_VERSION 0x030300
+#define MAKE_VERSION(major, minor, patch) (((major) << 16) | ((minor) << 8) | \
+                                            (patch))
+
 #include <stdio.h>
 // To avoid collision with other typenames include the ABSOLUTE MINIMUM
 // complexity of includes here. Use forward declarations wherever possible

diff --git a/api/pdfrenderer.cpp b/api/pdfrenderer.cpp
@@ -10,10 +10,6 @@
 #include "cube_utils.h"
 #include "allheaders.h"
 
-#if !defined(VERSION)
-#include "version.h"
-#endif
-
 #ifdef _MSC_VER
 #include "mathfix.h"
 #endif
@@ -731,7 +727,7 @@ bool TessPDFRenderer::EndDocumentHandler() {
            "  /CreationDate (D:%s)\n"
            "  /Title (%s)"
            ">>\n"
-           "endobj\n", obj_, VERSION, datestr, title());
+           "endobj\n", obj_, TESSERACT_VERSION_STR, datestr, title());
   lept_free(datestr);
   AppendPDFObject(buf);
 

diff --git a/api/renderer.cpp b/api/renderer.cpp
@@ -8,10 +8,6 @@
 #include "genericvector.h"
 #include "renderer.h"
 
-#if !defined(VERSION)
-#include "version.h"
-#endif
-
 namespace tesseract {
 
 /**********************************************************************
@@ -140,7 +136,8 @@ bool TessHOcrRenderer::BeginDocumentHandler() {
       "</title>\n"
       "<meta http-equiv=\"Content-Type\" content=\"text/html;"
       "charset=utf-8\" />\n"
-      "  <meta name='ocr-system' content='tesseract " VERSION "' />\n"
+      "  <meta name='ocr-system' content='tesseract " TESSERACT_VERSION_STR
+              "' />\n"
       "  <meta name='ocr-capabilities' content='ocr_page ocr_carea ocr_par"
       " ocr_line ocrx_word'/>\n"
       "</head>\n<body>\n");

diff --git a/vs2008/libtesseract/libtesseract.vcproj b/vs2008/libtesseract/libtesseract.vcproj
@@ -2410,10 +2410,6 @@
 				RelativePath="..\..\ccstruct\vecfuncs.h"
 				>
 			</File>
-			<File
-				RelativePath="..\port\version.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ccstruct\werd.h"
 				>

diff --git a/vs2008/port/version.h b/vs2008/port/version.h
diff --git a/vs2010/libtesseract/libtesseract.vcxproj b/vs2010/libtesseract/libtesseract.vcxproj
@@ -843,7 +843,6 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib
     <ClInclude Include="..\..\ccutil\unicity_table.h" />
     <ClInclude Include="..\..\ccutil\unicodes.h" />
     <ClInclude Include="..\..\ccstruct\vecfuncs.h" />
-    <ClInclude Include="..\port\version.h" />
     <ClInclude Include="..\..\ccstruct\werd.h" />
     <ClInclude Include="..\..\ccmain\werdit.h" />
     <ClInclude Include="..\..\cube\word_altlist.h" />

diff --git a/vs2010/libtesseract/libtesseract.vcxproj.filters b/vs2010/libtesseract/libtesseract.vcxproj.filters
@@ -1605,9 +1605,6 @@
     <ClInclude Include="..\..\ccstruct\vecfuncs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\port\version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ccstruct\werd.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/vs2010/port/version.h b/vs2010/port/version.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -2410,10 +2410,6 @@ @@
     				RelativePath="..\..\ccstruct\vecfuncs.h"
     				>
     			</File>
-    			<File
-    				RelativePath="..\port\version.h"
-    				>
-    			</File>
     			<File
     				RelativePath="..\..\ccstruct\werd.h"
     				>
@@ Expand Down @@