X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Focr.h;h=7848ae7d2601988043c61363106d8a21a341148f;hp=943c2105c51189337e1eda759073a0213f3e3f48;hb=5bcf61f52358ce7a1ceea3106c4c8a2d0a6dbfcd;hpb=74e4e249f2c3e848592984cb193aded6a77a341d

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 943c210..7848ae7 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -32,13 +32,62 @@
 #include "common.h"
 
 
-typedef uint32_t Pixcol;
-#define PSPIXCOL(priscan) priscan##32
+#define AADEPTH 3
+#define AAMAXVAL ((1<<AADEPTH)-1)
+
+
+typedef uint32_t Pixcolv;
+#define PIXCOL_P_PER_WORD (32 / AADEPTH)
+
+#define OCR_MAX_H    30
+#define PIXCOL_WORDS ((OCR_MAX_H + PIXCOL_P_PER_WORD - 1) / PIXCOL_P_PER_WORD)
+
+typedef struct { Pixcolv w[PIXCOL_WORDS]; } Pixcol;
+
+static inline int pixcol_p_word(int y) {
+  return y / PIXCOL_P_PER_WORD;
+}
+static inline int pixcol_p_shift(int y) {
+  return (y % PIXCOL_P_PER_WORD)*AADEPTH;
+}
+static inline void pixcol_p_add(Pixcol *pixcol, int y, unsigned pixval) {
+  pixcol->w[pixcol_p_word(y)] |= pixval << pixcol_p_shift(y);
+}
+static inline unsigned int pixcol_p_get(const Pixcol *pixcol, int y) {
+  return (pixcol->w[pixcol_p_word(y)] >> pixcol_p_shift(y)) & AAMAXVAL;
+}
+static inline int pixcol_cmp(const Pixcol *pixcol1, const Pixcol *pixcol2) {
+  return memcmp(pixcol1, pixcol2, sizeof(*pixcol1));
+}
+static inline int pixcol_nonzero(const Pixcol *pixcol) {
+  static const Pixcol zero;
+  return pixcol_cmp(pixcol, &zero);
+}
+
+#if AADEPTH==3
+# define PRPIXCOL1 "%0*" PRIo32
+#else
+# error need to implement PRPIXCOL1 for this AADEPTH
+#endif
+
+#if PIXCOL_WORDS==3
+# define PIXCOL_PRFMT				\
+			      PRPIXCOL1 "-"	\
+			      PRPIXCOL1 "-"	\
+			      PRPIXCOL1
+# define PIXCOL_PRVAL(pixcol)					\
+			      PIXCOL_P_PER_WORD, (pixcol).w[2],	\
+			      PIXCOL_P_PER_WORD, (pixcol).w[1],	\
+			      PIXCOL_P_PER_WORD, (pixcol).w[0]
+#else
+# error need to implement PIXCOL_PR{FMT,VAL} for this PIXCOL_WORDS
+#endif
 
 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;
 
 
@@ -50,13 +99,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[]);
+OcrResultGlyph *ocr(OcrReader *rd, OcrCellType, int w, const 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*/