mirror of
https://github.com/tesseract-ocr/tesseract.git
synced 2024-12-11 23:19:04 +08:00
Merge pull request #3203 from stweil/std-vector
Replace more GenericVector by std::vector and clean include statements
This commit is contained in:
commit
3b83b061e6
@ -18,12 +18,11 @@
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config_auto.h"
|
||||
#endif
|
||||
|
||||
#include "serialis.h" // Serialize
|
||||
#include <cstring>
|
||||
#include <memory> // std::unique_ptr
|
||||
#include <string> // std::string
|
||||
#include <tesseract/baseapi.h>
|
||||
#include "genericvector.h"
|
||||
#include <tesseract/renderer.h>
|
||||
|
||||
namespace tesseract {
|
||||
|
@ -1006,7 +1006,7 @@ void Tesseract::AssignDiacriticsToOverlappingBlobs(
|
||||
PAGE_RES_IT* pr_it, GenericVector<bool>* word_wanted,
|
||||
GenericVector<bool>* overlapped_any_blob,
|
||||
GenericVector<C_BLOB*>* target_blobs) {
|
||||
GenericVector<bool> blob_wanted;
|
||||
std::vector<bool> blob_wanted;
|
||||
word_wanted->resize(outlines.size(), false);
|
||||
overlapped_any_blob->resize(outlines.size(), false);
|
||||
target_blobs->resize(outlines.size(), nullptr);
|
||||
@ -1058,7 +1058,7 @@ void Tesseract::AssignDiacriticsToNewBlobs(
|
||||
const GenericVector<C_OUTLINE*>& outlines, int pass, WERD* real_word,
|
||||
PAGE_RES_IT* pr_it, GenericVector<bool>* word_wanted,
|
||||
GenericVector<C_BLOB*>* target_blobs) {
|
||||
GenericVector<bool> blob_wanted;
|
||||
std::vector<bool> blob_wanted;
|
||||
word_wanted->resize(outlines.size(), false);
|
||||
target_blobs->resize(outlines.size(), nullptr);
|
||||
// Check for outlines that need to be turned into stand-alone blobs.
|
||||
@ -1133,7 +1133,7 @@ void Tesseract::AssignDiacriticsToNewBlobs(
|
||||
bool Tesseract::SelectGoodDiacriticOutlines(
|
||||
int pass, float certainty_threshold, PAGE_RES_IT* pr_it, C_BLOB* blob,
|
||||
const GenericVector<C_OUTLINE*>& outlines, int num_outlines,
|
||||
GenericVector<bool>* ok_outlines) {
|
||||
std::vector<bool>* ok_outlines) {
|
||||
STRING best_str;
|
||||
float target_cert = certainty_threshold;
|
||||
if (blob != nullptr) {
|
||||
@ -1146,10 +1146,10 @@ bool Tesseract::SelectGoodDiacriticOutlines(
|
||||
}
|
||||
target_cert -= (target_cert - certainty_threshold) * noise_cert_factor;
|
||||
}
|
||||
GenericVector<bool> test_outlines = *ok_outlines;
|
||||
std::vector<bool> test_outlines = *ok_outlines;
|
||||
// Start with all the outlines in.
|
||||
STRING all_str;
|
||||
GenericVector<bool> best_outlines = *ok_outlines;
|
||||
std::vector<bool> best_outlines = *ok_outlines;
|
||||
float best_cert = ClassifyBlobPlusOutlines(test_outlines, outlines, pass,
|
||||
pr_it, blob, &all_str);
|
||||
if (debug_noise_removal) {
|
||||
@ -1217,7 +1217,7 @@ bool Tesseract::SelectGoodDiacriticOutlines(
|
||||
// Classifies the given blob plus the outlines flagged by ok_outlines, undoes
|
||||
// the inclusion of the outlines, and returns the certainty of the raw choice.
|
||||
float Tesseract::ClassifyBlobPlusOutlines(
|
||||
const GenericVector<bool>& ok_outlines,
|
||||
const std::vector<bool>& ok_outlines,
|
||||
const GenericVector<C_OUTLINE*>& outlines, int pass_n, PAGE_RES_IT* pr_it,
|
||||
C_BLOB* blob, STRING* best_str) {
|
||||
C_OUTLINE_IT ol_it;
|
||||
|
@ -428,10 +428,10 @@ class Tesseract : public Wordrec {
|
||||
PAGE_RES_IT* pr_it, C_BLOB* blob,
|
||||
const GenericVector<C_OUTLINE*>& outlines,
|
||||
int num_outlines,
|
||||
GenericVector<bool>* ok_outlines);
|
||||
std::vector<bool>* ok_outlines);
|
||||
// Classifies the given blob plus the outlines flagged by ok_outlines, undoes
|
||||
// the inclusion of the outlines, and returns the certainty of the raw choice.
|
||||
float ClassifyBlobPlusOutlines(const GenericVector<bool>& ok_outlines,
|
||||
float ClassifyBlobPlusOutlines(const std::vector<bool>& ok_outlines,
|
||||
const GenericVector<C_OUTLINE*>& outlines,
|
||||
int pass_n, PAGE_RES_IT* pr_it, C_BLOB* blob,
|
||||
STRING* best_str);
|
||||
|
@ -19,8 +19,8 @@
|
||||
#ifndef TESSERACT_CCUTIL_GENERICVECTOR_H_
|
||||
#define TESSERACT_CCUTIL_GENERICVECTOR_H_
|
||||
|
||||
#include <tesseract/helpers.h>
|
||||
#include "serialis.h"
|
||||
#include <tesseract/helpers.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
@ -21,8 +21,6 @@
|
||||
#include "host.h" // tesseract/platform.h, windows.h for MAX_PATH
|
||||
#include "tprintf.h"
|
||||
|
||||
#include "genericvector.h"
|
||||
|
||||
#include <climits> // for INT_MIN, INT_MAX
|
||||
#include <cmath> // for NAN, std::isnan
|
||||
#include <cstdio>
|
||||
|
@ -16,10 +16,9 @@
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <tesseract/unichar.h>
|
||||
#include "errcode.h"
|
||||
#include "genericvector.h"
|
||||
#include "tprintf.h"
|
||||
#include <tesseract/unichar.h>
|
||||
|
||||
#define UNI_MAX_LEGAL_UTF32 0x0010FFFF
|
||||
|
||||
|
@ -60,9 +60,9 @@
|
||||
#include "unicity_table.h" // for UnicityTable
|
||||
|
||||
#include "genericvector.h" // for GenericVector
|
||||
#include <tesseract/helpers.h> // for IntCastRounded, ClipToRange
|
||||
#include "serialis.h" // for TFile
|
||||
#include "strngs.h" // for STRING
|
||||
#include <tesseract/helpers.h> // for IntCastRounded, ClipToRange
|
||||
#include <tesseract/unichar.h> // for UNICHAR_ID, INVALID_UNICHAR_ID
|
||||
|
||||
#include <algorithm> // for max, min
|
||||
|
@ -36,7 +36,6 @@
|
||||
#include "shapetable.h"
|
||||
#include "svmnode.h"
|
||||
|
||||
#include "genericvector.h"
|
||||
#include <tesseract/helpers.h>
|
||||
|
||||
#include <algorithm>
|
||||
|
@ -2,7 +2,6 @@
|
||||
** Filename: intproto.h
|
||||
** Purpose: Definition of data structures for integer protos.
|
||||
** Author: Dan Johnson
|
||||
** History: Thu Feb 7 12:58:45 1991, DSJ, Created.
|
||||
**
|
||||
** (c) Copyright Hewlett-Packard Company, 1988.
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@ -28,8 +27,6 @@
|
||||
#include "scrollview.h"
|
||||
#include "unicharset.h"
|
||||
|
||||
#include "genericvector.h"
|
||||
|
||||
namespace tesseract {
|
||||
|
||||
class FCOORD;
|
||||
|
@ -20,7 +20,6 @@
|
||||
#ifndef TESSERACT_LSTM_CONVOLVE_H_
|
||||
#define TESSERACT_LSTM_CONVOLVE_H_
|
||||
|
||||
#include "genericvector.h"
|
||||
#include "matrix.h"
|
||||
#include "network.h"
|
||||
|
||||
|
@ -20,12 +20,10 @@
|
||||
|
||||
#include "matrix.h"
|
||||
#include "networkio.h"
|
||||
#include "static_shape.h"
|
||||
#include "tprintf.h"
|
||||
|
||||
#include "serialis.h"
|
||||
#include "static_shape.h"
|
||||
#include "strngs.h" // for STRING
|
||||
#include "genericvector.h"
|
||||
#include "tprintf.h"
|
||||
#include <tesseract/helpers.h>
|
||||
|
||||
#include <cstdio>
|
||||
|
@ -19,7 +19,6 @@
|
||||
#ifndef TESSERACT_LSTM_RECONFIG_H_
|
||||
#define TESSERACT_LSTM_RECONFIG_H_
|
||||
|
||||
#include "genericvector.h"
|
||||
#include "matrix.h"
|
||||
#include "network.h"
|
||||
|
||||
|
@ -21,17 +21,16 @@
|
||||
|
||||
#include "boxchar.h"
|
||||
|
||||
#include <cstddef>
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
|
||||
#include "fileio.h"
|
||||
#include "genericvector.h"
|
||||
#include "normstrngs.h"
|
||||
#include "tprintf.h"
|
||||
#include "unicharset.h"
|
||||
#include "unicode/uchar.h" // from libicu
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <vector>
|
||||
|
||||
// Absolute Ratio of dx:dy or dy:dx to be a newline.
|
||||
const int kMinNewlineRatio = 5;
|
||||
|
||||
|
@ -15,12 +15,11 @@
|
||||
#ifndef TESSERACT_TRAINING_LANG_MODEL_HELPERS_H_
|
||||
#define TESSERACT_TRAINING_LANG_MODEL_HELPERS_H_
|
||||
|
||||
#include <string>
|
||||
#include "genericvector.h"
|
||||
#include "serialis.h"
|
||||
#include "strngs.h"
|
||||
#include "tessdatamanager.h"
|
||||
#include "unicharset.h"
|
||||
#include <string>
|
||||
|
||||
namespace tesseract {
|
||||
|
||||
|
@ -18,10 +18,10 @@
|
||||
#ifndef TESSERACT_TRAINING_LSTMTESTER_H_
|
||||
#define TESSERACT_TRAINING_LSTMTESTER_H_
|
||||
|
||||
#include <mutex>
|
||||
#include "genericvector.h"
|
||||
#include "lstmtrainer.h"
|
||||
#include "strngs.h"
|
||||
#include <mutex>
|
||||
#include <vector>
|
||||
|
||||
namespace tesseract {
|
||||
|
||||
|
@ -36,7 +36,6 @@
|
||||
#include "commontraining.h"
|
||||
#include "featdefs.h"
|
||||
#include "fontinfo.h"
|
||||
#include "genericvector.h"
|
||||
#include "indexmapbidi.h"
|
||||
#include "intproto.h"
|
||||
#include "mastertrainer.h"
|
||||
|
@ -20,16 +20,15 @@
|
||||
// normalizes the text according to command-line options and generates
|
||||
// a unicharset.
|
||||
|
||||
#include <cstdlib>
|
||||
#include "boxread.h"
|
||||
#include "commandlineflags.h"
|
||||
#include "commontraining.h" // CheckSharedLibraryVersion
|
||||
#include "genericvector.h"
|
||||
#include "lang_model_helpers.h"
|
||||
#include "normstrngs.h"
|
||||
#include "strngs.h"
|
||||
#include "unicharset.h"
|
||||
#include "unicharset_training_utils.h"
|
||||
#include <cstdlib>
|
||||
|
||||
using namespace tesseract;
|
||||
|
||||
|
@ -23,13 +23,12 @@
|
||||
#include "associate.h" // for AssociateStats
|
||||
#include "dawg.h" // for DawgPositionVector
|
||||
#include "elst.h" // for ELIST_ITERATOR, ELISTIZEH, ELIST_LINK
|
||||
#include "genericvector.h" // for PointerVector
|
||||
#include "lm_consistency.h" // for LMConsistencyInfo
|
||||
#include "ratngs.h" // for BLOB_CHOICE, PermuterType
|
||||
#include "stopper.h" // for DANGERR
|
||||
#include "strngs.h" // for STRING
|
||||
#include <tesseract/unichar.h> // for UNICHAR_ID
|
||||
#include "unicharset.h" // for UNICHARSET
|
||||
#include <tesseract/unichar.h> // for UNICHAR_ID
|
||||
|
||||
namespace tesseract {
|
||||
|
||||
|
@ -15,7 +15,6 @@
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "matrix.h"
|
||||
#include "genericvector.h"
|
||||
#include "include_gunit.h"
|
||||
|
||||
namespace tesseract {
|
||||
|
@ -9,7 +9,6 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "genericvector.h"
|
||||
#include "kdpair.h"
|
||||
|
||||
#include "include_gunit.h"
|
||||
|
Loading…
Reference in New Issue
Block a user