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

Move implementation of tesseract::split from header to cpp file

Browse Source 
This fixes duplicate symbols for some builds.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2021-03-13 23:39:52 +01:00
parent 3b0759940c
commit 36f9131e04
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ccutil/strngs.cpp
View File

@ -33,6 +33,23 @@ namespace tesseract {
// possible length of an int (in 64 bits), being -<20 digits>. // possible length of an int (in 64 bits), being -<20 digits>.
const int kMaxIntSize = 22; const int kMaxIntSize = 22;
const std::vector<std::string> split(const std::string &s, char c) {
std::string buff;
std::vector<std::string> v;
for (auto n : s) {
if (n != c)
buff += n;
else if (n == c && !buff.empty()) {
v.push_back(buff);
buff.clear();
}
}
if (!buff.empty()) {
v.push_back(buff);
}
return v;
}
// TODO(rays) Change all callers to use TFile and remove the old functions. // TODO(rays) Change all callers to use TFile and remove the old functions.
// Writes to the given file. Returns false in case of error. // Writes to the given file. Returns false in case of error.
bool STRING::Serialize(FILE *fp) const { bool STRING::Serialize(FILE *fp) const {

17
src/ccutil/strngs.h
View File

@ -32,22 +32,7 @@ namespace tesseract {
class TFile; class TFile;
const std::vector<std::string> split(const std::string &s, char c) { const std::vector<std::string> split(const std::string &s, char c);
std::string buff;
std::vector<std::string> v;
for (auto n : s) {
if (n != c)
buff += n;
else if (n == c && !buff.empty()) {
v.push_back(buff);
buff.clear();
}
}
if (!buff.empty()) {
v.push_back(buff);
}
return v;
}
class STRING : public std::string { class STRING : public std::string {
public: public: