X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Focr.h;h=7d70b1de58a65b5600f5d8573aebab10439a1d3d;hb=41ac8cfeadd4eac0927b8fce086c805c2753ba77;hp=7848ae7d2601988043c61363106d8a21a341148f;hpb=a4b2def5d1dfcc917b5797f4ffdfc572b2d2c076;p=ypp-sc-tools.main.git

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 7848ae7..7d70b1d 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -32,8 +32,12 @@
 #include "common.h"
 
 
-#define AADEPTH 3
+#define AADEPTH 2
 #define AAMAXVAL ((1<<AADEPTH)-1)
+ /* Change this ?  Also change in
+  *   dictionary-manager            set aadepth
+  *   dictionary-update-receiver    my $aadepth
+  */
 
 
 typedef uint32_t Pixcolv;
@@ -66,19 +70,32 @@ static inline int pixcol_nonzero(const Pixcol *pixcol) {
 
 #if AADEPTH==3
 # define PRPIXCOL1 "%0*" PRIo32
+# define PIXCOL_P_PER_FMT 1
+#elif AADEPTH==2
+# define PRPIXCOL1 "%0*" PRIx32
+# define PIXCOL_P_PER_FMT 2
 #else
 # error need to implement PRPIXCOL1 for this AADEPTH
 #endif
 
-#if PIXCOL_WORDS==3
+# define PIXCOL_FMT_PER_WORD (PIXCOL_P_PER_WORD / PIXCOL_P_PER_FMT)
+
+#if PIXCOL_WORDS==2
+# define PIXCOL_PRFMT				\
+			      PRPIXCOL1 "-"	\
+			      PRPIXCOL1
+# define PIXCOL_PRVAL(pixcol)						\
+			      PIXCOL_FMT_PER_WORD, (pixcol).w[1],	\
+			      PIXCOL_FMT_PER_WORD, (pixcol).w[0]
+#elif 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]
+# define PIXCOL_PRVAL(pixcol)						\
+			      PIXCOL_FMT_PER_WORD, (pixcol).w[2],	\
+			      PIXCOL_FMT_PER_WORD, (pixcol).w[1],	\
+			      PIXCOL_FMT_PER_WORD, (pixcol).w[0]
 #else
 # error need to implement PIXCOL_PR{FMT,VAL} for this PIXCOL_WORDS
 #endif