returns the correct dictionary if lstm only used

tesseract-ocr · Sep 14, 2017 · 2a77d5a · 2a77d5a
1 parent d962d34
commit 2a77d5a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/ccmain/tesseractclass.cpp b/ccmain/tesseractclass.cpp
@@ -634,6 +634,19 @@ Tesseract::~Tesseract() {
 #endif
 }
 
+Dict& Tesseract::getDict()
+{
+    if (0 == Classify::getDict().NumDawgs() && AnyLSTMLang())
+    {
+        if (lstm_recognizer_ && lstm_recognizer_->GetDict())
+        {
+            return *const_cast<Dict*>(lstm_recognizer_->GetDict());
+        }
+    }
+    return Classify::getDict();
+  }
+
+
 void Tesseract::Clear() {
   STRING debug_name = imagebasename + "_debug.pdf";
   pixa_debug_.WritePDF(debug_name.string());

diff --git a/ccmain/tesseractclass.h b/ccmain/tesseractclass.h
@@ -166,6 +166,9 @@ class Tesseract : public Wordrec {
   Tesseract();
   ~Tesseract();
 
+  // Return appropriate dictionary 
+  Dict& getDict() override;
+
   // Clear as much used memory as possible without resetting the adaptive
   // classifier or losing any other classifier data.
   void Clear();

diff --git a/classify/classify.h b/classify/classify.h
@@ -62,7 +62,7 @@ class Classify : public CCStruct {
  public:
   Classify();
   virtual ~Classify();
-  Dict& getDict() {
+  virtual Dict& getDict() {
     return dict_;
   }