Skip to content

Commit

Permalink
Use relative includes for API headers in API headers
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Weil <sw@weilnetz.de>
  • Loading branch information
stweil committed Nov 2, 2019
1 parent 6f31c3b commit 29dcfb0
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion include/tesseract/apitypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef TESSERACT_API_APITYPES_H_
#define TESSERACT_API_APITYPES_H_

#include <tesseract/publictypes.h>
#include "publictypes.h"

// The types used by the API and Page/ResultIterator can be found in:
// ccstruct/publictypes.h
Expand Down
16 changes: 8 additions & 8 deletions include/tesseract/baseapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
// 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/apitypes.h>
#include <tesseract/pageiterator.h>
#include <tesseract/platform.h>
#include <tesseract/publictypes.h>
#include <tesseract/resultiterator.h>
#include <tesseract/serialis.h>
#include <tesseract/thresholder.h>
#include <tesseract/unichar.h>
#include "apitypes.h"
#include "pageiterator.h"
#include "platform.h"
#include "publictypes.h"
#include "resultiterator.h"
#include "serialis.h"
#include "thresholder.h"
#include "unichar.h"
#include <tesseract/version.h>

template <typename T> class GenericVector;
Expand Down
12 changes: 6 additions & 6 deletions include/tesseract/capi.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
#endif

#ifdef TESS_CAPI_INCLUDE_BASEAPI
# include <tesseract/baseapi.h>
# include <tesseract/ocrclass.h>
# include <tesseract/pageiterator.h>
# include <tesseract/renderer.h>
# include <tesseract/resultiterator.h>
# include "baseapi.h"
# include "ocrclass.h"
# include "pageiterator.h"
# include "renderer.h"
# include "resultiterator.h"
#else
# include <stdbool.h>
# include <stdio.h>
# include <tesseract/platform.h>
# include "platform.h"
#endif

#ifdef __cplusplus
Expand Down
4 changes: 2 additions & 2 deletions include/tesseract/genericvector.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <cstdlib>
#include <functional> // for std::function

#include <tesseract/helpers.h>
#include <tesseract/serialis.h>
#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
Expand Down
8 changes: 4 additions & 4 deletions include/tesseract/ltrresultiterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
#ifndef TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_
#define TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_

#include <tesseract/pageiterator.h> // for PageIterator
#include <tesseract/platform.h> // for TESS_API
#include <tesseract/publictypes.h> // for PageIteratorLevel
#include <tesseract/unichar.h> // for StrongScriptDirection
#include "pageiterator.h" // for PageIterator
#include "platform.h" // for TESS_API
#include "publictypes.h" // for PageIteratorLevel
#include "unichar.h" // for StrongScriptDirection

class BLOB_CHOICE_IT;
class PAGE_RES;
Expand Down
2 changes: 1 addition & 1 deletion include/tesseract/osdetect.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef TESSERACT_CCMAIN_OSDETECT_H_
#define TESSERACT_CCMAIN_OSDETECT_H_

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

class BLOBNBOX;
class BLOBNBOX_CLIST;
Expand Down
4 changes: 2 additions & 2 deletions include/tesseract/pageiterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#ifndef TESSERACT_CCMAIN_PAGEITERATOR_H_
#define TESSERACT_CCMAIN_PAGEITERATOR_H_

#include <tesseract/platform.h>
#include <tesseract/publictypes.h>
#include "platform.h"
#include "publictypes.h"

struct BlamerBundle;
class C_BLOB_IT;
Expand Down
6 changes: 3 additions & 3 deletions include/tesseract/renderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
// complexity of includes here. Use forward declarations wherever possible
// and hide includes of complex types in baseapi.cpp.
#include <string> // for std::string
#include <tesseract/genericvector.h>
#include <tesseract/platform.h>
#include <tesseract/strngs.h> // for STRING
#include "genericvector.h"
#include "platform.h"
#include "strngs.h" // for STRING

struct Pix;

Expand Down
8 changes: 4 additions & 4 deletions include/tesseract/resultiterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

#include <set> // for std::pair
#include <vector> // for std::vector
#include <tesseract/ltrresultiterator.h> // for LTRResultIterator
#include <tesseract/platform.h> // for TESS_API, TESS_LOCAL
#include <tesseract/publictypes.h> // for PageIteratorLevel
#include <tesseract/unichar.h> // for StrongScriptDirection
#include "ltrresultiterator.h" // for LTRResultIterator
#include "platform.h" // for TESS_API, TESS_LOCAL
#include "publictypes.h" // for PageIteratorLevel
#include "unichar.h" // for StrongScriptDirection

template <typename T> class GenericVector;
template <typename T> class GenericVectorEqEq;
Expand Down
2 changes: 1 addition & 1 deletion include/tesseract/strngs.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <cstdint> // for uint32_t
#include <cstdio> // for FILE
#include <cstring> // for strncpy
#include <tesseract/platform.h> // for TESS_API
#include "platform.h" // for TESS_API

namespace tesseract {
class TFile;
Expand Down
4 changes: 2 additions & 2 deletions include/tesseract/thresholder.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#ifndef TESSERACT_CCMAIN_THRESHOLDER_H_
#define TESSERACT_CCMAIN_THRESHOLDER_H_

#include <tesseract/platform.h>
#include <tesseract/publictypes.h>
#include "platform.h"
#include "publictypes.h"

struct Pix;

Expand Down
2 changes: 1 addition & 1 deletion include/tesseract/unichar.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <cstring>
#include <string>
#include <vector>
#include <tesseract/platform.h>
#include "platform.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.
Expand Down

0 comments on commit 29dcfb0

Please sign in to comment.