diff --git a/src/ccutil/ambigs.cpp b/src/ccutil/ambigs.cpp index 34d68968..5aafedb1 100644 --- a/src/ccutil/ambigs.cpp +++ b/src/ccutil/ambigs.cpp @@ -39,12 +39,9 @@ static const char kIllegalUnicharMsg[] = "Illegal unichar %s in ambiguity specif // UNICHAR_LEN * (MAX_AMBIG_SIZE + 1) for each part of the ambig const int kMaxAmbigStringSize = UNICHAR_LEN * (MAX_AMBIG_SIZE + 1); -AmbigSpec::AmbigSpec() { +AmbigSpec::AmbigSpec() : correct_ngram_id(INVALID_UNICHAR_ID), type(NOT_AMBIG), wrong_ngram_size(0) { wrong_ngram[0] = INVALID_UNICHAR_ID; correct_fragments[0] = INVALID_UNICHAR_ID; - correct_ngram_id = INVALID_UNICHAR_ID; - type = NOT_AMBIG; - wrong_ngram_size = 0; } // Initializes the ambigs by adding a nullptr pointer to each table. diff --git a/src/classify/adaptive.cpp b/src/classify/adaptive.cpp index 3139cce9..1b7bf5fb 100644 --- a/src/classify/adaptive.cpp +++ b/src/classify/adaptive.cpp @@ -59,13 +59,12 @@ PERM_CONFIG_STRUCT::~PERM_CONFIG_STRUCT() { delete[] Ambigs; } -ADAPT_CLASS_STRUCT::ADAPT_CLASS_STRUCT() { - NumPermConfigs = 0; - MaxNumTimesSeen = 0; - TempProtos = NIL_LIST; - - PermProtos = NewBitVector(MAX_NUM_PROTOS); - PermConfigs = NewBitVector(MAX_NUM_CONFIGS); +ADAPT_CLASS_STRUCT::ADAPT_CLASS_STRUCT() : + NumPermConfigs(0), + MaxNumTimesSeen(0), + PermProtos(NewBitVector(MAX_NUM_PROTOS)), + PermConfigs(NewBitVector(MAX_NUM_CONFIGS)), + TempProtos(NIL_LIST) { zero_all_bits(PermProtos, WordsInVectorOfSize(MAX_NUM_PROTOS)); zero_all_bits(PermConfigs, WordsInVectorOfSize(MAX_NUM_CONFIGS)); @@ -124,16 +123,13 @@ int Classify::GetFontinfoId(ADAPT_CLASS_STRUCT *Class, uint8_t ConfigId) { /// /// @param MaxProtoId max id of any proto in new config /// @param FontinfoId font information from pre-trained templates -TEMP_CONFIG_STRUCT::TEMP_CONFIG_STRUCT(int maxProtoId, int fontinfoId) { - int NumProtos = maxProtoId + 1; - - Protos = NewBitVector(NumProtos); - - NumTimesSeen = 1; - MaxProtoId = maxProtoId; - ProtoVectorSize = WordsInVectorOfSize(NumProtos); +TEMP_CONFIG_STRUCT::TEMP_CONFIG_STRUCT(int maxProtoId, int fontinfoId) : + NumTimesSeen(1), + ProtoVectorSize(WordsInVectorOfSize(maxProtoId + 1)), + MaxProtoId(maxProtoId), + Protos(NewBitVector(maxProtoId + 1)), + FontinfoId(fontinfoId) { zero_all_bits(Protos, ProtoVectorSize); - FontinfoId = fontinfoId; } TEMP_CONFIG_STRUCT::~TEMP_CONFIG_STRUCT() { diff --git a/src/tesseract.cpp b/src/tesseract.cpp index 1ed7fcf3..ac42d2ec 100644 --- a/src/tesseract.cpp +++ b/src/tesseract.cpp @@ -78,8 +78,8 @@ static void Win32WarningHandler(const char *module, const char *fmt, va_list ap) class AutoWin32ConsoleOutputCP { public: - explicit AutoWin32ConsoleOutputCP(UINT codeCP) { - oldCP_ = GetConsoleOutputCP(); + explicit AutoWin32ConsoleOutputCP(UINT codeCP) : + oldCP_(GetConsoleOutputCP()) { SetConsoleOutputCP(codeCP); } ~AutoWin32ConsoleOutputCP() { diff --git a/src/textord/devanagari_processing.cpp b/src/textord/devanagari_processing.cpp index bad6edb5..13da1374 100644 --- a/src/textord/devanagari_processing.cpp +++ b/src/textord/devanagari_processing.cpp @@ -38,15 +38,16 @@ INT_VAR(devanagari_split_debuglevel, 0, "Debug level for split shiro-rekha proce BOOL_VAR(devanagari_split_debugimage, 0, "Whether to create a debug image for split shiro-rekha process."); -ShiroRekhaSplitter::ShiroRekhaSplitter() { - orig_pix_ = nullptr; - segmentation_block_list_ = nullptr; - splitted_image_ = nullptr; - global_xheight_ = kUnspecifiedXheight; - perform_close_ = false; - debug_image_ = nullptr; - pageseg_split_strategy_ = NO_SPLIT; - ocr_split_strategy_ = NO_SPLIT; +ShiroRekhaSplitter::ShiroRekhaSplitter() : + orig_pix_(nullptr), + splitted_image_(nullptr), + pageseg_split_strategy_(NO_SPLIT), + ocr_split_strategy_(NO_SPLIT), + debug_image_(nullptr), + segmentation_block_list_(nullptr), + global_xheight_(kUnspecifiedXheight), + perform_close_(false) +{ } ShiroRekhaSplitter::~ShiroRekhaSplitter() { diff --git a/src/textord/tabfind.cpp b/src/textord/tabfind.cpp index f6ba2b84..fb6d99ae 100644 --- a/src/textord/tabfind.cpp +++ b/src/textord/tabfind.cpp @@ -67,8 +67,8 @@ TabFind::TabFind(int gridsize, const ICOORD &bleft, const ICOORD &tright, TabVec : AlignedBlob(gridsize, bleft, tright) , resolution_(resolution) , image_origin_(0, tright.y() - 1) - , v_it_(&vectors_) { - width_cb_ = nullptr; + , v_it_(&vectors_) + , width_cb_(nullptr) { v_it_.add_list_after(vlines); SetVerticalSkewAndParallelize(vertical_x, vertical_y); using namespace std::placeholders; // for _1 diff --git a/src/wordrec/wordrec.cpp b/src/wordrec/wordrec.cpp index ceaad044..be659068 100644 --- a/src/wordrec/wordrec.cpp +++ b/src/wordrec/wordrec.cpp @@ -99,10 +99,10 @@ Wordrec::Wordrec() "Save alternative paths found during chopping" " and segmentation search", params()) - , pass2_ok_split(0.0f) { - prev_word_best_choice_ = nullptr; - language_model_ = std::make_unique(&get_fontinfo_table(), &(getDict())); - fill_lattice_ = nullptr; + , language_model_(std::make_unique(&get_fontinfo_table(), &(getDict()))) + , pass2_ok_split(0.0f) + , prev_word_best_choice_(nullptr) + , fill_lattice_(nullptr) { } } // namespace tesseract diff --git a/unittest/mastertrainer_test.cc b/unittest/mastertrainer_test.cc index b6dcc5bb..30f4bf4e 100644 --- a/unittest/mastertrainer_test.cc +++ b/unittest/mastertrainer_test.cc @@ -156,9 +156,9 @@ protected: return file::JoinPath(FLAGS_test_tmpdir, name); } - MasterTrainerTest() { - shape_table_ = nullptr; - master_trainer_ = nullptr; + MasterTrainerTest() : + shape_table_(nullptr), + master_trainer_(nullptr) { } ~MasterTrainerTest() override { delete shape_table_;