Fix compiler warnings in c_blob_comparator and make it a local function

Compiler warnings from clang:

src/ccstruct/genblob.cpp:34:20: warning:
 use of old-style cast [-Wold-style-cast]
src/ccstruct/genblob.cpp:34:32: warning:
 cast from 'const void *' to 'C_BLOB **' drops const qualifier [-Wcast-qual]
src/ccstruct/genblob.cpp:35:20: warning:
 use of old-style cast [-Wold-style-cast]
src/ccstruct/genblob.cpp:35:32: warning:
 cast from 'const void *' to 'C_BLOB **' drops const qualifier [-Wcast-qual]

The function c_blob_comparator is only used in fixspace.cpp,
so move it to that file, make it a local function, and remove
genblob.cpp and genblob.h which are no longer needed.

Signed-off-by: Stefan Weil <[email protected]>

Author: stweil

src/ccmain/fixspace.cpp

@@ -24,7 +24,6 @@
 #include "blobs.h"             // for TWERD, TBLOB, TESSLINE
 #include "boxword.h"           // for BoxWord
 #include "errcode.h"           // for ASSERT_HOST
-#include "genblob.h"           // for c_blob_comparator
 #include "host.h"              // for FALSE, TRUE
 #include "normalis.h"          // for kBlnXHeight, kBlnBaselineOffset
 #include "ocrclass.h"          // for ETEXT_DESC
@@ -49,6 +48,23 @@ class ROW;
 
 namespace tesseract {
 
+/**********************************************************************
+ *  c_blob_comparator()
+ *
+ *  Blob comparator used to sort a blob list so that blobs are in increasing
+ *  order of left edge.
+ **********************************************************************/
+
+static int c_blob_comparator(              // sort blobs
+                      const void *blob1p,  // ptr to ptr to blob1
+                      const void *blob2p   // ptr to ptr to blob2
+                     ) {
+  const C_BLOB *blob1 = *reinterpret_cast<const C_BLOB* const*>(blob1p);
+  const C_BLOB *blob2 = *reinterpret_cast<const C_BLOB* const*>(blob2p);
+
+  return blob1->bounding_box ().left () - blob2->bounding_box ().left ();
+}
+
 /**
  * @name fix_fuzzy_spaces()
  * Walk over the page finding sequences of words joined by fuzzy spaces. Extract

src/ccstruct/Makefile.am

@@ -14,7 +14,7 @@ pkginclude_HEADERS = publictypes.h
 noinst_HEADERS = \
     blamer.h blobbox.h blobs.h blread.h boxread.h boxword.h \
     ccstruct.h coutln.h crakedge.h \
-    debugpixa.h detlinefit.h dppoint.h fontinfo.h genblob.h \
+    debugpixa.h detlinefit.h dppoint.h fontinfo.h \
     imagedata.h \
     ipoints.h \
     linlsq.h matrix.h mod128.h normalis.h \
@@ -28,7 +28,7 @@ noinst_LTLIBRARIES = libtesseract_ccstruct.la
 
 libtesseract_ccstruct_la_SOURCES = \
     blamer.cpp blobbox.cpp blobs.cpp blread.cpp boxread.cpp boxword.cpp ccstruct.cpp coutln.cpp \
-    detlinefit.cpp dppoint.cpp fontinfo.cpp genblob.cpp \
+    detlinefit.cpp dppoint.cpp fontinfo.cpp \
     imagedata.cpp \
     linlsq.cpp matrix.cpp mod128.cpp normalis.cpp \
     ocrblock.cpp ocrpara.cpp ocrrow.cpp otsuthr.cpp \