Merge pull request #1039 from stweil/clean

Fix compiler warnings
tesseract-ocr · Jul 15, 2017 · 4b6f0b9 · 4b6f0b9
2 parents 4907a23 + 9929587
commit 4b6f0b9
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 16 deletions.
diff --git a/ccmain/equationdetect.cpp b/ccmain/equationdetect.cpp
@@ -1516,4 +1516,4 @@ void EquationDetect::PrintSpecialBlobsDensity(const ColPartition* part) const {
   tprintf("\n");
 }
 
-};  // namespace tesseract
+}  // namespace tesseract
diff --git a/ccstruct/blobbox.h b/ccstruct/blobbox.h
@@ -233,7 +233,7 @@ class BLOBNBOX:public ELIST_LINK
     }
     void set_reduced_box(TBOX new_box) {
       red_box = new_box;
-      reduced = TRUE;
+      reduced = true;
     }
     inT32 enclosed_area() const {
       return area;
@@ -503,8 +503,8 @@ class BLOBNBOX:public ELIST_LINK
   TBOX box;                     // bounding box
   TBOX red_box;                 // bounding box
   int area:30;                  // enclosed area
-  int joined:1;                 // joined to prev
-  int reduced:1;                // reduced box set
+  unsigned joined:1;            // joined to prev
+  unsigned reduced:1;           // reduced box set
   int repeated_set_;            // id of the set of repeated blobs
   TabType left_tab_type_;       // Indicates tab-stop assessment
   TabType right_tab_type_;      // Indicates tab-stop assessment

diff --git a/ccstruct/blobs.cpp b/ccstruct/blobs.cpp
@@ -62,7 +62,7 @@ const TPOINT kDivisibleVerticalItalic(1, 5);
               F u n c t i o n s
 ----------------------------------------------------------------------*/
 
-CLISTIZE(EDGEPT);
+CLISTIZE(EDGEPT)
 
 // Returns true when the two line segments cross each other.
 // (Moved from outlines.cpp).

diff --git a/ccstruct/blobs.h b/ccstruct/blobs.h
@@ -175,7 +175,7 @@ struct EDGEPT {
 };
 
 // For use in chop and findseam to keep a list of which EDGEPTs were inserted.
-CLISTIZEH(EDGEPT);
+CLISTIZEH(EDGEPT)
 
 struct TESSLINE {
   TESSLINE() : is_hole(false), loop(NULL), next(NULL) {}

diff --git a/ccstruct/ratngs.cpp b/ccstruct/ratngs.cpp
@@ -33,8 +33,8 @@
 
 using tesseract::ScriptPos;
 
-ELISTIZE(BLOB_CHOICE);
-ELISTIZE(WERD_CHOICE);
+ELISTIZE(BLOB_CHOICE)
+ELISTIZE(WERD_CHOICE)
 
 const float WERD_CHOICE::kBadRating = 100000.0;
 // Min offset in baseline-normalized coords to make a character a subscript.

diff --git a/ccutil/ambigs.cpp b/ccutil/ambigs.cpp
@@ -43,7 +43,7 @@ AmbigSpec::AmbigSpec() {
   wrong_ngram_size = 0;
 }
 
-ELISTIZE(AmbigSpec);
+ELISTIZE(AmbigSpec)
 
 // Initializes the ambigs by adding a NULL pointer to each table.
 void UnicharAmbigs::InitUnicharAmbigs(const UNICHARSET& unicharset,

diff --git a/ccutil/ambigs.h b/ccutil/ambigs.h
@@ -134,7 +134,7 @@ class AmbigSpec : public ELIST_LINK {
   AmbigType type;
   int wrong_ngram_size;
 };
-ELISTIZEH(AmbigSpec);
+ELISTIZEH(AmbigSpec)
 
 // AMBIG_TABLE[i] stores a set of ambiguities whose
 // wrong ngram starts with unichar id i.

diff --git a/ccutil/unicharcompress.cpp b/ccutil/unicharcompress.cpp
@@ -71,7 +71,8 @@ static bool DecodeRadicalStrokeTable(STRING* radical_stroke_table,
   radical_stroke_table->split('\n', &lines);
   for (int i = 0; i < lines.size(); ++i) {
     if (lines[i].length() == 0 || lines[i][0] == '#') continue;
-    int unicode, radical, strokes;
+    unsigned unicode;
+    int radical, strokes;
     STRING str_radical;
     if (sscanf(lines[i].string(), "%x\t%d.%d", &unicode, &radical, &strokes) ==
         3) {

diff --git a/cutil/structures.cpp b/cutil/structures.cpp
@@ -33,4 +33,4 @@
 /*----------------------------------------------------------------------
               F u n c t i o n s
 ----------------------------------------------------------------------*/
-makestructure(new_cell, free_cell, list_rec);
+makestructure(new_cell, free_cell, list_rec)
diff --git a/textord/equationdetectbase.cpp b/textord/equationdetectbase.cpp
@@ -62,4 +62,4 @@ void EquationDetectBase::RenderSpecialText(Pix* pix,
   boxDestroy(&box);
 }
 
-};  // namespace tesseract
+}  // namespace tesseract
diff --git a/textord/equationdetectbase.h b/textord/equationdetectbase.h
@@ -54,6 +54,6 @@ class EquationDetectBase {
   static void RenderSpecialText(Pix* pix, BLOBNBOX* blob);
 };
 
-};  // namespace tesseract
+}  // namespace tesseract
 
 #endif  // TESSERACT_TEXTORD_EQUATIONDETECTBASE_H_
diff --git a/wordrec/lm_state.cpp b/wordrec/lm_state.cpp
@@ -22,7 +22,7 @@
 
 namespace tesseract {
 
-ELISTIZE(ViterbiStateEntry);
+ELISTIZE(ViterbiStateEntry)
 
 void ViterbiStateEntry::Print(const char *msg) const {
   tprintf("%s ViterbiStateEntry", msg);

diff --git a/wordrec/lm_state.h b/wordrec/lm_state.h
@@ -187,7 +187,7 @@ struct ViterbiStateEntry : public ELIST_LINK {
   STRING *debug_str;
 };
 
-ELISTIZEH(ViterbiStateEntry);
+ELISTIZEH(ViterbiStateEntry)
 
 /// Struct to store information maintained by various language model components.
 struct LanguageModelState {