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

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2021-03-16 19:31:09 +01:00
parent 666ea8d560
commit 487f5fad11
2 changed files with 3 additions and 3 deletions

View File

@ -238,7 +238,7 @@ public:
int CharNormClassifier(TBLOB *blob, const TrainingSample &sample, ADAPT_RESULTS *adapt_results);
// As CharNormClassifier, but operates on a TrainingSample and outputs to
// a GenericVector of ShapeRating without conversion to classes.
// a vector of ShapeRating without conversion to classes.
int CharNormTrainingSample(bool pruner_only, int keep_this, const TrainingSample &sample,
std::vector<UnicharRating> *results);
UNICHAR_ID *GetAmbiguities(TBLOB *Blob, CLASS_ID CorrectClass);
@ -481,7 +481,7 @@ private:
Dict dict_;
GenericVector<uint16_t> shapetable_cutoffs_;
std::vector<uint16_t> shapetable_cutoffs_;
/* variables used to hold performance statistics */
int NumAdaptationsFailed = 0;

View File

@ -42,7 +42,7 @@ void Classify::ReadNewCutoffs(TFile *fp, uint16_t *Cutoffs) {
int Cutoff;
if (shape_table_ != nullptr) {
if (!shapetable_cutoffs_.DeSerialize(fp)) {
if (!fp->DeSerialize(shapetable_cutoffs_)) {
tprintf("Error during read of shapetable pffmtable!\n");
}
}