Merge pull request #3199 from stweil/serialis

Remove serialis.h from public API

CMakeLists.txt

@@ -721,7 +721,6 @@ install(FILES
     include/tesseract/helpers.h
     include/tesseract/ocrclass.h
     include/tesseract/platform.h
-    include/tesseract/serialis.h
     include/tesseract/unichar.h
 
     #${CMAKE_CURRENT_BINARY_DIR}/src/endianness.h

Makefile.am

@@ -58,7 +58,6 @@ pkginclude_HEADERS += include/tesseract/platform.h
 pkginclude_HEADERS += include/tesseract/publictypes.h
 pkginclude_HEADERS += include/tesseract/renderer.h
 pkginclude_HEADERS += include/tesseract/resultiterator.h
-pkginclude_HEADERS += include/tesseract/serialis.h
 pkginclude_HEADERS += include/tesseract/thresholder.h
 pkginclude_HEADERS += include/tesseract/unichar.h
 
@@ -334,6 +333,7 @@ noinst_HEADERS += src/ccutil/params.h
 noinst_HEADERS += src/ccutil/qrsequence.h
 noinst_HEADERS += src/ccutil/sorthelper.h
 noinst_HEADERS += src/ccutil/scanutils.h
+noinst_HEADERS += src/ccutil/serialis.h
 noinst_HEADERS += src/ccutil/strngs.h
 noinst_HEADERS += src/ccutil/tessdatamanager.h
 noinst_HEADERS += src/ccutil/tprintf.h

include/tesseract/baseapi.h

@@ -28,7 +28,6 @@
 #include "platform.h"
 #include "publictypes.h"
 #include "resultiterator.h"
-#include "serialis.h"
 #include "thresholder.h"
 #include "unichar.h"
 
@@ -80,6 +79,10 @@ class Tesseract;
 class Trie;
 class Wordrec;
 
+// Function to read a std::vector<char> from a whole file.
+// Returns false on failure.
+using FileReader = bool (*)(const char* filename, std::vector<char>* data);
+
 using DictFunc = int (Dict::*)(void*, const UNICHARSET&, UNICHAR_ID,
                                bool) const;
 using ProbabilityInContextFunc = double (Dict::*)(const char*, const char*, int,

src/ccstruct/imagedata.cpp

@@ -29,7 +29,7 @@
 #include "tprintf.h"     // for tprintf
 
 #include <tesseract/helpers.h>     // for IntCastRounded, TRand, ClipToRange, Modulo
-#include <tesseract/serialis.h>    // for TFile
+#include "serialis.h"    // for TFile
 
 #include "allheaders.h"  // for pixDestroy, pixGetHeight, pixGetWidth, lept_...
 

src/ccstruct/matrix.h

@@ -29,7 +29,7 @@
 #include "kdpair.h"     // for KDPairInc
 #include "points.h"     // for ICOORD
 
-#include <tesseract/serialis.h>   // for TFile
+#include "serialis.h"   // for TFile
 
 #include <algorithm>    // for max, min
 #include <cmath>        // for sqrt, fabs, isfinite

src/ccstruct/points.cpp

@@ -21,7 +21,7 @@
 #include "points.h"
 
 #include <tesseract/helpers.h>
-#include <tesseract/serialis.h>
+#include "serialis.h"
 
 #include <algorithm>
 #include <cmath>                // for M_PI

src/ccutil/bitvector.cpp

@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <cstring>
 #include <tesseract/helpers.h>
-#include <tesseract/serialis.h>   // for tesseract::Serialize
+#include "serialis.h"   // for tesseract::Serialize
 
 namespace tesseract {
 

src/ccutil/clst.h

@@ -21,7 +21,7 @@
 
 #include "lsterr.h"
 
-#include <tesseract/serialis.h>
+#include "serialis.h"
 
 #include <cstdio>
 

src/ccutil/elst.h

@@ -21,7 +21,7 @@
 
 #include "lsterr.h"
 
-#include <tesseract/serialis.h>
+#include "serialis.h"
 
 #include <cstdio>
 

src/ccutil/elst2.h

@@ -22,7 +22,7 @@
 #include <cstdio>
 #include "lsterr.h"
 
-#include <tesseract/serialis.h>
+#include "serialis.h"
 
 #include <cstdio>
 

src/ccutil/genericvector.h

@@ -20,7 +20,7 @@
 #define TESSERACT_CCUTIL_GENERICVECTOR_H_
 
 #include <tesseract/helpers.h>
-#include <tesseract/serialis.h>
+#include "serialis.h"
 
 #include <algorithm>
 #include <cassert>

src/ccutil/serialis.cpp

@@ -18,7 +18,7 @@
 
 #include "errcode.h"
 #include <tesseract/helpers.h>  // for ReverseN
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include <cstdio>
 
 namespace tesseract {

src/ccutil/serialis.h

@@ -19,6 +19,7 @@
 #ifndef SERIALIS_H
 #define SERIALIS_H
 
+#include <tesseract/baseapi.h> // FileReader
 #include <cstdint>  // uint8_t
 #include <cstdio>
 #include <cstdlib>
@@ -41,9 +42,6 @@ constexpr size_t countof(T const (&)[N]) noexcept {
   return N;
 }
 
-// Function to read a std::vector<char> from a whole file.
-// Returns false on failure.
-using FileReader = bool (*)(const char* filename, std::vector<char>* data);
 // Function to write a std::vector<char> to a whole file.
 // Returns false on failure.
 using FileWriter = bool (*)(const std::vector<char>& data,

src/ccutil/strngs.cpp

@@ -21,7 +21,7 @@
 #include "errcode.h"        // for ASSERT_HOST
 
 #include <tesseract/helpers.h>        // for ReverseN
-#include <tesseract/serialis.h>       // for TFile
+#include "serialis.h"       // for TFile
 
 #include <cassert>          // for assert
 #include <cstdlib>          // for malloc, free

src/ccutil/tessdatamanager.cpp

@@ -32,7 +32,7 @@
 
 #include "errcode.h"
 #include <tesseract/helpers.h>
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include "strngs.h"
 #include <tesseract/version.h>
 #include "tprintf.h"

src/ccutil/unicharcompress.h

@@ -24,7 +24,7 @@
 
 #include <unordered_map>
 
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include "strngs.h"
 #include "unicharset.h"
 

src/ccutil/unicharset.cpp

@@ -20,7 +20,7 @@
 
 #include "params.h"
 
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include <tesseract/unichar.h>
 
 #include <algorithm>

src/ccutil/unicharset.h

@@ -24,7 +24,7 @@
 
 #include "genericvector.h"
 #include <tesseract/helpers.h>
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include "strngs.h"
 #include <tesseract/unichar.h>
 

src/classify/adaptmatch.cpp

@@ -61,7 +61,7 @@
 
 #include "genericvector.h"      // for GenericVector
 #include <tesseract/helpers.h>            // for IntCastRounded, ClipToRange
-#include <tesseract/serialis.h>           // for TFile
+#include "serialis.h"           // for TFile
 #include "strngs.h"             // for STRING
 #include <tesseract/unichar.h>            // for UNICHAR_ID, INVALID_UNICHAR_ID
 

src/classify/clusttool.h

@@ -20,7 +20,7 @@
 
 #include "cluster.h"
 
-#include <tesseract/serialis.h>
+#include "serialis.h"
 
 #include <cstdio>
 

src/classify/cutoffs.cpp

@@ -24,7 +24,7 @@
 
 #include "classify.h"
 #include <tesseract/helpers.h>
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include <tesseract/unichar.h>
 
 #define MAX_CUTOFF      1000

src/lstm/convolve.cpp

@@ -24,7 +24,7 @@
 #include "convolve.h"
 
 #include "networkscratch.h"
-#include <tesseract/serialis.h>
+#include "serialis.h"
 
 namespace tesseract {
 

src/lstm/network.h

@@ -23,7 +23,7 @@
 #include "static_shape.h"
 #include "tprintf.h"
 
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include "strngs.h"             // for STRING
 #include "genericvector.h"
 #include <tesseract/helpers.h>

src/lstm/static_shape.h

@@ -19,7 +19,7 @@
 #ifndef TESSERACT_LSTM_STATIC_SHAPE_H_
 #define TESSERACT_LSTM_STATIC_SHAPE_H_
 
-#include <tesseract/serialis.h>   // for TFile
+#include "serialis.h"   // for TFile
 #include "tprintf.h"    // for tprintf
 
 namespace tesseract {

src/training/dawg2wordlist.cpp

@@ -21,7 +21,7 @@
 #include "trie.h"
 #include "unicharset.h"
 
-#include <tesseract/serialis.h>
+#include "serialis.h"
 
 using namespace tesseract;
 

src/training/lang_model_helpers.h

@@ -17,7 +17,7 @@
 
 #include <string>
 #include "genericvector.h"
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include "strngs.h"
 #include "tessdatamanager.h"
 #include "unicharset.h"

src/training/wordlist2dawg.cpp

@@ -24,7 +24,7 @@
 #include "dawg.h"
 #include "dict.h"
 #include <tesseract/helpers.h>
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include "trie.h"
 #include "unicharset.h"
 

unittest/params_model_test.cc

@@ -14,7 +14,7 @@
 
 #include "include_gunit.h"
 #include "params_model.h"
-#include <tesseract/serialis.h>     // TFile
+#include "serialis.h"     // TFile
 #include "tprintf.h"      // tprintf
 
 namespace tesseract {

unittest/shapetable_test.cc

@@ -16,7 +16,7 @@
 
 #include "include_gunit.h"
 
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include "shapetable.h"
 #include "unicharset.h"
 

unittest/tfile_test.cc

@@ -10,7 +10,7 @@
 // limitations under the License.
 
 #include "genericvector.h"
-#include <tesseract/serialis.h>
+#include "serialis.h"
 
 #include "include_gunit.h"
 

unittest/unicharcompress_test.cc

@@ -18,7 +18,7 @@
 
 #include "include_gunit.h"
 #include "log.h"                        // for LOG
-#include <tesseract/serialis.h>
+#include "serialis.h"
 #include "tprintf.h"
 #include "unicharcompress.h"