X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Focr.h;h=a688742cc631f0bdb88b66bce1b3e8d360713794;hb=75979fe69d99518d9f79d45fb52eb76e05f58053;hp=4b8ff05b9db1e760c528e54fb4d29448cb8f9bbc;hpb=14aa0f5190d3994263941fd67f7e9bcf76192513;p=ypp-sc-tools.web-live.git

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 4b8ff05..a688742 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -1,19 +1,33 @@
+/*
+ * 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 <inttypes.h>
+
 #include <sys/types.h>
 #include <sys/wait.h>
 
+
+typedef struct {
+  int w,h;
+  char d[];
+} CanonImage;
+
 typedef uint32_t Pixcol;
 #define PSPIXCOL(priscan) priscan##32
 
@@ -23,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);
 
@@ -35,15 +51,34 @@ 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(ocr)					\
+   DF(rect)					\
+   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);
 
-
-// #define DEBUG_RECTANGLES
-// #define DEBUG_OCR
-
 #endif /*OCR_H*/