Much better error handling.

[ypp-sc-tools.db-test.git] / pctb / ocr.h

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 5371c75b631ac61ea29db285d883ffc99c416875..5a08b5051dc0902d325c164e5fbac0d554e877e0 100644 (file)
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -6,8 +6,7 @@
 #ifndef OCR_H
 #define OCR_H
 
 #ifndef OCR_H
 #define OCR_H
 

-
-#define _GNU_SOURCE
+#include "common.h"

 
 #include <string.h>
 #include <stdio.h>
 
 #include <string.h>
 #include <stdio.h>


@@ -16,18 +15,11 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>

-#include <stdarg.h>

 #include <inttypes.h>
 
 #include <inttypes.h>
 

-#include <sys/types.h>

 #include <sys/wait.h>
 
 
 #include <sys/wait.h>
 
 

-typedef struct {
-  int w,h;
-  char d[];
-} CanonImage;
-

 typedef uint32_t Pixcol;
 #define PSPIXCOL(priscan) priscan##32
 
 typedef uint32_t Pixcol;
 #define PSPIXCOL(priscan) priscan##32
 


@@ -41,6 +33,7 @@ typedef struct {
 typedef const struct OcrCellTypeInfo *OcrCellType;
 extern const struct OcrCellTypeInfo ocr_celltype_text;
 extern const struct OcrCellTypeInfo ocr_celltype_number;
 typedef const struct OcrCellTypeInfo *OcrCellType;
 extern const struct OcrCellTypeInfo ocr_celltype_text;
 extern const struct OcrCellTypeInfo ocr_celltype_number;

+const char *ocr_celltype_name(OcrCellType ct);

 
 
 typedef struct OcrReader OcrReader;
 
 
 typedef struct OcrReader OcrReader;


@@ -52,49 +45,4 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType, int w, Pixcol cols[]);
    */
 
 
    */
 
 

-/*----- debugging arrangements, rather contingent -----*/
-
-#define DEBUG_FLAG_LIST                                \
-   DF(findypp)                                 \
-   DF(pages)                                   \
-   DF(rect)                                    \
-   DF(ocr)                                     \
-   DF(callout)
-
-enum {
-#define DF(f) dbg__shift_##f,
-  DEBUG_FLAG_LIST
-#undef DF
-};
-enum {
-#define DF(f) dbg_##f = 1 << dbg__shift_##f,
-  DEBUG_FLAG_LIST
-#undef DF
-};
-
-unsigned debug_flags;
-
-#define DEBUGP(f) (!!(debug_flags & dbg_##f))
-
-void debug_flush(void);
-
-#define eassert assert
-#define debug stderr
-
-const char *get_vardir(void);
-
-#define DEFINE_VWRAPPERF(decls, funcf)                                 \
-  decls void funcf(const char *fmt, ...) {                             \
-    va_list al;  va_start(al,fmt);  v##funcf(fmt,al);  va_end(al);     \
-  }
-
-#define DEBUG_DEFINE_SOME_DEBUGF(fl,funcf)                             \
-  static void v##funcf(const char *fmt, va_list al) {                  \
-    if (DEBUGP(fl))                                                    \
-      vfprintf(debug,fmt,al);                                          \
-  }                                                                    \
-  DEFINE_VWRAPPERF(static, funcf)
-
-#define DEBUG_DEFINE_DEBUGF(fl) DEBUG_DEFINE_SOME_DEBUGF(fl,debugf)
-

 #endif /*OCR_H*/
 #endif /*OCR_H*/