put info about (API) version; fix typo

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1117 d0cd1f9f-072b-0410-8dd7-cf729c803f20
This commit is contained in:
zdenop 2014-06-22 18:31:42 +00:00
parent 41bd040ef5
commit 905e6162b9
9 changed files with 10 additions and 74 deletions

View File

@ -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)

View File

@ -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

View File

@ -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);

View File

@ -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");

View File

@ -2410,10 +2410,6 @@
RelativePath="..\..\ccstruct\vecfuncs.h"
>
</File>
<File
RelativePath="..\port\version.h"
>
</File>
<File
RelativePath="..\..\ccstruct\werd.h"
>

View File

@ -1,25 +0,0 @@
///////////////////////////////////////////////////////////////////////
// File: version.h
// Description: define version identifier for Windows
// Author: zdenop@gmail.com
// Created: Fri Nov 19 21:05:06 CET 2010
//
// (C) Copyright 2010, Google Inc.
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
///////////////////////////////////////////////////////////////////////
#ifndef VS2008_PORT_VERSION_H_
#define VS2008_PORT_VERSION_H_
#define VERSION "3.03"
#endif // VS2008_PORT_VERSION_H_

View File

@ -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" />

View File

@ -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>

View File

@ -1,25 +0,0 @@
///////////////////////////////////////////////////////////////////////
// File: version.h
// Description: define version identifier for Windows
// Author: zdenop@gmail.com
// Created: Fri Nov 19 21:05:06 CET 2010
//
// (C) Copyright 2010, Google Inc.
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
///////////////////////////////////////////////////////////////////////
#ifndef VS2008_PORT_VERSION_H_
#define VS2008_PORT_VERSION_H_
#define VERSION "3.03"
#endif // VS2008_PORT_VERSION_H_