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

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 8e1263d..5371c75 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -1,28 +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 DEBUG_RECTANGLES
-// #define DEBUG_OCR
-
-
-
 #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 <limits.h>
+#include <inttypes.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 
 
 typedef struct {
@@ -30,7 +28,6 @@ typedef struct {
   char d[];
 } CanonImage;
 
-
 typedef uint32_t Pixcol;
 #define PSPIXCOL(priscan) priscan##32
 
@@ -40,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);
 
@@ -52,68 +51,50 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType, int w, Pixcol cols[]);
    * array is valid until next call to ocr()
    */
 
-void debug_flush(void);
 
-void find_structure(CanonImage *im);
+/*----- debugging arrangements, rather contingent -----*/
 
-#define eassert assert
-#define debug stdout
+#define DEBUG_FLAG_LIST				\
+   DF(findypp)					\
+   DF(pages)					\
+   DF(rect)					\
+   DF(ocr)					\
+   DF(callout)
 
-const char *get_vardir(void);
+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;
 
-CanonImage *file_read_image(FILE *f);
-int main_test(void);
+#define DEBUGP(f) (!!(debug_flags & dbg_##f))
 
-#define MAX_PAGES 100
-extern CanonImage *page_images[MAX_PAGES];
-extern int npages;
+void debug_flush(void);
 
+#define eassert assert
+#define debug stderr
 
-typedef struct {
-  unsigned long rgb; /* on screen */
-  char c; /* canonical */
-} CanonColourInfo;
-
-extern const CanonColourInfo canoncolourinfos[];
-
-CanonImage *alloc_canon_image(int w, int h);
-
-#ifdef DEBUG_RECTANGLES
-# define CANIMG_DEBUG_RECTANGLE_1LINE(im,w,h)	\
-      fprintf(debug, "%4d ",y);			\
-      r= fwrite(im->d + y*w, 1,w, debug);	\
-      eassert(r==w);				\
-      fputc('\n',debug);
-#else
-# define CANIMG_DEBUG_RECTANGLE_1LINE(im,y,h) /* nothing */
-#endif
-
-#define CANONICALISE_IMAGE(im,w,h, COMPUTE_RGB) do{		\
-    /* compute_rgb should be a number of statements, or		\
-     * a block, which assigns to				\
-     *   unsigned long rgb;					\
-     * given the values of					\
-     *   int x,y;						\
-     * all of which are anamorphic.  Result is stored in im.	\
-     */								\
-    (im)= alloc_canon_image((w), (h));				\
-								\
-    int x,y,r;							\
-    for (y=0; y<(h); y++) {					\
-      for (x=0; x<(w); x++) {					\
-        const CanonColourInfo *cci;				\
-        unsigned long rgb;					\
-	COMPUTE_RGB;						\
-	for (cci=canoncolourinfos; cci->c; cci++)		\
-	  if (cci->rgb == rgb) {				\
-	    (im)->d[y*(w) + x]= cci->c;				\
-	    break;						\
-	  }							\
-      }								\
-      CANIMG_DEBUG_RECTANGLE_1LINE((im),(w),(h))		\
-    }								\
-    debug_flush();						\
-  }while(0)
+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*/