Merge pull request #1696 from stweil/includes

Replace string.h by standard C++ cstring

src/api/baseapi.cpp

@@ -36,7 +36,7 @@
 #else
 #include <dirent.h>
 #include <libgen.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

src/api/renderer.cpp

@@ -19,7 +19,7 @@
 #include "config_auto.h"
 #endif
 
-#include <string.h>
+#include <cstring>
 #include <memory>  // std::unique_ptr
 #include "baseapi.h"
 #include "genericvector.h"

src/ccmain/adaptions.cpp

@@ -19,7 +19,7 @@
  **********************************************************************/
 
 #include <ctype.h>
-#include <string.h>
+#include <cstring>
 #include "tessbox.h"
 #include "tessvars.h"
 #include "memry.h"

src/ccmain/applybox.cpp

@@ -19,7 +19,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <string.h>
+#include <cstring>
 #include "allheaders.h"
 #include "boxread.h"
 #include "chopper.h"

src/ccmain/control.cpp

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

src/ccmain/fixxht.cpp

@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include <algorithm>
-#include <string.h>
+#include <cstring>
 #include <ctype.h>
 #include "params.h"
 #include "float2int.h"

src/ccmain/output.cpp

@@ -19,7 +19,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <string.h>
+#include <cstring>
 #ifdef __UNIX__
 #include <unistd.h>
 #endif

src/ccmain/reject.cpp

@@ -21,7 +21,7 @@
 #include "scanutils.h"
 #include <ctype.h>
 #include <errno.h>
-#include <string.h>
+#include <cstring>
 #include "genericvector.h"
 #include "reject.h"
 #include "control.h"

src/ccmain/thresholder.cpp

@@ -21,7 +21,7 @@
 
 #include "thresholder.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "otsuthr.h"
 

src/ccstruct/boxread.cpp

@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include "boxread.h"
-#include <string.h>
+#include <cstring>
 
 #include "fileerr.h"
 #include "rect.h"

src/ccstruct/coutln.cpp

@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include <algorithm>
-#include <string.h>
+#include <cstring>
 
 #include "coutln.h"
 

src/ccstruct/otsuthr.cpp

@@ -19,7 +19,7 @@
 
 #include "otsuthr.h"
 
-#include <string.h>
+#include <cstring>
 #include "allheaders.h"
 #include "helpers.h"
 #include "openclwrapper.h"

src/ccstruct/params_training_featdef.cpp

@@ -17,7 +17,7 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#include <string.h>
+#include <cstring>
 
 #include "params_training_featdef.h"
 

src/ccstruct/statistc.cpp

@@ -23,7 +23,7 @@
 #endif
 
 #include "statistc.h"
-#include <string.h>
+#include <cstring>
 #include <math.h>
 #include <stdlib.h>
 #include "errcode.h"

src/ccutil/bitvector.cpp

@@ -20,7 +20,7 @@
 ///////////////////////////////////////////////////////////////////////
 
 #include "bitvector.h"
-#include <string.h>
+#include <cstring>
 #include "helpers.h"
 
 #include <algorithm>

src/ccutil/errcode.cpp

@@ -17,15 +17,15 @@
  *
  **********************************************************************/
 
-#include          <stdio.h>
-#include          <stdlib.h>
-#include          <stdarg.h>
-#include          <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <cstring>
 #ifdef __UNIX__
-#include          <signal.h>
+#include <signal.h>
 #endif
-#include          "tprintf.h"
-#include          "errcode.h"
+#include "tprintf.h"
+#include "errcode.h"
 
 const ERRCODE BADERRACTION = "Illegal error action";
 #define MAX_MSG       1024

src/ccutil/params.cpp

@@ -17,14 +17,14 @@
  *
  **********************************************************************/
 
-#include          <stdio.h>
-#include          <string.h>
-#include          <stdlib.h>
+#include <stdio.h>
+#include <cstring>
+#include <stdlib.h>
 
-#include          "genericvector.h"
-#include          "scanutils.h"
-#include          "tprintf.h"
-#include          "params.h"
+#include "genericvector.h"
+#include "scanutils.h"
+#include "tprintf.h"
+#include "params.h"
 
 #define PLUS          '+'        //flag states
 #define MINUS         '-'

src/ccutil/platform.h

@@ -20,8 +20,6 @@
 #ifndef TESSERACT_CCUTIL_PLATFORM_H_
 #define TESSERACT_CCUTIL_PLATFORM_H_
 
-#include <string.h>
-
 #define DLLSYM
 #ifdef _WIN32
 #ifndef NOMINMAX

src/ccutil/unichar.h

@@ -21,7 +21,7 @@
 #define TESSERACT_CCUTIL_UNICHAR_H_
 
 #include <memory.h>
-#include <string.h>
+#include <cstring>
 #include <string>
 #include <vector>
 #include "platform.h"

src/classify/classify.cpp

@@ -29,7 +29,7 @@
 #include "shapeclassifier.h"
 #include "shapetable.h"
 #include "unicity_table.h"
-#include <string.h>
+#include <cstring>
 
 namespace tesseract {
 Classify::Classify()

src/training/cntraining.cpp

@@ -31,7 +31,7 @@
 #include "ocrfeatures.h"
 #include "clusttool.h"
 #include "cluster.h"
-#include <string.h>
+#include <cstring>
 #include <cstdio>
 #include <cmath>
 #include "unichar.h"

src/training/tessopt.cpp

@@ -1,8 +1,8 @@
 /**********************************************************************
  * File:        tessopt.cpp
  * Description: Re-implementation of the unix code.
- * Author:					Ray Smith
- * Created:					Tue Nov 28 05:52:50 MST 1995
+ * Author:      Ray Smith
+ * Created:     Tue Nov 28 05:52:50 MST 1995
  *
  * (C) Copyright 1995, Hewlett-Packard Co.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,9 +17,9 @@
  *
  **********************************************************************/
 
-#include          <string.h>
-#include          <stdio.h>
-#include          "tessopt.h"
+#include <cstring>
+#include <stdio.h>
+#include "tessopt.h"
 
 int tessoptind;
 char *tessoptarg;

src/viewer/scrollview.cpp

@@ -22,7 +22,7 @@
 
 #include <stdarg.h>
 #include <limits.h>
-#include <string.h>
+#include <cstring>
 #include <map>
 #include <utility>
 #include <algorithm>

src/viewer/svmnode.cpp

@@ -25,7 +25,7 @@
 // A SVMenuNode can both be used in the context_ of popup menus as well as
 // menu bars.
 
-#include <string.h>
+#include <cstring>
 #include <iostream>
 #include <cstring>