From 4897796d579ea2fe6c7b07a6f654be2f90c95c69 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 4 Dec 2016 14:45:26 +0100 Subject: [PATCH] Replace reserved identifiers used in #define guards header files Use macro names as suggested by the Google C++ Style Guide (https://google.github.io/styleguide/cppguide.html#The__define_Guard). Signed-off-by: Stefan Weil --- api/apitypes.h | 6 +++--- api/baseapi.h | 6 +++--- api/renderer.h | 6 +++--- ccmain/equationdetect.h | 4 ++-- ccmain/ltrresultiterator.h | 6 +++--- ccmain/mutableiterator.h | 6 +++--- ccmain/osdetect.h | 6 +++--- ccmain/pageiterator.h | 6 +++--- ccmain/resultiterator.h | 6 +++--- ccmain/tesseractclass.h | 6 +++--- ccmain/thresholder.h | 6 +++--- ccstruct/boxread.h | 6 +++--- ccstruct/boxword.h | 6 +++--- ccstruct/ccstruct.h | 6 +++--- ccstruct/dppoint.h | 6 +++--- ccstruct/matrix.h | 6 +++--- ccstruct/otsuthr.h | 6 +++--- ccstruct/publictypes.h | 6 +++--- ccutil/bitvector.h | 6 +++--- ccutil/ccutil.h | 6 +++--- ccutil/host.h | 6 +++--- ccutil/platform.h | 6 +++--- ccutil/tesscallback.h | 6 +++--- ccutil/unichar.h | 6 +++--- ccutil/unicharmap.h | 6 +++--- ccutil/unicharset.h | 6 +++--- ccutil/unicodes.h | 6 +++--- classify/classify.h | 6 +++--- classify/intfeaturemap.h | 6 +++--- classify/intfeaturespace.h | 6 +++--- classify/mastertrainer.h | 6 +++--- classify/trainingsample.h | 6 +++--- classify/trainingsampleset.h | 4 ++-- cutil/cutil_class.h | 6 +++--- opencl/oclkernels.h | 8 +++++--- textord/alignedblob.h | 6 +++--- textord/bbgrid.h | 6 +++--- textord/colfind.h | 6 +++--- textord/colpartition.h | 6 +++--- textord/colpartitiongrid.h | 6 +++--- textord/colpartitionset.h | 6 +++--- textord/equationdetectbase.h | 6 +++--- textord/imagefind.h | 6 +++--- textord/linefind.h | 6 +++--- textord/strokewidth.h | 6 +++--- textord/tabfind.h | 6 +++--- textord/tablefind.h | 6 +++--- textord/tabvector.h | 6 +++--- textord/textord.h | 6 +++--- textord/workingpartset.h | 6 +++--- training/commontraining.h | 6 +++--- viewer/scrollview.h | 6 +++--- viewer/svmnode.h | 6 +++--- viewer/svutil.h | 6 +++--- wordrec/wordrec.h | 6 +++--- 55 files changed, 165 insertions(+), 163 deletions(-) diff --git a/api/apitypes.h b/api/apitypes.h index 2cb38adda5..2c0e85c9dd 100644 --- a/api/apitypes.h +++ b/api/apitypes.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_API_APITYPES_H__ -#define TESSERACT_API_APITYPES_H__ +#ifndef TESSERACT_API_APITYPES_H_ +#define TESSERACT_API_APITYPES_H_ #include "publictypes.h" @@ -30,4 +30,4 @@ // than the lower-level one, and lower-level code should be sure to include // only the lower-level file. -#endif // TESSERACT_API_APITYPES_H__ +#endif // TESSERACT_API_APITYPES_H_ diff --git a/api/baseapi.h b/api/baseapi.h index 64f8ba0475..c85761117f 100644 --- a/api/baseapi.h +++ b/api/baseapi.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_API_BASEAPI_H__ -#define TESSERACT_API_BASEAPI_H__ +#ifndef TESSERACT_API_BASEAPI_H_ +#define TESSERACT_API_BASEAPI_H_ #define TESSERACT_VERSION_STR "4.00.00alpha" #define TESSERACT_VERSION 0x040000 @@ -909,4 +909,4 @@ class TESS_API TessBaseAPI { STRING HOcrEscape(const char* text); } // namespace tesseract. -#endif // TESSERACT_API_BASEAPI_H__ +#endif // TESSERACT_API_BASEAPI_H_ diff --git a/api/renderer.h b/api/renderer.h index d868f267fa..97ccff2674 100644 --- a/api/renderer.h +++ b/api/renderer.h @@ -15,8 +15,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_API_RENDERER_H__ -#define TESSERACT_API_RENDERER_H__ +#ifndef TESSERACT_API_RENDERER_H_ +#define TESSERACT_API_RENDERER_H_ // To avoid collision with other typenames include the ABSOLUTE MINIMUM // complexity of includes here. Use forward declarations wherever possible @@ -251,4 +251,4 @@ class TESS_API TessOsdRenderer : public TessResultRenderer { } // namespace tesseract. -#endif // TESSERACT_API_RENDERER_H__ +#endif // TESSERACT_API_RENDERER_H_ diff --git a/ccmain/equationdetect.h b/ccmain/equationdetect.h index 09b5539630..ddfdf5f5c9 100644 --- a/ccmain/equationdetect.h +++ b/ccmain/equationdetect.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCMAIN_EQUATIONDETECT_H__ -#define TESSERACT_CCMAIN_EQUATIONDETECT_H__ +#ifndef TESSERACT_CCMAIN_EQUATIONDETECT_H_ +#define TESSERACT_CCMAIN_EQUATIONDETECT_H_ #include "blobbox.h" #include "equationdetectbase.h" diff --git a/ccmain/ltrresultiterator.h b/ccmain/ltrresultiterator.h index 3ab70c4655..95722cae5d 100644 --- a/ccmain/ltrresultiterator.h +++ b/ccmain/ltrresultiterator.h @@ -18,8 +18,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H__ -#define TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H__ +#ifndef TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_ +#define TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_ #include "platform.h" #include "pageiterator.h" @@ -218,4 +218,4 @@ class ChoiceIterator { } // namespace tesseract. -#endif // TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H__ +#endif // TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_ diff --git a/ccmain/mutableiterator.h b/ccmain/mutableiterator.h index f097f47e2b..54759ba429 100644 --- a/ccmain/mutableiterator.h +++ b/ccmain/mutableiterator.h @@ -18,8 +18,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCMAIN_MUTABLEITERATOR_H__ -#define TESSERACT_CCMAIN_MUTABLEITERATOR_H__ +#ifndef TESSERACT_CCMAIN_MUTABLEITERATOR_H_ +#define TESSERACT_CCMAIN_MUTABLEITERATOR_H_ #include "resultiterator.h" @@ -61,4 +61,4 @@ class MutableIterator : public ResultIterator { } // namespace tesseract. -#endif // TESSERACT_CCMAIN_MUTABLEITERATOR_H__ +#endif // TESSERACT_CCMAIN_MUTABLEITERATOR_H_ diff --git a/ccmain/osdetect.h b/ccmain/osdetect.h index c5dc8d50d3..34a8f5e7ac 100644 --- a/ccmain/osdetect.h +++ b/ccmain/osdetect.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCMAIN_OSDETECT_H__ -#define TESSERACT_CCMAIN_OSDETECT_H__ +#ifndef TESSERACT_CCMAIN_OSDETECT_H_ +#define TESSERACT_CCMAIN_OSDETECT_H_ #include "strngs.h" #include "unicharset.h" @@ -135,4 +135,4 @@ bool os_detect_blob(BLOBNBOX* bbox, OrientationDetector* o, // applied for the text to be upright (readable). TESS_API int OrientationIdToValue(const int& id); -#endif // TESSERACT_CCMAIN_OSDETECT_H__ +#endif // TESSERACT_CCMAIN_OSDETECT_H_ diff --git a/ccmain/pageiterator.h b/ccmain/pageiterator.h index 56c78150a8..719a1b6075 100644 --- a/ccmain/pageiterator.h +++ b/ccmain/pageiterator.h @@ -18,8 +18,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCMAIN_PAGEITERATOR_H__ -#define TESSERACT_CCMAIN_PAGEITERATOR_H__ +#ifndef TESSERACT_CCMAIN_PAGEITERATOR_H_ +#define TESSERACT_CCMAIN_PAGEITERATOR_H_ #include "publictypes.h" #include "platform.h" @@ -361,4 +361,4 @@ class TESS_API PageIterator { } // namespace tesseract. -#endif // TESSERACT_CCMAIN_PAGEITERATOR_H__ +#endif // TESSERACT_CCMAIN_PAGEITERATOR_H_ diff --git a/ccmain/resultiterator.h b/ccmain/resultiterator.h index d6e8a91847..e5516836d5 100644 --- a/ccmain/resultiterator.h +++ b/ccmain/resultiterator.h @@ -19,8 +19,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCMAIN_RESULT_ITERATOR_H__ -#define TESSERACT_CCMAIN_RESULT_ITERATOR_H__ +#ifndef TESSERACT_CCMAIN_RESULT_ITERATOR_H_ +#define TESSERACT_CCMAIN_RESULT_ITERATOR_H_ #include "platform.h" #include "ltrresultiterator.h" @@ -241,4 +241,4 @@ class TESS_API ResultIterator : public LTRResultIterator { } // namespace tesseract. -#endif // TESSERACT_CCMAIN_RESULT_ITERATOR_H__ +#endif // TESSERACT_CCMAIN_RESULT_ITERATOR_H_ diff --git a/ccmain/tesseractclass.h b/ccmain/tesseractclass.h index 8a3b0f9213..a6d0d76dfd 100644 --- a/ccmain/tesseractclass.h +++ b/ccmain/tesseractclass.h @@ -23,8 +23,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCMAIN_TESSERACTCLASS_H__ -#define TESSERACT_CCMAIN_TESSERACTCLASS_H__ +#ifndef TESSERACT_CCMAIN_TESSERACTCLASS_H_ +#define TESSERACT_CCMAIN_TESSERACTCLASS_H_ #include "allheaders.h" #include "control.h" @@ -1277,4 +1277,4 @@ class Tesseract : public Wordrec { } // namespace tesseract -#endif // TESSERACT_CCMAIN_TESSERACTCLASS_H__ +#endif // TESSERACT_CCMAIN_TESSERACTCLASS_H_ diff --git a/ccmain/thresholder.h b/ccmain/thresholder.h index 92e2de5f3a..0ff8af2298 100644 --- a/ccmain/thresholder.h +++ b/ccmain/thresholder.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCMAIN_THRESHOLDER_H__ -#define TESSERACT_CCMAIN_THRESHOLDER_H__ +#ifndef TESSERACT_CCMAIN_THRESHOLDER_H_ +#define TESSERACT_CCMAIN_THRESHOLDER_H_ #include "platform.h" #include "publictypes.h" @@ -186,4 +186,4 @@ class TESS_API ImageThresholder { } // namespace tesseract. -#endif // TESSERACT_CCMAIN_THRESHOLDER_H__ +#endif // TESSERACT_CCMAIN_THRESHOLDER_H_ diff --git a/ccstruct/boxread.h b/ccstruct/boxread.h index f12853dfa9..b5c7bb47e7 100644 --- a/ccstruct/boxread.h +++ b/ccstruct/boxread.h @@ -17,8 +17,8 @@ * **********************************************************************/ -#ifndef TESSERACT_CCUTIL_BOXREAD_H__ -#define TESSERACT_CCUTIL_BOXREAD_H__ +#ifndef TESSERACT_CCUTIL_BOXREAD_H_ +#define TESSERACT_CCUTIL_BOXREAD_H_ #include #include "genericvector.h" @@ -82,4 +82,4 @@ bool ParseBoxFileStr(const char* boxfile_str, int* page_number, void MakeBoxFileStr(const char* unichar_str, const TBOX& box, int page_num, STRING* box_str); -#endif // TESSERACT_CCUTIL_BOXREAD_H__ +#endif // TESSERACT_CCUTIL_BOXREAD_H_ diff --git a/ccstruct/boxword.h b/ccstruct/boxword.h index c1fab068bb..2a95b273e6 100644 --- a/ccstruct/boxword.h +++ b/ccstruct/boxword.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CSTRUCT_BOXWORD_H__ -#define TESSERACT_CSTRUCT_BOXWORD_H__ +#ifndef TESSERACT_CSTRUCT_BOXWORD_H_ +#define TESSERACT_CSTRUCT_BOXWORD_H_ #include "genericvector.h" #include "rect.h" @@ -98,4 +98,4 @@ class BoxWord { } // namespace tesseract. -#endif // TESSERACT_CSTRUCT_BOXWORD_H__ +#endif // TESSERACT_CSTRUCT_BOXWORD_H_ diff --git a/ccstruct/ccstruct.h b/ccstruct/ccstruct.h index 3f92122d67..4bb0e6b75d 100644 --- a/ccstruct/ccstruct.h +++ b/ccstruct/ccstruct.h @@ -16,8 +16,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCSTRUCT_CCSTRUCT_H__ -#define TESSERACT_CCSTRUCT_CCSTRUCT_H__ +#ifndef TESSERACT_CCSTRUCT_CCSTRUCT_H_ +#define TESSERACT_CCSTRUCT_CCSTRUCT_H_ #include "cutil.h" @@ -41,4 +41,4 @@ class Tesseract; } // namespace tesseract -#endif // TESSERACT_CCSTRUCT_CCSTRUCT_H__ +#endif // TESSERACT_CCSTRUCT_CCSTRUCT_H_ diff --git a/ccstruct/dppoint.h b/ccstruct/dppoint.h index fd87bb9127..4e35712c2b 100644 --- a/ccstruct/dppoint.h +++ b/ccstruct/dppoint.h @@ -17,8 +17,8 @@ * **********************************************************************/ -#ifndef TESSERACT_CCSTRUCT_DPPOINT_H__ -#define TESSERACT_CCSTRUCT_DPPOINT_H__ +#ifndef TESSERACT_CCSTRUCT_DPPOINT_H_ +#define TESSERACT_CCSTRUCT_DPPOINT_H_ #include "host.h" @@ -98,5 +98,5 @@ class DPPoint { } // namespace tesseract. -#endif // TESSERACT_CCSTRUCT_DPPOINT_H__ +#endif // TESSERACT_CCSTRUCT_DPPOINT_H_ diff --git a/ccstruct/matrix.h b/ccstruct/matrix.h index 4b5b242a43..8e0442ae77 100644 --- a/ccstruct/matrix.h +++ b/ccstruct/matrix.h @@ -26,8 +26,8 @@ ** limitations under the License. * *********************************************************************************/ -#ifndef TESSERACT_CCSTRUCT_MATRIX_H__ -#define TESSERACT_CCSTRUCT_MATRIX_H__ +#ifndef TESSERACT_CCSTRUCT_MATRIX_H_ +#define TESSERACT_CCSTRUCT_MATRIX_H_ #include #include "kdpair.h" @@ -632,4 +632,4 @@ struct MATRIX_COORD { // The MatrixCoordPair contains a MATRIX_COORD and its priority. typedef tesseract::KDPairInc MatrixCoordPair; -#endif // TESSERACT_CCSTRUCT_MATRIX_H__ +#endif // TESSERACT_CCSTRUCT_MATRIX_H_ diff --git a/ccstruct/otsuthr.h b/ccstruct/otsuthr.h index 7e7d281751..dd35d23f31 100644 --- a/ccstruct/otsuthr.h +++ b/ccstruct/otsuthr.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCMAIN_OTSUTHR_H__ -#define TESSERACT_CCMAIN_OTSUTHR_H__ +#ifndef TESSERACT_CCMAIN_OTSUTHR_H_ +#define TESSERACT_CCMAIN_OTSUTHR_H_ struct Pix; @@ -53,4 +53,4 @@ int OtsuStats(const int* histogram, int* H_out, int* omega0_out); } // namespace tesseract. -#endif // TESSERACT_CCMAIN_OTSUTHR_H__ +#endif // TESSERACT_CCMAIN_OTSUTHR_H_ diff --git a/ccstruct/publictypes.h b/ccstruct/publictypes.h index 97c9ee8b9d..e9d300f96c 100644 --- a/ccstruct/publictypes.h +++ b/ccstruct/publictypes.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCSTRUCT_PUBLICTYPES_H__ -#define TESSERACT_CCSTRUCT_PUBLICTYPES_H__ +#ifndef TESSERACT_CCSTRUCT_PUBLICTYPES_H_ +#define TESSERACT_CCSTRUCT_PUBLICTYPES_H_ // This file contains types that are used both by the API and internally // to Tesseract. In order to decouple the API from Tesseract and prevent cyclic @@ -276,4 +276,4 @@ enum OcrEngineMode { } // namespace tesseract. -#endif // TESSERACT_CCSTRUCT_PUBLICTYPES_H__ +#endif // TESSERACT_CCSTRUCT_PUBLICTYPES_H_ diff --git a/ccutil/bitvector.h b/ccutil/bitvector.h index 5e7480773d..e9df04fa64 100644 --- a/ccutil/bitvector.h +++ b/ccutil/bitvector.h @@ -20,8 +20,8 @@ /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCUTIL_BITVECTOR_H__ -#define TESSERACT_CCUTIL_BITVECTOR_H__ +#ifndef TESSERACT_CCUTIL_BITVECTOR_H_ +#define TESSERACT_CCUTIL_BITVECTOR_H_ #include #include @@ -140,4 +140,4 @@ class BitVector { } // namespace tesseract. -#endif // TESSERACT_CCUTIL_BITVECTOR_H__ +#endif // TESSERACT_CCUTIL_BITVECTOR_H_ diff --git a/ccutil/ccutil.h b/ccutil/ccutil.h index e4ec4f9ae8..bb153bd6ec 100644 --- a/ccutil/ccutil.h +++ b/ccutil/ccutil.h @@ -16,8 +16,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCUTIL_CCUTIL_H__ -#define TESSERACT_CCUTIL_CCUTIL_H__ +#ifndef TESSERACT_CCUTIL_CCUTIL_H_ +#define TESSERACT_CCUTIL_CCUTIL_H_ #include "ambigs.h" #include "errcode.h" @@ -94,4 +94,4 @@ class CCUtil { extern CCUtilMutex tprintfMutex; // should remain global } // namespace tesseract -#endif // TESSERACT_CCUTIL_CCUTIL_H__ +#endif // TESSERACT_CCUTIL_CCUTIL_H_ diff --git a/ccutil/host.h b/ccutil/host.h index 40365c7a81..b42a4dc84a 100644 --- a/ccutil/host.h +++ b/ccutil/host.h @@ -42,8 +42,8 @@ ** limitations under the License. */ -#ifndef __HOST__ -#define __HOST__ +#ifndef TESSERACT_CCUTIL_HOST_H_ +#define TESSERACT_CCUTIL_HOST_H_ /****************************************************************************** ** IMPORTANT!!! ** @@ -146,4 +146,4 @@ template bool NearlyEqual(T x, T y, T tolerance) { return diff <= tolerance && -diff <= tolerance; } -#endif +#endif // TESSERACT_CCUTIL_HOST_H_ diff --git a/ccutil/platform.h b/ccutil/platform.h index dd9be87ac6..eda9b74b7d 100644 --- a/ccutil/platform.h +++ b/ccutil/platform.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCUTIL_PLATFORM_H__ -#define TESSERACT_CCUTIL_PLATFORM_H__ +#ifndef TESSERACT_CCUTIL_PLATFORM_H_ +#define TESSERACT_CCUTIL_PLATFORM_H_ #include @@ -89,4 +89,4 @@ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) #endif -#endif // TESSERACT_CCUTIL_PLATFORM_H__ +#endif // TESSERACT_CCUTIL_PLATFORM_H_ diff --git a/ccutil/tesscallback.h b/ccutil/tesscallback.h index 1f20c6b474..37d8dc58a6 100644 --- a/ccutil/tesscallback.h +++ b/ccutil/tesscallback.h @@ -16,8 +16,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef _TESS_CALLBACK_SPECIALIZATIONS_H -#define _TESS_CALLBACK_SPECIALIZATIONS_H +#ifndef TESS_CALLBACK_SPECIALIZATIONS_H_ +#define TESS_CALLBACK_SPECIALIZATIONS_H_ #include "host.h" // For NULL. @@ -9718,4 +9718,4 @@ NewPermanentTessCallback(R (*function)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4,A5), typena return new _TessFunctionResultCallback_6_5(function, p1, p2, p3, p4, p5, p6); } -#endif /* _TESS_CALLBACK_SPECIALIZATIONS_H */ +#endif // TESS_CALLBACK_SPECIALIZATIONS_H_ diff --git a/ccutil/unichar.h b/ccutil/unichar.h index b2a1e013f9..6dc2c275a0 100644 --- a/ccutil/unichar.h +++ b/ccutil/unichar.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCUTIL_UNICHAR_H__ -#define TESSERACT_CCUTIL_UNICHAR_H__ +#ifndef TESSERACT_CCUTIL_UNICHAR_H_ +#define TESSERACT_CCUTIL_UNICHAR_H_ #include #include @@ -162,4 +162,4 @@ class UNICHAR { char chars[UNICHAR_LEN]; }; -#endif // TESSERACT_CCUTIL_UNICHAR_H__ +#endif // TESSERACT_CCUTIL_UNICHAR_H_ diff --git a/ccutil/unicharmap.h b/ccutil/unicharmap.h index ad901585c1..ecc4065e38 100644 --- a/ccutil/unicharmap.h +++ b/ccutil/unicharmap.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCUTIL_UNICHARMAP_H__ -#define TESSERACT_CCUTIL_UNICHARMAP_H__ +#ifndef TESSERACT_CCUTIL_UNICHARMAP_H_ +#define TESSERACT_CCUTIL_UNICHARMAP_H_ #include "unichar.h" @@ -79,4 +79,4 @@ class UNICHARMAP { UNICHARMAP_NODE* nodes; }; -#endif // TESSERACT_CCUTIL_UNICHARMAP_H__ +#endif // TESSERACT_CCUTIL_UNICHARMAP_H_ diff --git a/ccutil/unicharset.h b/ccutil/unicharset.h index eb1b4e5f4b..19eb7cfc29 100644 --- a/ccutil/unicharset.h +++ b/ccutil/unicharset.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CCUTIL_UNICHARSET_H__ -#define TESSERACT_CCUTIL_UNICHARSET_H__ +#ifndef TESSERACT_CCUTIL_UNICHARSET_H_ +#define TESSERACT_CCUTIL_UNICHARSET_H_ #include "errcode.h" #include "genericvector.h" @@ -997,4 +997,4 @@ class UNICHARSET { int default_sid_; }; -#endif // TESSERACT_CCUTIL_UNICHARSET_H__ +#endif // TESSERACT_CCUTIL_UNICHARSET_H_ diff --git a/ccutil/unicodes.h b/ccutil/unicodes.h index f6d2bd510d..7bab9b0059 100644 --- a/ccutil/unicodes.h +++ b/ccutil/unicodes.h @@ -17,8 +17,8 @@ * **********************************************************************/ -#ifndef TESSERACT_CCUTIL_UNICODES_H__ -#define TESSERACT_CCUTIL_UNICODES_H__ +#ifndef TESSERACT_CCUTIL_UNICODES_H_ +#define TESSERACT_CCUTIL_UNICODES_H_ namespace tesseract { @@ -36,4 +36,4 @@ extern const char *kApostropheLikeUTF8[]; } // namespace -#endif // TESSERACT_CCUTIL_UNICODES_H__ +#endif // TESSERACT_CCUTIL_UNICODES_H_ diff --git a/classify/classify.h b/classify/classify.h index 0de8441527..202a0b9a87 100644 --- a/classify/classify.h +++ b/classify/classify.h @@ -16,8 +16,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CLASSIFY_CLASSIFY_H__ -#define TESSERACT_CLASSIFY_CLASSIFY_H__ +#ifndef TESSERACT_CLASSIFY_CLASSIFY_H_ +#define TESSERACT_CLASSIFY_CLASSIFY_H_ #include "adaptive.h" #include "ccstruct.h" @@ -539,4 +539,4 @@ class Classify : public CCStruct { }; } // namespace tesseract -#endif // TESSERACT_CLASSIFY_CLASSIFY_H__ +#endif // TESSERACT_CLASSIFY_CLASSIFY_H_ diff --git a/classify/intfeaturemap.h b/classify/intfeaturemap.h index 55c5b5cf5e..5c5a54b83c 100644 --- a/classify/intfeaturemap.h +++ b/classify/intfeaturemap.h @@ -18,8 +18,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CLASSIFY_INTFEATUREMAP_H__ -#define TESSERACT_CLASSIFY_INTFEATUREMAP_H__ +#ifndef TESSERACT_CLASSIFY_INTFEATUREMAP_H_ +#define TESSERACT_CLASSIFY_INTFEATUREMAP_H_ #include "intfeaturespace.h" #include "indexmapbidi.h" @@ -160,4 +160,4 @@ class IntFeatureMap { } // namespace tesseract. -#endif // TESSERACT_CLASSIFY_INTFEATUREMAP_H__ +#endif // TESSERACT_CLASSIFY_INTFEATUREMAP_H_ diff --git a/classify/intfeaturespace.h b/classify/intfeaturespace.h index e1e8e6ec9b..38120b0d09 100644 --- a/classify/intfeaturespace.h +++ b/classify/intfeaturespace.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CLASSIFY_INTFEATURESPACE_H__ -#define TESSERACT_CLASSIFY_INTFEATURESPACE_H__ +#ifndef TESSERACT_CLASSIFY_INTFEATURESPACE_H_ +#define TESSERACT_CLASSIFY_INTFEATURESPACE_H_ #include "genericvector.h" #include "intproto.h" @@ -107,4 +107,4 @@ class IntFeatureSpace { } // namespace tesseract. -#endif // TESSERACT_CLASSIFY_INTFEATURESPACE_H__ +#endif // TESSERACT_CLASSIFY_INTFEATURESPACE_H_ diff --git a/classify/mastertrainer.h b/classify/mastertrainer.h index 8cc7158acf..e1a5b17c4b 100644 --- a/classify/mastertrainer.h +++ b/classify/mastertrainer.h @@ -19,8 +19,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_TRAINING_MASTERTRAINER_H__ -#define TESSERACT_TRAINING_MASTERTRAINER_H__ +#ifndef TESSERACT_TRAINING_MASTERTRAINER_H_ +#define TESSERACT_TRAINING_MASTERTRAINER_H_ /**---------------------------------------------------------------------------- Include Files and Type Defines @@ -309,4 +309,4 @@ class MasterTrainer { } // namespace tesseract. -#endif +#endif // TESSERACT_TRAINING_MASTERTRAINER_H_ diff --git a/classify/trainingsample.h b/classify/trainingsample.h index 6df1ce8241..251e33b6e2 100644 --- a/classify/trainingsample.h +++ b/classify/trainingsample.h @@ -13,8 +13,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_TRAINING_TRAININGSAMPLE_H__ -#define TESSERACT_TRAINING_TRAININGSAMPLE_H__ +#ifndef TESSERACT_TRAINING_TRAININGSAMPLE_H_ +#define TESSERACT_TRAINING_TRAININGSAMPLE_H_ #include "elst.h" #include "featdefs.h" @@ -247,4 +247,4 @@ ELISTIZEH(TrainingSample) } // namespace tesseract -#endif // TESSERACT_TRAINING_TRAININGSAMPLE_H__ +#endif // TESSERACT_TRAINING_TRAININGSAMPLE_H_ diff --git a/classify/trainingsampleset.h b/classify/trainingsampleset.h index ad92c6c4fe..e7010523d8 100644 --- a/classify/trainingsampleset.h +++ b/classify/trainingsampleset.h @@ -13,8 +13,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_TRAINING_TRAININGSAMPLESET_H__ -#define TESSERACT_TRAINING_TRAININGSAMPLESET_H__ +#ifndef TESSERACT_TRAINING_TRAININGSAMPLESET_H_ +#define TESSERACT_TRAINING_TRAININGSAMPLESET_H_ #include "bitvector.h" #include "genericvector.h" diff --git a/cutil/cutil_class.h b/cutil/cutil_class.h index 06d3254366..8b59b6eb23 100644 --- a/cutil/cutil_class.h +++ b/cutil/cutil_class.h @@ -16,8 +16,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_CUTIL_CUTIL_CLASS_H__ -#define TESSERACT_CUTIL_CUTIL_CLASS_H__ +#ifndef TESSERACT_CUTIL_CUTIL_CLASS_H_ +#define TESSERACT_CUTIL_CUTIL_CLASS_H_ #include "ccutil.h" #include "const.h" @@ -34,4 +34,4 @@ class CUtil : public CCUtil { } // namespace tesseract -#endif // TESSERACT_CUTIL_CUTIL_CLASS_H__ +#endif // TESSERACT_CUTIL_CUTIL_CLASS_H_ diff --git a/opencl/oclkernels.h b/opencl/oclkernels.h index 5a34fb7a22..cfc0b2af55 100644 --- a/opencl/oclkernels.h +++ b/opencl/oclkernels.h @@ -7,8 +7,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef _OCL_KERNEL_H_ -#define _OCL_KERNEL_H_ + +#ifndef TESSERACT_OPENCL_OCLKERNELS_H_ +#define TESSERACT_OPENCL_OCLKERNELS_H_ + #ifndef USE_EXTERNAL_KERNEL #define KERNEL( ... )# __VA_ARGS__ "\n" // Double precision is a default of spreadsheets @@ -1210,5 +1212,5 @@ KERNEL( ; // close char* #endif // USE_EXTERNAL_KERNEL -#endif //_OCL_KERNEL_H_ +#endif // TESSERACT_OPENCL_OCLKERNELS_H_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/textord/alignedblob.h b/textord/alignedblob.h index cbc727a18e..d5e9d26a2c 100644 --- a/textord/alignedblob.h +++ b/textord/alignedblob.h @@ -18,8 +18,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_TEXTORD_ALIGNEDBLOB_H__ -#define TESSERACT_TEXTORD_ALIGNEDBLOB_H__ +#ifndef TESSERACT_TEXTORD_ALIGNEDBLOB_H_ +#define TESSERACT_TEXTORD_ALIGNEDBLOB_H_ #include "bbgrid.h" #include "blobbox.h" @@ -141,5 +141,5 @@ class AlignedBlob : public BlobGrid { } // namespace tesseract. -#endif // TESSERACT_TEXTORD_ALIGNEDBLOB_H__ +#endif // TESSERACT_TEXTORD_ALIGNEDBLOB_H_ diff --git a/textord/bbgrid.h b/textord/bbgrid.h index 066b5bae1e..4d035211af 100644 --- a/textord/bbgrid.h +++ b/textord/bbgrid.h @@ -18,8 +18,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_TEXTORD_BBGRID_H__ -#define TESSERACT_TEXTORD_BBGRID_H__ +#ifndef TESSERACT_TEXTORD_BBGRID_H_ +#define TESSERACT_TEXTORD_BBGRID_H_ #include "clst.h" #include "coutln.h" @@ -958,4 +958,4 @@ void GridSearch::SetIterator() { } // namespace tesseract. -#endif // TESSERACT_TEXTORD_BBGRID_H__ +#endif // TESSERACT_TEXTORD_BBGRID_H_ diff --git a/textord/colfind.h b/textord/colfind.h index dc40cbb05c..60f7f00ec6 100644 --- a/textord/colfind.h +++ b/textord/colfind.h @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_TEXTORD_COLFIND_H__ -#define TESSERACT_TEXTORD_COLFIND_H__ +#ifndef TESSERACT_TEXTORD_COLFIND_H_ +#define TESSERACT_TEXTORD_COLFIND_H_ #include "tabfind.h" #include "imagefind.h" @@ -365,4 +365,4 @@ class ColumnFinder : public TabFind { } // namespace tesseract. -#endif // TESSERACT_TEXTORD_COLFIND_H__ +#endif // TESSERACT_TEXTORD_COLFIND_H_ diff --git a/textord/colpartition.h b/textord/colpartition.h index 7fcbc0004e..ed1262993e 100644 --- a/textord/colpartition.h +++ b/textord/colpartition.h @@ -18,8 +18,8 @@ // /////////////////////////////////////////////////////////////////////// -#ifndef TESSERACT_TEXTORD_COLPARTITION_H__ -#define TESSERACT_TEXTORD_COLPARTITION_H__ +#ifndef TESSERACT_TEXTORD_COLPARTITION_H_ +#define TESSERACT_TEXTORD_COLPARTITION_H_ #include "bbgrid.h" #include "blobbox.h" // For BlobRegionType. @@ -933,4 +933,4 @@ typedef GridSearch