mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-27 12:49:35 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Improve CCUtil::main_setup (fixes issue #4230)

Browse Source 
Conda installations patch TESSDATA_PREFIX in the binary.
That does not work for std::string because the length
won't be patched, so use a normal C string which can be
patched.

Simplify also the code which checks the last character
of datadir.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2024-05-12 09:39:07 +02:00 committed by GitHub
parent 6648d5bcac
commit 6a31e36e0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ccutil/ccutil.cpp
View File

@ -46,7 +46,7 @@ CCUtil::~CCUtil() = default;
void CCUtil::main_setup(const std::string &argv0, const std::string &basename) { void CCUtil::main_setup(const std::string &argv0, const std::string &basename) {
imagebasename = basename; /**< name of image */ imagebasename = basename; /**< name of image */
char *tessdata_prefix = getenv("TESSDATA_PREFIX"); const char *tessdata_prefix = getenv("TESSDATA_PREFIX");
if (!argv0.empty()) { if (!argv0.empty()) {
/* Use tessdata prefix from the command line. */ /* Use tessdata prefix from the command line. */
@ -77,17 +77,20 @@ void CCUtil::main_setup(const std::string &argv0, const std::string &basename) {
if (datadir.empty()) { if (datadir.empty()) {
#if defined(TESSDATA_PREFIX) #if defined(TESSDATA_PREFIX)
// Use tessdata prefix which was compiled in. // Use tessdata prefix which was compiled in.
datadir = TESSDATA_PREFIX "/tessdata"; // Note that some software (for example conda) patches TESSDATA_PREFIX
// in the binary, so it should not be used directly with a std::string.
tessdata_prefix = TESSDATA_PREFIX;
datadir = tessdata_prefix;
datadir += "/tessdata/";
#else #else
datadir = "./"; datadir = "./";
#endif /* TESSDATA_PREFIX */ #endif /* TESSDATA_PREFIX */
} }
// check for missing directory separator // check for missing directory separator
const char *lastchar = datadir.c_str(); const char lastchar = datadir.back();
lastchar += datadir.length() - 1; if (lastchar != '/' && lastchar != '\\') {
if ((strcmp(lastchar, "/") != 0) && (strcmp(lastchar, "\\") != 0)) { datadir += '/';
datadir += "/";
} }
} }