X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Focr.h;h=5371c75b631ac61ea29db285d883ffc99c416875;hb=4903e3f2fbd534bde1bc3ebc4d84328297e0b388;hp=d9a25f7a790da26812b5352a5d397f4c94e18352;hpb=024dcba9bc55d02e5c05100ed65f8d64a1eb3bbf;p=ypp-sc-tools.db-live.git

diff --git a/pctb/ocr.h b/pctb/ocr.h
index d9a25f7..5371c75 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -1,21 +1,26 @@
+/*
+ * ocr.c forms a mostly-self-contained bit
+ * so we put its declarations in this separate file
+ */
+
 #ifndef OCR_H
 #define OCR_H
 
+
 #define _GNU_SOURCE
 
-#include <pam.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <assert.h>
 #include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <errno.h>
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <stdarg.h>
-#include <time.h>
+#include <inttypes.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 
 
 typedef struct {
@@ -23,7 +28,6 @@ typedef struct {
   char d[];
 } CanonImage;
 
-
 typedef uint32_t Pixcol;
 #define PSPIXCOL(priscan) priscan##32
 
@@ -33,10 +37,12 @@ typedef struct {
   unsigned ctxmap; /* match context index */
 } OcrResultGlyph;
 
+
 typedef const struct OcrCellTypeInfo *OcrCellType;
 extern const struct OcrCellTypeInfo ocr_celltype_text;
 extern const struct OcrCellTypeInfo ocr_celltype_number;
 
+
 typedef struct OcrReader OcrReader;
 OcrReader *ocr_init(int h);
 
@@ -45,22 +51,50 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType, int w, Pixcol cols[]);
    * array is valid until next call to ocr()
    */
 
+
+/*----- 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 stdout
+#define debug stderr
 
 const char *get_vardir(void);
 
-CanonImage *file_read_image(FILE *f);
-int main_test(void);
-
-#define MAX_PAGES 100
-extern CanonImage *page_images[MAX_PAGES];
-extern int npages;
+#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_RECTANGLES
-// #define DEBUG_OCR
+#define DEBUG_DEFINE_DEBUGF(fl) DEBUG_DEFINE_SOME_DEBUGF(fl,debugf)
 
 #endif /*OCR_H*/