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

Replace GenericVector by std::vector for struct BlamerBundle

Browse Source 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2021-02-23 20:34:41 +01:00
parent 0b8e937655
commit 3e5b2760ab
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ccstruct/blamer.cpp
View File

@ -134,8 +134,8 @@ void BlamerBundle::FillDebugString(const STRING &msg,
const WERD_CHOICE *choice,
STRING *debug) {
(*debug) += "Truth ";
for (int i = 0; i < this->truth_text_.size(); ++i) {
(*debug) += this->truth_text_[i];
for (auto& text : this->truth_text_) {
(*debug) += text;
}
if (!this->truth_has_char_boxes_) (*debug) += " (no char boxes)";
if (choice != nullptr) {

15
src/ccstruct/blamer.h
View File

@ -31,12 +31,12 @@
#include "rect.h" // for TBOX
#include "tprintf.h" // for tprintf
#include "genericvector.h" // for GenericVector
#include <tesseract/unichar.h> // for UNICHAR_ID
#include <tesseract/unichar.h> // for UNICHAR_ID
#include "strngs.h" // for STRING
#include <cstdint> // for int16_t
#include <cstring> // for memcpy
#include <vector> // for std::vector
namespace tesseract {
@ -119,8 +119,9 @@ struct BlamerBundle {
// Accessors.
STRING TruthString() const {
STRING truth_str;
for (int i = 0; i < truth_text_.size(); ++i)
truth_str += truth_text_[i];
for (auto& text : truth_text_) {
truth_str += text;
}
return truth_str;
}
IncorrectResultReason incorrect_result_reason() const {
@ -326,7 +327,7 @@ struct BlamerBundle {
// (filled in by WERD_RES::SetupForRecognition()).
tesseract::BoxWord norm_truth_word_;
// Contains ground truth unichar for each of the bounding boxes in truth_word.
GenericVector<STRING> truth_text_;
std::vector<STRING> truth_text_;
// The reason for incorrect OCR result.
IncorrectResultReason incorrect_result_reason_;
// Debug text associated with the blame.
@ -335,8 +336,8 @@ struct BlamerBundle {
STRING misadaption_debug_;
// Vectors populated by SegSearch to indicate column and row indices that
// correspond to blobs with correct bounding boxes.
GenericVector<int> correct_segmentation_cols_;
GenericVector<int> correct_segmentation_rows_;
std::vector<int> correct_segmentation_cols_;
std::vector<int> correct_segmentation_rows_;
// Best rating for correctly segmented path
// (set and used by SegSearch when looking for blame).
float best_correctly_segmented_rating_;