mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-01-19 23:19:07 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

RAII: TessBaseAPI::GetIterator()

Browse Source 
Co-authored-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Raf Schietekat 2017-05-14 09:45:09 +02:00 committed by Stefan Weil
parent d71413f4aa
commit 6bbfef7c85
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/baseapi.cpp
View File

@ -1336,7 +1336,7 @@ char *TessBaseAPI::GetUTF8Text() {
return nullptr;
}
std::string text("");
ResultIterator *it = GetIterator();
const std::unique_ptr</*non-const*/ ResultIterator> it(GetIterator());
do {
if (it->Empty(RIL_PARA)) {
continue;
@ -1346,7 +1346,6 @@ char *TessBaseAPI::GetUTF8Text() {
} while (it->Next(RIL_PARA));
char *result = new char[text.length() + 1];
strncpy(result, text.c_str(), text.length() + 1);
delete it;
return result;
}
@ -1450,7 +1449,7 @@ char *TessBaseAPI::GetTSVText(int page_number) {
tsv_str += "\t" + std::to_string(rect_height_);
tsv_str += "\t-1\t\n";
ResultIterator *res_it = GetIterator();
const std::unique_ptr</*non-const*/ ResultIterator> res_it(GetIterator());
while (!res_it->Empty(RIL_BLOCK)) {
if (res_it->Empty(RIL_WORD)) {
res_it->Next(RIL_WORD);
@ -1468,7 +1467,7 @@ char *TessBaseAPI::GetTSVText(int page_number) {
tsv_str += "\t" + std::to_string(par_num);
tsv_str += "\t" + std::to_string(line_num);
tsv_str += "\t" + std::to_string(word_num);
AddBoxToTSV(res_it, RIL_BLOCK, tsv_str);
AddBoxToTSV(res_it.get(), RIL_BLOCK, tsv_str);
tsv_str += "\t-1\t\n"; // end of row for block
}
if (res_it->IsAtBeginningOf(RIL_PARA)) {
@ -1480,7 +1479,7 @@ char *TessBaseAPI::GetTSVText(int page_number) {
tsv_str += "\t" + std::to_string(par_num);
tsv_str += "\t" + std::to_string(line_num);
tsv_str += "\t" + std::to_string(word_num);
AddBoxToTSV(res_it, RIL_PARA, tsv_str);
AddBoxToTSV(res_it.get(), RIL_PARA, tsv_str);
tsv_str += "\t-1\t\n"; // end of row for para
}
if (res_it->IsAtBeginningOf(RIL_TEXTLINE)) {
@ -1491,7 +1490,7 @@ char *TessBaseAPI::GetTSVText(int page_number) {
tsv_str += "\t" + std::to_string(par_num);
tsv_str += "\t" + std::to_string(line_num);
tsv_str += "\t" + std::to_string(word_num);
AddBoxToTSV(res_it, RIL_TEXTLINE, tsv_str);
AddBoxToTSV(res_it.get(), RIL_TEXTLINE, tsv_str);
tsv_str += "\t-1\t\n"; // end of row for line
}
@ -1532,7 +1531,6 @@ char *TessBaseAPI::GetTSVText(int page_number) {
char *ret = new char[tsv_str.length() + 1];
strcpy(ret, tsv_str.c_str());
delete res_it;
return ret;
}

3
src/api/pdfrenderer.cpp
View File

@ -351,7 +351,7 @@ char *TessPDFRenderer::GetPDFTextObjects(TessBaseAPI *api, double width, double
int line_x2 = 0;
int line_y2 = 0;
ResultIterator *res_it = api->GetIterator();
const std::unique_ptr</*non-const*/ ResultIterator> res_it(api->GetIterator());
while (!res_it->Empty(RIL_BLOCK)) {
if (res_it->IsAtBeginningOf(RIL_BLOCK)) {
pdf_str << "BT\n3 Tr"; // Begin text object, use invisible ink
@ -477,7 +477,6 @@ char *TessPDFRenderer::GetPDFTextObjects(TessBaseAPI *api, double width, double
const std::string &text = pdf_str.str();
char *result = new char[text.length() + 1];
strcpy(result, text.c_str());
delete res_it;
return result;
}