#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;
#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