X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Focr.h;h=d9a25f7a790da26812b5352a5d397f4c94e18352;hb=6a62bf40d383872f274943b2fd062593b51e08a6;hp=26bccbc7b83b81bb693b27995063ed7cedbecc1d;hpb=24222363faec9b4e3d7074af2df5f39933613c7f;p=ypp-sc-tools.db-test.git

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 26bccbc..d9a25f7 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -1,14 +1,28 @@
 #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 <stdarg.h>
+#include <time.h>
+
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/time.h>
+
+
+typedef struct {
+  int w,h;
+  char d[];
+} CanonImage;
+
 
 typedef uint32_t Pixcol;
 #define PSPIXCOL(priscan) priscan##32
@@ -16,19 +30,37 @@ 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;
 
-OcrResultGlyph *ocr(int w, int h, Pixcol cols[]);
+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, OcrCellType, int w, Pixcol cols[]);
   /* return value is array terminated by {0,-1,-1}
    * array is valid until next call to ocr()
    */
 
-void ocr_init(void);
-
 void debug_flush(void);
 
 #define eassert assert
 #define debug stdout
 
+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 DEBUG_RECTANGLES
+// #define DEBUG_OCR
+
 #endif /*OCR_H*/