Remove strngs.h from public API

Signed-off-by: Stefan Weil <sw@weil.de>
2024-11-27 12:49:35 +08:00 · 2020-12-27 23:51:42 +01:00 · 2020-12-27 23:51:42 +01:00 · 90af3e7b5c
commit 90af3e7b5c
parent 03884c370c
57 changed files with 56 additions and 57 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -722,7 +722,6 @@ install(FILES
    include/tesseract/ocrclass.h
    include/tesseract/platform.h
    include/tesseract/serialis.h
-    include/tesseract/strngs.h
    include/tesseract/unichar.h

    #${CMAKE_CURRENT_BINARY_DIR}/src/endianness.h
--- a/Makefile.am
+++ b/Makefile.am
@ -59,7 +59,6 @@ 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/strngs.h
 pkginclude_HEADERS += include/tesseract/thresholder.h
 pkginclude_HEADERS += include/tesseract/unichar.h

@ -335,6 +334,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/strngs.h
 noinst_HEADERS += src/ccutil/tessdatamanager.h
 noinst_HEADERS += src/ccutil/tprintf.h
 noinst_HEADERS += src/ccutil/unicharcompress.h
--- a/src/api/altorenderer.cpp
+++ b/src/api/altorenderer.cpp
@ -19,7 +19,7 @@

 #include <tesseract/baseapi.h>
 #include <tesseract/renderer.h>
-#include <tesseract/strngs.h> // for STRING
+#include "strngs.h" // for STRING

 #include <memory>
 #include <sstream>  // for std::stringstream
--- a/src/api/baseapi.cpp
+++ b/src/api/baseapi.cpp
@ -62,7 +62,7 @@
 #include <tesseract/baseapi.h>
 #include <tesseract/renderer.h>          // for TessResultRenderer
 #include <tesseract/resultiterator.h>    // for ResultIterator
-#include <tesseract/strngs.h>            // for STRING
+#include "strngs.h"            // for STRING
 #include <tesseract/thresholder.h>       // for ImageThresholder
 #include <tesseract/helpers.h>           // for IntCastRounded, chomp_string
 #include <tesseract/ocrclass.h>          // for ETEXT_DESC
--- a/src/ccmain/fixspace.cpp
+++ b/src/ccmain/fixspace.cpp
@ -36,7 +36,7 @@
 #include "werd.h"              // for WERD, W_EOL, W_FUZZY_NON, W_FUZZY_SP

 #include <tesseract/ocrclass.h>          // for ETEXT_DESC
-#include <tesseract/strngs.h>            // for STRING
+#include "strngs.h"            // for STRING
 #include <tesseract/unichar.h>           // for UNICHAR_ID

 #include <cstdint>             // for INT16_MAX, int16_t, int32_t
--- a/src/ccmain/ltrresultiterator.cpp
+++ b/src/ccmain/ltrresultiterator.cpp
@ -24,7 +24,7 @@

 #include "allheaders.h"

-#include <tesseract/strngs.h>
+#include "strngs.h"

 namespace tesseract {

--- a/src/ccmain/osdetect.cpp
+++ b/src/ccmain/osdetect.cpp
@ -32,7 +32,7 @@
 #include "tesseractclass.h"
 #include "textord.h"

-#include <tesseract/strngs.h>
+#include "strngs.h"

 #include <algorithm>
 #include <cmath>        // for std::fabs
--- a/src/ccmain/paragraphs.cpp
+++ b/src/ccmain/paragraphs.cpp
@ -40,7 +40,7 @@
 #include "ratngs.h"               // for WERD_CHOICE
 #include "rect.h"                 // for TBOX
 #include "statistc.h"             // for STATS
-#include <tesseract/strngs.h>               // for STRING
+#include "strngs.h"               // for STRING
 #include "tprintf.h"              // for tprintf
 #include <tesseract/unichar.h>              // for UNICHAR, UNICHAR_ID
 #include "unicharset.h"           // for UNICHARSET
--- a/src/ccmain/paragraphs.h
+++ b/src/ccmain/paragraphs.h
@ -21,7 +21,7 @@
 #define TESSERACT_CCMAIN_PARAGRAPHS_H_

 #include "rect.h"    // for TBOX
-#include <tesseract/strngs.h>  // for STRING
+#include "strngs.h"  // for STRING
 #include <list>

 namespace tesseract {
--- a/src/ccmain/paramsd.h
+++ b/src/ccmain/paramsd.h
@ -25,7 +25,7 @@

 #include "elst.h"        // for ELIST_ITERATOR, ELISTIZEH, ELIST_LINK
 #include "scrollview.h"  // for ScrollView (ptr only), SVEvent (ptr only)
-#include <tesseract/strngs.h>      // for STRING
+#include "strngs.h"      // for STRING

 namespace tesseract {

--- a/src/ccmain/tesseractclass.h
+++ b/src/ccmain/tesseractclass.h
@ -45,7 +45,7 @@

 #include "genericvector.h"          // for GenericVector, PointerVector
 #include <tesseract/publictypes.h>            // for OcrEngineMode, PageSegMode, OEM_L...
-#include <tesseract/strngs.h>                 // for STRING
+#include "strngs.h"                 // for STRING
 #include <tesseract/unichar.h>                // for UNICHAR_ID

 #include "allheaders.h"             // for pixDestroy, pixGetWidth, pixGetHe...
--- a/src/ccstruct/blamer.h
+++ b/src/ccstruct/blamer.h
@ -33,7 +33,7 @@

 #include "genericvector.h"            // for GenericVector
 #include <tesseract/unichar.h>                  // for UNICHAR_ID
-#include <tesseract/strngs.h>                   // for STRING
+#include "strngs.h"                   // for STRING

 #include <cstdint>                    // for int16_t
 #include <cstring>                    // for memcpy
--- a/src/ccstruct/blread.h
+++ b/src/ccstruct/blread.h
@ -20,7 +20,7 @@
 #ifndef BLREAD_H
 #define BLREAD_H

-#include <tesseract/strngs.h>     // for STRING
+#include "strngs.h"     // for STRING

 #include <cstdint>      // for int32_t

--- a/src/ccstruct/boxread.cpp
+++ b/src/ccstruct/boxread.cpp
@ -24,7 +24,7 @@
 #include "tprintf.h"        // for tprintf

 #include <tesseract/helpers.h>        // for chomp_string
-#include <tesseract/strngs.h>         // for STRING
+#include "strngs.h"         // for STRING
 #include <tesseract/unichar.h>        // for UNICHAR

 #include <cstring>          // for strchr, strcmp
--- a/src/ccstruct/boxread.h
+++ b/src/ccstruct/boxread.h
@ -19,7 +19,7 @@
 #ifndef TESSERACT_CCUTIL_BOXREAD_H_
 #define TESSERACT_CCUTIL_BOXREAD_H_

-#include <tesseract/strngs.h>  // for STRING
+#include "strngs.h"  // for STRING

 #include <cstdio>    // for FILE

--- a/src/ccstruct/imagedata.h
+++ b/src/ccstruct/imagedata.h
@ -22,7 +22,7 @@
 #include "points.h"             // for FCOORD

 #include "genericvector.h"      // for GenericVector, PointerVector, FileReader
-#include <tesseract/strngs.h>   // for STRING
+#include "strngs.h"   // for STRING

 #include <mutex>                // for std::mutex
 #include <thread>               // for std::thread
--- a/src/ccstruct/ocrpara.h
+++ b/src/ccstruct/ocrpara.h
@ -23,7 +23,7 @@
 #include "elst.h"

 #include <tesseract/publictypes.h>
-#include <tesseract/strngs.h>
+#include "strngs.h"

 namespace tesseract {

--- a/src/ccstruct/pageres.h
+++ b/src/ccstruct/pageres.h
@ -31,7 +31,7 @@
 #include "werd.h"              // for WERD, W_BOL, W_EOL

 #include "genericvector.h"     // for GenericVector, PointerVector (ptr only)
-#include <tesseract/strngs.h>            // for STRING
+#include "strngs.h"            // for STRING
 #include <tesseract/unichar.h>           // for UNICHAR_ID, INVALID_UNICHAR_ID

 #include <cstdint>             // for int32_t, int16_t
--- a/src/ccstruct/params_training_featdef.h
+++ b/src/ccstruct/params_training_featdef.h
@ -21,7 +21,7 @@
 #define TESSERACT_WORDREC_PARAMS_TRAINING_FEATDEF_H_

 #include "genericvector.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"

 namespace tesseract {

--- a/src/ccstruct/pdblock.h
+++ b/src/ccstruct/pdblock.h
@ -22,7 +22,7 @@
 #include          "clst.h"
 #include          "polyblk.h"

-#include          <tesseract/strngs.h>
+#include          "strngs.h"

 struct Pix;

--- a/src/ccstruct/rect.cpp
+++ b/src/ccstruct/rect.cpp
@ -23,7 +23,7 @@

 #include "rect.h"

-#include <tesseract/strngs.h>     // for STRING
+#include "strngs.h"     // for STRING

 namespace tesseract {

--- a/src/ccstruct/werd.h
+++ b/src/ccstruct/werd.h
@ -24,7 +24,7 @@
 #include "params.h"
 #include "stepblob.h"

-#include <tesseract/strngs.h>
+#include "strngs.h"

 namespace tesseract {

--- a/src/ccutil/ccutil.h
+++ b/src/ccutil/ccutil.h
@ -35,7 +35,7 @@
 #ifdef _WIN32
 #include "host.h" // windows.h for HANDLE, ...
 #endif
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "params.h"
 #include "unicharset.h"

--- a/src/ccutil/params.h
+++ b/src/ccutil/params.h
@ -20,7 +20,7 @@
 #define PARAMS_H

 #include "genericvector.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"

 #include <cstdio>

--- a/src/ccutil/strngs.cpp
+++ b/src/ccutil/strngs.cpp
@ -16,7 +16,7 @@
 *
 **********************************************************************/

-#include <tesseract/strngs.h>
+#include "strngs.h"

 #include "errcode.h"        // for ASSERT_HOST

--- a/include/tesseract/strngs.h
+++ b/include/tesseract/strngs.h
@ -19,7 +19,7 @@
 #ifndef STRNGS_H
 #define STRNGS_H

-#include "platform.h"  // for TESS_API
+#include <tesseract/platform.h>  // for TESS_API

 #include <cassert>  // for assert
 #include <cstdint>  // for uint32_t
--- a/src/ccutil/tessdatamanager.cpp
+++ b/src/ccutil/tessdatamanager.cpp
@ -33,7 +33,7 @@
 #include "errcode.h"
 #include <tesseract/helpers.h>
 #include <tesseract/serialis.h>
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include <tesseract/version.h>
 #include "tprintf.h"
 #include "params.h"
--- a/src/ccutil/tessdatamanager.h
+++ b/src/ccutil/tessdatamanager.h
@ -21,7 +21,7 @@

 #include <string>
 #include "genericvector.h"
-#include <tesseract/strngs.h>             // for STRING
+#include "strngs.h"             // for STRING

 static const char kTrainedDataSuffix[] = "traineddata";

--- a/src/ccutil/tprintf.cpp
+++ b/src/ccutil/tprintf.cpp
@ -25,7 +25,7 @@

 #include "params.h"

-#include <tesseract/strngs.h>
+#include "strngs.h"

 #include <cstdio>
 #include <cstdarg>
--- a/src/ccutil/unicharcompress.h
+++ b/src/ccutil/unicharcompress.h
@ -25,7 +25,7 @@
 #include <unordered_map>

 #include <tesseract/serialis.h>
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "unicharset.h"

 namespace tesseract {
--- a/src/ccutil/unicharset.h
+++ b/src/ccutil/unicharset.h
@ -25,7 +25,7 @@
 #include "genericvector.h"
 #include <tesseract/helpers.h>
 #include <tesseract/serialis.h>
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include <tesseract/unichar.h>

 #include <functional>           // for std::function
--- a/src/classify/adaptmatch.cpp
+++ b/src/classify/adaptmatch.cpp
@ -62,7 +62,7 @@
 #include "genericvector.h"      // for GenericVector
 #include <tesseract/helpers.h>            // for IntCastRounded, ClipToRange
 #include <tesseract/serialis.h>           // for TFile
-#include <tesseract/strngs.h>             // for STRING
+#include "strngs.h"             // for STRING
 #include <tesseract/unichar.h>            // for UNICHAR_ID, INVALID_UNICHAR_ID

 #include <algorithm>            // for max, min
--- a/src/classify/blobclass.h
+++ b/src/classify/blobclass.h
@ -21,7 +21,7 @@
 /**----------------------------------------------------------------------------
          Include Files and Type Defines
 ----------------------------------------------------------------------------**/
-#include <tesseract/strngs.h>
+#include "strngs.h"

 /**----------------------------------------------------------------------------
          Public Function Prototypes
--- a/src/classify/ocrfeatures.cpp
+++ b/src/classify/ocrfeatures.cpp
@ -20,7 +20,7 @@
 #include "emalloc.h"
 #include "scanutils.h"

-#include <tesseract/strngs.h>             // for STRING
+#include "strngs.h"             // for STRING

 #include <cassert>
 #include <cmath>
--- a/src/classify/shapetable.cpp
+++ b/src/classify/shapetable.cpp
@ -25,7 +25,7 @@
 #include "bitvector.h"
 #include "fontinfo.h"
 #include "intfeaturespace.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "unicharset.h"
 #include "unicity_table.h"

--- a/src/dict/dawg.cpp
+++ b/src/dict/dawg.cpp
@ -24,7 +24,7 @@

 #include "dict.h"
 #include <tesseract/helpers.h>
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "tprintf.h"

 #include <memory>
--- a/src/dict/dawg_cache.cpp
+++ b/src/dict/dawg_cache.cpp
@ -20,7 +20,7 @@

 #include "dawg.h"
 #include "object_cache.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "tessdatamanager.h"

 namespace tesseract {
--- a/src/dict/dawg_cache.h
+++ b/src/dict/dawg_cache.h
@ -22,7 +22,7 @@

 #include "dawg.h"
 #include "object_cache.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "tessdatamanager.h"

 namespace tesseract {
--- a/src/lstm/lstmrecognizer.h
+++ b/src/lstm/lstmrecognizer.h
@ -27,7 +27,7 @@
 #include "params.h"
 #include "recodebeam.h"
 #include "series.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "unicharcompress.h"

 class BLOB_CHOICE_IT;
--- a/src/lstm/network.h
+++ b/src/lstm/network.h
@ -24,7 +24,7 @@
 #include "tprintf.h"

 #include <tesseract/serialis.h>
-#include <tesseract/strngs.h>             // for STRING
+#include "strngs.h"             // for STRING
 #include "genericvector.h"
 #include <tesseract/helpers.h>

--- a/src/textord/alignedblob.h
+++ b/src/textord/alignedblob.h
@ -25,7 +25,7 @@
 #include "blobbox.h"
 #include "tabvector.h"

-#include <tesseract/strngs.h>
+#include "strngs.h"

 namespace tesseract {

--- a/src/textord/baselinedetect.h
+++ b/src/textord/baselinedetect.h
@ -25,7 +25,7 @@
 #include "rect.h"

 #include "genericvector.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"

 struct Pix;

--- a/src/training/classifier_tester.cpp
+++ b/src/training/classifier_tester.cpp
@ -25,7 +25,7 @@
 #include "commontraining.h"
 #include "mastertrainer.h"
 #include "params.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "tessclassifier.h"
 #include "tesseractclass.h"

--- a/src/training/fileio.h
+++ b/src/training/fileio.h
@ -22,7 +22,7 @@

 #include "genericvector.h"      // for GenericVector
 #include <tesseract/platform.h>
-#include <tesseract/strngs.h>             // for STRING
+#include "strngs.h"             // for STRING

 namespace tesseract {

--- a/src/training/lang_model_helpers.h
+++ b/src/training/lang_model_helpers.h
@ -18,7 +18,7 @@
 #include <string>
 #include "genericvector.h"
 #include <tesseract/serialis.h>
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "tessdatamanager.h"
 #include "unicharset.h"

--- a/src/training/lstmeval.cpp
+++ b/src/training/lstmeval.cpp
@ -21,7 +21,7 @@
 #include "commontraining.h"
 #include "genericvector.h"
 #include "lstmtester.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "tprintf.h"

 using namespace tesseract;
--- a/src/training/lstmtester.h
+++ b/src/training/lstmtester.h
@ -21,7 +21,7 @@
 #include <mutex>
 #include "genericvector.h"
 #include "lstmtrainer.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"

 namespace tesseract {

--- a/src/training/lstmtraining.cpp
+++ b/src/training/lstmtraining.cpp
@ -24,7 +24,7 @@
 #include "lstmtester.h"
 #include "lstmtrainer.h"
 #include "params.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "tprintf.h"
 #include "unicharset_training_utils.h"

--- a/src/training/shapeclustering.cpp
+++ b/src/training/shapeclustering.cpp
@ -26,7 +26,7 @@
 #include "commontraining.h"
 #include "mastertrainer.h"
 #include "params.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"

 using namespace tesseract;

--- a/src/training/unicharset_extractor.cpp
+++ b/src/training/unicharset_extractor.cpp
@ -27,7 +27,7 @@
 #include "genericvector.h"
 #include "lang_model_helpers.h"
 #include "normstrngs.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include "unicharset.h"
 #include "unicharset_training_utils.h"

--- a/src/viewer/svmnode.h
+++ b/src/viewer/svmnode.h
@ -27,7 +27,7 @@
 #ifndef TESSERACT_VIEWER_SVMNODE_H_
 #define TESSERACT_VIEWER_SVMNODE_H_

-#include <tesseract/strngs.h>
+#include "strngs.h"

 namespace tesseract {

--- a/src/wordrec/language_model.h
+++ b/src/wordrec/language_model.h
@ -31,7 +31,7 @@
 #include "ratngs.h"          // for BLOB_CHOICE (ptr only), BLOB_CHOICE_LIST...
 #include "stopper.h"         // for DANGERR

-#include <tesseract/strngs.h>          // for STRING
+#include "strngs.h"          // for STRING

 #include <cmath>             // for exp

--- a/src/wordrec/lm_state.h
+++ b/src/wordrec/lm_state.h
@ -27,7 +27,7 @@
 #include "lm_consistency.h"  // for LMConsistencyInfo
 #include "ratngs.h"          // for BLOB_CHOICE, PermuterType
 #include "stopper.h"         // for DANGERR
-#include <tesseract/strngs.h>          // for STRING
+#include "strngs.h"          // for STRING
 #include <tesseract/unichar.h>         // for UNICHAR_ID
 #include "unicharset.h"      // for UNICHARSET

--- a/src/wordrec/params_model.h
+++ b/src/wordrec/params_model.h
@ -21,7 +21,7 @@

 #include "genericvector.h"              // for GenericVector
 #include "params_training_featdef.h"    // for PTRAIN_NUM_FEATURE_TYPES
-#include <tesseract/strngs.h>                     // for STRING
+#include "strngs.h"                     // for STRING

 namespace tesseract {

--- a/src/wordrec/segsearch.cpp
+++ b/src/wordrec/segsearch.cpp
@ -26,7 +26,7 @@
 #include "pageres.h"         // for WERD_RES
 #include "params.h"          // for BoolParam, IntParam, DoubleParam
 #include "ratngs.h"          // for BLOB_CHOICE_LIST, BLOB_CHOICE_IT
-#include <tesseract/strngs.h>          // for STRING
+#include "strngs.h"          // for STRING
 #include "tprintf.h"         // for tprintf
 #include "wordrec.h"         // for Wordrec, SegSearchPending (ptr only)

--- a/unittest/normstrngs_test.cc
+++ b/unittest/normstrngs_test.cc
@ -13,7 +13,7 @@
 #include "include_gunit.h"
 #include "normstrngs.h"
 #include "normstrngs_test.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"
 #include <tesseract/unichar.h>
 #ifdef INCLUDE_TENSORFLOW
 #include "util/utf8/unilib.h"           // for UniLib
--- a/unittest/stringrenderer_test.cc
+++ b/unittest/stringrenderer_test.cc
@ -21,7 +21,7 @@
 #include "genericvector.h"
 #include "include_gunit.h"
 #include "stringrenderer.h"
-#include <tesseract/strngs.h>
+#include "strngs.h"

 BOOL_PARAM_FLAG(display, false, "Display image for inspection");