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

Replace more GenericVector by std::vector for src/classify

Browse Source 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2021-03-16 21:24:37 +01:00
parent 6fcbea3533
commit 0f632e1dda
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/classify/shapetable.cpp
View File

@ -64,8 +64,8 @@ int UnicharRating::FirstResultWithUnichar(const GenericVector<UnicharRating> &re
bool UnicharAndFonts::Serialize(FILE *fp) const {
return tesseract::Serialize(fp, &unichar_id) && tesseract::Serialize(fp, font_ids);
}
// Reads from the given file. Returns false in case of error.
// Reads from the given file. Returns false in case of error.
bool UnicharAndFonts::DeSerialize(TFile *fp) {
return fp->DeSerialize(&unichar_id) && fp->DeSerialize(font_ids);
}
@ -77,10 +77,14 @@ int UnicharAndFonts::SortByUnicharId(const void *v1, const void *v2) {
return p1->unichar_id - p2->unichar_id;
}
bool UnicharAndFonts::StdSortByUnicharId(const UnicharAndFonts &v1, const UnicharAndFonts &v2) {
return v1.unichar_id < v2.unichar_id;
}
// Writes to the given file. Returns false in case of error.
bool Shape::Serialize(FILE *fp) const {
uint8_t sorted = unichars_sorted_;
return tesseract::Serialize(fp, &sorted) && unichars_.SerializeClasses(fp);
return tesseract::Serialize(fp, &sorted) && tesseract::Serialize(fp, unichars_);
}
// Reads from the given file. Returns false in case of error.
@ -89,7 +93,7 @@ bool Shape::DeSerialize(TFile *fp) {
if (!fp->DeSerialize(&sorted))
return false;
unichars_sorted_ = sorted != 0;
return unichars_.DeSerializeClasses(fp);
return fp->DeSerialize(unichars_);
}
// Adds a font_id for the given unichar_id. If the unichar_id is not
@ -223,7 +227,7 @@ bool Shape::IsEqualUnichars(Shape *other) {
// Sorts the unichars_ vector by unichar.
void Shape::SortUnichars() {
unichars_.sort(UnicharAndFonts::SortByUnicharId);
std::sort(unichars_.begin(), unichars_.end(), UnicharAndFonts::StdSortByUnicharId);
unichars_sorted_ = true;
}

3
src/classify/shapetable.h
View File

@ -139,6 +139,7 @@ struct UnicharAndFonts {
// Sort function to sort a pair of UnicharAndFonts by unichar_id.
static int SortByUnicharId(const void *v1, const void *v2);
static bool StdSortByUnicharId(const UnicharAndFonts &v1, const UnicharAndFonts &v2);
std::vector<int32_t> font_ids;
int32_t unichar_id;
@ -216,7 +217,7 @@ private:
int destination_index_ = 0;
// Array of unichars, each with a set of fonts. Each unichar has at most
// one entry in the vector.
GenericVector<UnicharAndFonts> unichars_;
std::vector<UnicharAndFonts> unichars_;
};
// ShapeTable is a class to encapsulate the triple indirection that is