X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=pctb%2Focr.h;h=9a2b2c7c830cb577aa04be935aff7cac7d2bbb66;hp=69ccbe906be30c179d9b0b311aad353f356e04c5;hb=f2358d0ea7b40ba405621947513f48108ca93504;hpb=6e70a6f2ac5765379239252d771f9218a80b9c71

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 69ccbe9..9a2b2c7 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -31,17 +31,6 @@
 
 #include "common.h"
 
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <assert.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <inttypes.h>
-
-#include <sys/wait.h>
-
 
 typedef uint32_t Pixcol;
 #define PSPIXCOL(priscan) priscan##32
@@ -49,7 +38,8 @@ typedef uint32_t Pixcol;
 typedef struct {
   const char *s; /* valid until next call to ocr() */
   int l,r; /* column numbers */
-  unsigned ctxmap; /* match context index */
+  int match; /* match context index */
+  unsigned ctxmap; /* possible match contexts */
 } OcrResultGlyph;
 
 
@@ -61,13 +51,18 @@ const char *ocr_celltype_name(OcrCellType ct);
 
 typedef struct OcrReader OcrReader;
 OcrReader *ocr_init(int h);
+void ocr_showcharsets(void);
 
 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()
    */
 
+
 extern const char *o_resolver;
 
+FILE *resolve_start(void);
+void resolve_finish(void);
+
 
 #endif /*OCR_H*/