From 77c44cdecd5540c8f568c6647c4be6b27bf3012c Mon Sep 17 00:00:00 2001
From: Ray Smith <rays@google.com>
Date: Wed, 2 Aug 2017 14:53:07 -0700
Subject: [PATCH] Added convert to int and directory listing to
 combine_tessdata

---
 lstm/lstmrecognizer.h         |  8 ++++++++
 lstm/lstmtrainer.h            |  8 --------
 training/combine_tessdata.cpp | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/lstm/lstmrecognizer.h b/lstm/lstmrecognizer.h
index 844e7ac0a4..d46ba49c0f 100644
--- a/lstm/lstmrecognizer.h
+++ b/lstm/lstmrecognizer.h
@@ -127,6 +127,14 @@ class LSTMRecognizer {
     series->ScaleLayerLearningRate(&id[1], factor);
   }
 
+  // Converts the network to int if not already.
+  void ConvertToInt() {
+    if ((training_flags_ & TF_INT_MODE) == 0) {
+      network_->ConvertToInt();
+      training_flags_ |= TF_INT_MODE;
+    }
+  }
+
   // Provides access to the UNICHARSET that this classifier works with.
   const UNICHARSET& GetUnicharset() const { return ccutil_.unicharset; }
   // Provides access to the UnicharCompress that this classifier works with.
diff --git a/lstm/lstmtrainer.h b/lstm/lstmtrainer.h
index 3e6ec1daf7..b7a5ec771a 100644
--- a/lstm/lstmtrainer.h
+++ b/lstm/lstmtrainer.h
@@ -251,14 +251,6 @@ class LSTMTrainer : public LSTMRecognizer {
                            const UnicharCompress* recoder, bool simple_text,
                            int null_char, GenericVector<int>* labels);
 
-  // Converts the network to int if not already.
-  void ConvertToInt() {
-    if ((training_flags_ & TF_INT_MODE) == 0) {
-      network_->ConvertToInt();
-      training_flags_ |= TF_INT_MODE;
-    }
-  }
-
   // Performs forward-backward on the given trainingdata.
   // Returns the sample that was used or NULL if the next sample was deemed
   // unusable. samples_trainer could be this or an alternative trainer that
diff --git a/training/combine_tessdata.cpp b/training/combine_tessdata.cpp
index ce3e37a8c3..765678f9ab 100644
--- a/training/combine_tessdata.cpp
+++ b/training/combine_tessdata.cpp
@@ -18,6 +18,7 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#include "lstmrecognizer.h"
 #include "tessdatamanager.h"
 
 // Main program to combine/extract/overwrite tessdata components
@@ -122,6 +123,31 @@ int main(int argc, char **argv) {
 
     // Write the updated traineddata file.
     tm.OverwriteComponents(new_traineddata_filename, argv+3, argc-3);
+  } else if (argc == 3 && strcmp(argv[1], "-c") == 0) {
+    tm.Init(argv[2]);
+    tesseract::TFile fp;
+    if (!tm.GetComponent(tesseract::TESSDATA_LSTM, &fp)) {
+      tprintf("No LSTM Component found in %s!\n", argv[2]);
+      exit(1);
+    }
+    tesseract::LSTMRecognizer recognizer;
+    if (!recognizer.DeSerialize(&tm, &fp)) {
+      tprintf("Failed to deserialize LSTM in %s!\n", argv[2]);
+      exit(1);
+    }
+    recognizer.ConvertToInt();
+    GenericVector<char> lstm_data;
+    fp.OpenWrite(&lstm_data);
+    ASSERT_HOST(recognizer.Serialize(&tm, &fp));
+    tm.OverwriteEntry(tesseract::TESSDATA_LSTM, &lstm_data[0],
+                      lstm_data.size());
+    if (!tm.SaveFile(argv[2], nullptr)) {
+      tprintf("Failed to write modified traineddata:%s!\n", argv[2]);
+      exit(1);
+    }
+  } else if (argc == 3 && strcmp(argv[1], "-d") == 0) {
+    // Initialize TessdataManager with the data in the given traineddata file.
+    tm.Init(argv[2]);
   } else {
     printf("Usage for combining tessdata components:\n"
            "  %s language_data_path_prefix\n"
@@ -137,6 +163,14 @@ int main(int argc, char **argv) {
     printf("Usage for unpacking all tessdata components:\n"
            "  %s -u traineddata_file output_path_prefix\n"
            "  (e.g. %s -u eng.traineddata tmp/eng.)\n", argv[0], argv[0]);
+    printf(
+        "Usage for listing directory of components:\n"
+        "  %s -d traineddata_file\n",
+        argv[0]);
+    printf(
+        "Usage for compacting LSTM component to int:\n"
+        "  %s -c traineddata_file\n",
+        argv[0]);
     return 1;
   }
   tm.Directory();