Rename all C-style headers (e.g. <stdio.h>) to C++ style (<cstdio>).

Author: zamazan4ik

src/api/baseapi.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_API_BASEAPI_H_
 #define TESSERACT_API_BASEAPI_H_
 
-#include <stdio.h>
+#include <cstdio>
 // 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.

src/arch/dotproductavx.cpp

@@ -20,8 +20,8 @@
 // Implementation for non-avx archs.
 
 #include "dotproductavx.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 namespace tesseract {
 double DotProductAVX(const double* u, const double* v, int n) {
@@ -33,7 +33,7 @@ double DotProductAVX(const double* u, const double* v, int n) {
 #else  // !defined(__AVX__)
 // Implementation for avx capable archs.
 #include <immintrin.h>
-#include <stdint.h>
+#include <cstdint>
 #include "dotproductavx.h"
 #include "host.h"
 

src/arch/dotproductsse.cpp

@@ -20,8 +20,8 @@
 // This code can't compile with "-msse4.1", so use dummy stubs.
 
 #include "dotproductsse.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 namespace tesseract {
 double DotProductSSE(const double* u, const double* v, int n) {
@@ -39,7 +39,7 @@ int32_t IntDotProductSSE(const int8_t* u, const int8_t* v, int n) {
 
 #include <emmintrin.h>
 #include <smmintrin.h>
-#include <stdint.h>
+#include <cstdint>
 #include "dotproductsse.h"
 #include "host.h"
 

src/arch/intsimdmatrix.h

@@ -19,7 +19,7 @@
 #ifndef TESSERACT_ARCH_INTSIMDMATRIX_H_
 #define TESSERACT_ARCH_INTSIMDMATRIX_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include "genericvector.h"
 #include "matrix.h"

src/arch/intsimdmatrixavx2.cpp

@@ -20,7 +20,7 @@
 
 #ifdef __AVX2__
 #include <immintrin.h>
-#include <stdint.h>
+#include <cstdint>
 #include <algorithm>
 #include <vector>
 

src/arch/intsimdmatrixsse.cpp

@@ -18,7 +18,7 @@
 
 #include "intsimdmatrixsse.h"
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include "dotproductsse.h"
 

src/ccmain/control.cpp

@@ -24,7 +24,7 @@
 #endif
 
 #include <string.h>
-#include <math.h>
+#include <cmath>
 #ifdef __UNIX__
 #include <assert.h>
 #include <unistd.h>

src/ccmain/paramsd.cpp

@@ -21,8 +21,8 @@
 // tesseract from the ui.
 #ifdef _WIN32
 #else
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #endif
 
 #include <map>

src/ccmain/tessvars.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include  "tessvars.h"
 

src/ccmain/tessvars.h

@@ -20,7 +20,7 @@
 #ifndef           TESSVARS_H
 #define           TESSVARS_H
 
-#include <stdio.h>
+#include <cstdio>
 
 
 extern FILE *debug_fp;    // write debug stuff here

src/ccmain/tfacepp.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <math.h>
+#include <cmath>
 
 #include "blamer.h"
 #include "errcode.h"

src/ccstruct/blamer.h

@@ -21,7 +21,7 @@
 #ifndef TESSERACT_CCSTRUCT_BLAMER_H_
 #define TESSERACT_CCSTRUCT_BLAMER_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include "boxword.h"
 #include "genericvector.h"
 #include "matrix.h"

src/ccstruct/boxread.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCUTIL_BOXREAD_H_
 #define TESSERACT_CCUTIL_BOXREAD_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include "genericvector.h"
 #include "strngs.h"
 

src/ccstruct/matrix.h

@@ -29,7 +29,7 @@
 #ifndef TESSERACT_CCSTRUCT_MATRIX_H_
 #define TESSERACT_CCSTRUCT_MATRIX_H_
 
-#include <math.h>
+#include <cmath>
 #include "kdpair.h"
 #include "points.h"
 #include "serialis.h"

src/ccstruct/normalis.cpp

@@ -19,7 +19,7 @@
 
 #include "normalis.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "allheaders.h"
 #include "blobs.h"

src/ccstruct/normalis.h

@@ -20,7 +20,7 @@
 #ifndef           NORMALIS_H
 #define           NORMALIS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "genericvector.h"
 #include "host.h"
 

src/ccstruct/ocrblock.cpp

@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include "ocrblock.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>  // std::unique_ptr
 #include "blckerr.h"
 #include "stepblob.h"

src/ccstruct/ocrpara.cpp

@@ -17,7 +17,7 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "ocrpara.h"
 #include "host.h"  // For NearlyEqual()

src/ccstruct/ocrrow.h

@@ -20,7 +20,7 @@
 #ifndef           OCRROW_H
 #define           OCRROW_H
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "quspline.h"
 #include "werd.h"

src/ccstruct/pdblock.cpp

@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include "pdblock.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>  // std::unique_ptr
 #include "allheaders.h"
 #include "blckerr.h"

src/ccstruct/polyblk.cpp

@@ -19,8 +19,8 @@
 
 #include "polyblk.h"
 #include <ctype.h>
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 #include <memory>  // std::unique_ptr
 #include "elst.h"
 

src/ccstruct/quadlsq.cpp

@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 #include "quadlsq.h"
 #include "tprintf.h"
 

src/ccstruct/rect.h

@@ -20,7 +20,7 @@
 #ifndef           RECT_H
 #define           RECT_H
 
-#include <math.h>
+#include <cmath>
 #include "points.h"
 #include "ndminx.h"
 #include "scrollview.h"

src/ccstruct/statistc.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCSTRUCT_STATISTC_H_
 #define TESSERACT_CCSTRUCT_STATISTC_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include "host.h"
 #include "kdpair.h"
 #include "scrollview.h"

src/ccstruct/vecfuncs.h

@@ -25,7 +25,7 @@
 #ifndef VECFUNCS_H
 #define VECFUNCS_H
 
-#include <math.h>
+#include <cmath>
 
 struct EDGEPT;
 

src/ccutil/ambigs.cpp

@@ -20,7 +20,7 @@
 
 #include "ambigs.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include "helpers.h"
 #include "universalambigs.h"
 

src/ccutil/bitvector.h

@@ -22,8 +22,8 @@
 #ifndef TESSERACT_CCUTIL_BITVECTOR_H_
 #define TESSERACT_CCUTIL_BITVECTOR_H_
 
-#include <assert.h>
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
 #include "host.h"
 
 namespace tesseract {

src/ccutil/clst.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "clst.h"
 
 /***********************************************************************

src/ccutil/clst.h

@@ -20,7 +20,7 @@
 #ifndef CLST_H
 #define CLST_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "host.h"
 #include "serialis.h"
 #include "lsterr.h"

src/ccutil/elst.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "elst.h"
 
 /***********************************************************************

src/ccutil/elst.h

@@ -20,7 +20,7 @@
 #ifndef ELST_H
 #define ELST_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "host.h"
 #include "serialis.h"
 #include "lsterr.h"

src/ccutil/elst2.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "host.h"
 #include "elst2.h"
 

src/ccutil/elst2.h

@@ -20,7 +20,7 @@
 #ifndef ELST2_H
 #define ELST2_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "host.h"
 #include "serialis.h"
 #include "lsterr.h"

src/ccutil/genericvector.h

@@ -20,9 +20,9 @@
 #ifndef TESSERACT_CCUTIL_GENERICVECTOR_H_
 #define TESSERACT_CCUTIL_GENERICVECTOR_H_
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
 
 #include "tesscallback.h"
 #include "errcode.h"

src/ccutil/helpers.h

@@ -26,8 +26,8 @@
 #define TESSERACT_CCUTIL_HELPERS_H_
 
 #include <cassert>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <functional>
 #include <string>
 

src/ccutil/indexmapbidi.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCUTIL_INDEXMAPBIDI_H_
 #define TESSERACT_CCUTIL_INDEXMAPBIDI_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include "genericvector.h"
 
 namespace tesseract {

src/ccutil/qrsequence.h

@@ -27,7 +27,7 @@
 #ifndef TESSERACT_CCUTIL_QRSEQUENCE_H_
 #define TESSERACT_CCUTIL_QRSEQUENCE_H_
 
-#include <math.h>
+#include <cmath>
 
 class QRSequenceGenerator {
  public:

src/ccutil/scanutils.cpp

@@ -23,13 +23,13 @@
 #include "config_auto.h"
 #endif
 
-#include <ctype.h>
-#include <math.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <string.h>
-#include <limits.h>
-#include <stdio.h>
+#include <cctype>
+#include <cmath>
+#include <cstdarg>
+#include <cstddef>
+#include <cstring>
+#include <climits>
+#include <cstdio>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>