mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-01-18 22:43:45 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

tessdatamanager: Use PACKAGE_VERSION instead of TESSERACT_VERSION_STR (#1407)

Browse Source 
This allows further simplifications for the version handling.

Move the implementation for the constructors from .h file to .cpp file
to reduce dependencies.

Remove unneeded include statements from the .h file to reduce more
dependencies.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2018-03-22 07:43:35 +01:00 committed by zdenop
parent 8c258750de
commit 1694be9223
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ccutil/tessdatamanager.cpp
View File

@ -21,6 +21,10 @@
#pragma warning(disable:4244) // Conversion warnings
#endif
#ifdef HAVE_CONFIG_H
#include "config_auto.h"
#endif
#include "tessdatamanager.h"
#include <stdio.h>
@ -33,6 +37,17 @@
namespace tesseract {
TessdataManager::TessdataManager() : reader_(nullptr), is_loaded_(false), swap_(false) {
SetVersionString(PACKAGE_VERSION);
}
TessdataManager::TessdataManager(FileReader reader)
: reader_(reader),
is_loaded_(false),
swap_(false) {
SetVersionString(PACKAGE_VERSION);
}
// Lazily loads from the the given filename. Won't actually read the file
// until it needs it.
void TessdataManager::LoadFileLater(const char *data_file_name) {

17
ccutil/tessdatamanager.h
View File

@ -20,12 +20,7 @@
#ifndef TESSERACT_CCUTIL_TESSDATAMANAGER_H_
#define TESSERACT_CCUTIL_TESSDATAMANAGER_H_
#include <stdio.h>
#include "host.h"
#include "strngs.h"
#include "tprintf.h"
#include "version.h"
#include "genericvector.h"
static const char kTrainedDataSuffix[] = "traineddata";
@ -130,13 +125,9 @@ static const int kMaxNumTessdataEntries = 1000;
class TessdataManager {
public:
TessdataManager() : reader_(nullptr), is_loaded_(false), swap_(false) {
SetVersionString(TESSERACT_VERSION_STR);
}
explicit TessdataManager(FileReader reader)
: reader_(reader), is_loaded_(false), swap_(false) {
SetVersionString(TESSERACT_VERSION_STR);
}
TessdataManager();
explicit TessdataManager(FileReader reader);
~TessdataManager() {}
bool swap() const { return swap_; }