X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Focr.h;h=b77a56f8905f5269cddedc4d33de783490ece33a;hb=d3eaa28d304c5b0639bc0f7e29b3285317d5c1e7;hp=d08ae15ba8b0878a990b0a135e39fbf84cdbb0e9;hpb=8787ee59f6840de63bac432b516a30d0dfe22c84;p=ypp-sc-tools.db-test.git

diff --git a/pctb/ocr.h b/pctb/ocr.h
index d08ae15..b77a56f 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -19,17 +20,17 @@ typedef uint32_t Pixcol;
 typedef struct {
   const char *s; /* valid until next call to ocr() */
   int l,r; /* column numbers */
-  int ctx; /* match context index */
+  unsigned ctxmap; /* match context index */
 } OcrResultGlyph;
 
-typedef const struct OcrGlyphContextDeveloperInfo *OcrCellContext;
-extern const struct OcrGlyphContextDeveloperInfo *ocr_celltype_text;
-extern const struct OcrGlyphContextDeveloperInfo *ocr_celltype_number;
+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);
 
-OcrResultGlyph *ocr(OcrReader *rd, int w, Pixcol cols[]);
+OcrResultGlyph *ocr(OcrReader *rd, OcrCellType, int w, Pixcol cols[]);
   /* return value is array terminated by {0,-1,-1}
    * array is valid until next call to ocr()
    */
@@ -41,4 +42,8 @@ void debug_flush(void);
 
 const char *get_vardir(void);
 
+
+/* #define DEBUG_RECTANGLES */
+/* #define DEBUG_OCR */
+
 #endif /*OCR_H*/