Merge pull request tesseract-ocr#2673 from noahmetzger/LSTMChoiceRIL

Fixed minor bug in ChoiceIterator when lstm_choice_mode isn't active.
jiapei100 · Sep 24, 2019 · b5c1fcc · b5c1fcc
2 parents cb0c024 + ff4c1d2
commit b5c1fcc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/ccmain/ltrresultiterator.cpp b/src/ccmain/ltrresultiterator.cpp
@@ -378,6 +378,7 @@ ChoiceIterator::ChoiceIterator(const LTRResultIterator& result_it) {
   word_res_ = result_it.it_->word();
   oemLSTM_ = word_res_->tesseract->AnyLSTMLang();
   oemLegacy_ = word_res_->tesseract->AnyTessLang();
+  lstm_choice_mode_ = word_res_->tesseract->lstm_choice_mode;
   rating_coefficient_ = word_res_->tesseract->lstm_rating_coefficient;
   blanks_before_word_ = result_it.BlanksBeforeWord();
   BLOB_CHOICE_LIST* choices = nullptr; 
@@ -393,7 +394,7 @@ ChoiceIterator::ChoiceIterator(const LTRResultIterator& result_it) {
       filterSpaces();
     }
   }
-  if (oemLegacy_ && word_res_->ratings != nullptr)
+  if ((oemLegacy_ || !lstm_choice_mode_) && word_res_->ratings != nullptr)
     choices = word_res_->GetBlobChoices(result_it.blob_index_);
   if (choices != nullptr && !choices->empty()) {
     choice_it_ = new BLOB_CHOICE_IT(choices);

diff --git a/src/ccmain/ltrresultiterator.h b/src/ccmain/ltrresultiterator.h
@@ -237,6 +237,8 @@ class ChoiceIterator {
   bool oemLSTM_;
   // true when there is legacy engine related trained data
   bool oemLegacy_;
+  // true when lstm_choice_mode is activated
+  bool lstm_choice_mode_;
   // regulates the rating granularity
   double rating_coefficient_;
   // leading blanks