Reorder includes.

karama300 · Dec 25, 2020 · a905e8c · a905e8c
1 parent 688bb8d
commit a905e8c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/include/tesseract/baseapi.h b/include/tesseract/baseapi.h
@@ -19,18 +19,10 @@
 #ifndef TESSERACT_API_BASEAPI_H_
 #define TESSERACT_API_BASEAPI_H_
 
-#include <cstdio>
-#include <functional>  // for std::function
-
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h" // DISABLED_LEGACY_ENGINE
 #endif
 
-// To avoid collision with other typenames include the ABSOLUTE MINIMUM
-// complexity of includes here. Use forward declarations wherever possible
-// and hide includes of complex types in baseapi.cpp.
-#include <tesseract/version.h>
-
 #include "apitypes.h"
 #include "pageiterator.h"
 #include "platform.h"
@@ -40,6 +32,14 @@
 #include "thresholder.h"
 #include "unichar.h"
 
+// To avoid collision with other typenames include the ABSOLUTE MINIMUM
+// complexity of includes here. Use forward declarations wherever possible
+// and hide includes of complex types in baseapi.cpp.
+#include <tesseract/version.h>
+
+#include <cstdio>
+#include <functional>  // for std::function
+
 template <typename T>
 class GenericVector;
 class PAGE_RES;

diff --git a/include/tesseract/genericvector.h b/include/tesseract/genericvector.h
@@ -19,6 +19,9 @@
 #ifndef TESSERACT_CCUTIL_GENERICVECTOR_H_
 #define TESSERACT_CCUTIL_GENERICVECTOR_H_
 
+#include "helpers.h"
+#include "serialis.h"
+
 #include <algorithm>
 #include <cassert>
 #include <climits>  // for LONG_MAX
@@ -27,9 +30,6 @@
 #include <cstdlib>
 #include <functional>  // for std::function
 
-#include "helpers.h"
-#include "serialis.h"
-
 // Use PointerVector<T> below in preference to GenericVector<T*>, as that
 // provides automatic deletion of pointers, [De]Serialize that works, and
 // sort that works.

diff --git a/include/tesseract/renderer.h b/include/tesseract/renderer.h
@@ -18,14 +18,14 @@
 #ifndef TESSERACT_API_RENDERER_H_
 #define TESSERACT_API_RENDERER_H_
 
+#include "genericvector.h"
+#include "platform.h"
+
 // To avoid collision with other typenames include the ABSOLUTE MINIMUM
 // complexity of includes here. Use forward declarations wherever possible
 // and hide includes of complex types in baseapi.cpp.
 #include <string>  // for std::string
 
-#include "genericvector.h"
-#include "platform.h"
-
 struct Pix;
 
 namespace tesseract {

diff --git a/include/tesseract/resultiterator.h b/include/tesseract/resultiterator.h
@@ -22,14 +22,14 @@
 #ifndef TESSERACT_CCMAIN_RESULT_ITERATOR_H_
 #define TESSERACT_CCMAIN_RESULT_ITERATOR_H_
 
-#include <set>     // for std::pair
-#include <vector>  // for std::vector
-
 #include "ltrresultiterator.h"  // for LTRResultIterator
 #include "platform.h"           // for TESS_API, TESS_LOCAL
 #include "publictypes.h"        // for PageIteratorLevel
 #include "unichar.h"            // for StrongScriptDirection
 
+#include <set>     // for std::pair
+#include <vector>  // for std::vector
+
 template <typename T>
 class GenericVector;
 template <typename T>

diff --git a/include/tesseract/strngs.h b/include/tesseract/strngs.h
@@ -19,13 +19,13 @@
 #ifndef STRNGS_H
 #define STRNGS_H
 
+#include "platform.h"  // for TESS_API
+
 #include <cassert>  // for assert
 #include <cstdint>  // for uint32_t
 #include <cstdio>   // for FILE
 #include <cstring>  // for strncpy
 
-#include "platform.h"  // for TESS_API
-
 namespace tesseract {
 class TFile;
 }  // namespace tesseract.

diff --git a/include/tesseract/unichar.h b/include/tesseract/unichar.h
@@ -19,13 +19,12 @@
 #ifndef TESSERACT_CCUTIL_UNICHAR_H_
 #define TESSERACT_CCUTIL_UNICHAR_H_
 
-#include <memory.h>
+#include "platform.h"
 
 #include <cstring>
 #include <string>
 #include <vector>
-
-#include "platform.h"
+#include <memory.h>
 
 // Maximum number of characters that can be stored in a UNICHAR. Must be
 // at least 4. Must not exceed 31 without changing the coding of length.