Merge pull request #2020 from stweil/clang8

Fix some compiler warnings from clang-8
tesseract-ocr · Oct 22, 2018 · 55704d2 · 55704d2
2 parents dba7f45 + 9c07993
commit 55704d2
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 9 deletions.
diff --git a/src/ccmain/tessbox.cpp b/src/ccmain/tessbox.cpp
@@ -20,8 +20,6 @@
 #include "mfoutline.h"
 #include "tesseractclass.h"
 
-#define EXTERN
-
 /**
  * @name tess_segment_pass_n
  *

diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp
@@ -47,7 +47,6 @@
 #include "matchdefs.h"
 #endif
 
-#define VARDIR        "configs/" /*variables files */
                                  // config under api
 #define API_CONFIG      "configs/api_config"
 

diff --git a/src/ccstruct/blobbox.cpp b/src/ccstruct/blobbox.cpp
@@ -36,7 +36,6 @@
 struct Pix;
 
 #define PROJECTION_MARGIN 10     //arbitrary
-#define EXTERN
 
 ELISTIZE(BLOBNBOX)
 ELIST2IZE(TO_ROW)

diff --git a/src/ccutil/globaloc.cpp b/src/ccutil/globaloc.cpp
@@ -30,7 +30,7 @@
 // Size of thread-id array of pixes to keep in case of crash.
 const int kMaxNumThreadPixes = 32768;
 
-Pix* global_crash_pixes[kMaxNumThreadPixes];
+static Pix* global_crash_pixes[kMaxNumThreadPixes];
 
 void SavePixForCrash(int resolution, Pix* pix) {
 #ifdef __linux__

diff --git a/src/ccutil/mainblk.cpp b/src/ccutil/mainblk.cpp
@@ -25,9 +25,6 @@
 #include "fileerr.h"
 #include "ccutil.h"
 
-#define VARDIR        "configs/" /**< variables files */
-#define EXTERN
-
 const ERRCODE NO_PATH =
 "Warning:explicit path for executable will not be used for configs";
 static const ERRCODE USAGE = "Usage";

diff --git a/src/ccutil/scanutils.cpp b/src/ccutil/scanutils.cpp
@@ -441,7 +441,7 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) {
               unsigned length = 0;
               while (width--) {
                 q = fgetc(stream);
-                if (isascii(q) && isspace(q) || q <= 0) {
+                if ((isascii(q) && isspace(q)) || (q <= 0)) {
                   ungetc(q, stream);
                   break;
                 }