Merge pull request #280 from stweil/format

Fix more format string related errors

Author: zdenop

classify/shapeclassifier.cpp

@@ -179,7 +179,7 @@ void ShapeClassifier::UnicharPrintResults(
     if (results[i].fonts.size() != 0) {
       tprintf(" Font Vector:");
       for (int f = 0; f < results[i].fonts.size(); ++f) {
-        tprintf(" %d", results[i].fonts[f]);
+        tprintf(" %d", results[i].fonts[f].fontinfo_id);
       }
     }
     tprintf("\n");

textord/colpartition.cpp

@@ -1527,7 +1527,7 @@ void ColPartition::LineSpacingBlocks(const ICOORD& bleft, const ICOORD& tright,
     } else {
       if (textord_debug_tabfind && !it.empty()) {
         ColPartition* next_part = it.data();
-        tprintf("Spacings equal: upper:%d/%d, lower:%d/%d\n",
+        tprintf("Spacings equal: upper:%d/%d, lower:%d/%d, median:%d/%d\n",
                 part->top_spacing(), part->bottom_spacing(),
                 next_part->top_spacing(), next_part->bottom_spacing(),
                 part->median_size(), next_part->median_size());

textord/tospace.cpp

@@ -1131,7 +1131,7 @@ ROW *Textord::make_prop_words(
         blanks = 0;
       if (tosp_debug_level > 5)
         tprintf
-          ("Repch wd at EOL (%d,%d). rep spacing %d; Lgap:%d (%d blanks)\n",
+          ("Repch wd at EOL (%d,%d). rep spacing %5.2f; Lgap:%d (%d blanks)\n",
           word->bounding_box ().left (), word->bounding_box ().bottom (),
           repetition_spacing, current_gap, blanks);
       word->set_blanks (blanks);
@@ -1686,7 +1686,7 @@ void Textord::mark_gap(
       blob.bottom () + blob.height () / 2.0f);
  }
   if (tosp_debug_level > 5)
-    tprintf ("  (%d,%d) Sp<->Kn Rule %d %d %d %d %d\n",
+    tprintf ("  (%d,%d) Sp<->Kn Rule %d %d %d %d %d %d\n",
       blob.left () - current_gap / 2, blob.bottom (), rule,
       prev_gap, prev_blob_width, current_gap,
       next_blob_width, next_gap);

wordrec/associate.h

@@ -48,7 +48,7 @@ struct AssociateStats {
   }
 
   void Print() {
-    tprintf("AssociateStats: w(%g %d) s(%g %d)\n", shape_cost, bad_shape);
+    tprintf("AssociateStats: w(%g %d)\n", shape_cost, bad_shape);
   }
 
   float shape_cost;           // cost of blob shape