#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() */
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()
*/