#include "convert.h"
-typedef struct {
- unsigned long rgb; /* on screen */
- char c; /* canonical */
-} CanonColourInfo;
-
-extern const CanonColourInfo canoncolourinfos[];
+typedef struct { char blue2[256]; } CanonColourInfoBlues;
+typedef struct { CanonColourInfoBlues *green2[256]; } CanonColourInfoGreens;
+typedef struct { CanonColourInfoGreens *red2[256]; } CanonColourInfoReds;
+extern CanonColourInfoReds canoncolourinfo_tree;
CanonImage *alloc_canon_image(int w, int h);
-#define CANONICALISE_IMAGE(im,w,h, COMPUTE_RGB) do{ \
- /* compute_rgb should be a number of statements, or \
- * a block, which assigns to \
- * unsigned long rgb; \
- * given the values of \
- * int x,y; \
- * all of which are anamorphic. Result is stored in im. \
- * The COMPUTE_RGB is executed exactly once for \
- * each pixel in reading order. \
- */ \
- (im)= alloc_canon_image((w), (h)); \
- \
- int x,y; \
- unsigned long last_rgb= ~0UL; \
- int last_c= -1; \
- for (y=0; y<(h); y++) { \
- for (x=0; x<(w); x++) { \
- const CanonColourInfo *cci; \
- unsigned long rgb; \
- COMPUTE_RGB; \
- if (rgb == last_rgb) { \
- (im)->d[y*(w) + x]= last_c; \
- } else { \
- for (cci=canoncolourinfos; cci->c; cci++) { \
- if (cci->rgb == rgb) { \
- last_rgb= rgb; \
- (im)->d[y*(w) + x]= last_c= cci->c; \
- break; \
- } \
- } \
- } \
- } \
- if (DEBUGP(rect)) { \
- fprintf(debug, "%4d ",y); \
- fwrite(im->d + y*w, 1,w, debug); \
- fputc('\n',debug); \
- } \
- } \
- debug_flush(); \
+static inline char canon_lookup_colour(unsigned char r,
+ unsigned char g,
+ unsigned char b) {
+ CanonColourInfoGreens *greens= canoncolourinfo_tree.red2[r];
+ if (!greens) return '?';
+ CanonColourInfoBlues *blues= greens->green2[g];
+ if (!blues) return '?';
+ return blues->blue2[b];
+}
+
+#define CANONICALISE_IMAGE(im,w,h, COMPUTE_RGB) do{ \
+ /* compute_rgb should be a number of statements, or \
+ * a block, which assigns to \
+ * Rgb rgb; \
+ * given the values of \
+ * int x,y; \
+ * all of which are anamorphic. Result is stored in im. \
+ * The COMPUTE_RGB is executed exactly once for \
+ * each pixel in reading order. \
+ */ \
+ (im)= alloc_canon_image((w), (h)); \
+ (im)->rgb= alloc_rgb_image((w), (h)); \
+ \
+ int x,y; \
+ for (y=0; y<(h); y++) { \
+ for (x=0; x<(w); x++) { \
+ unsigned char r,g,b; \
+ COMPUTE_RGB; \
+ CANONIMG_ALSO_STORERGB((im)->rgb); \
+ (im)->d[y*(w) + x]= canon_lookup_colour(r,g,b); \
+ } \
+ if (DEBUGP(rect)) { \
+ fprintf(debug, "%4d ",y); \
+ fwrite(im->d + y*(w), 1,(w), debug); \
+ fputc('\n',debug); \
+ } \
+ } \
+ debug_flush(); \
}while(0)
#define CANONIMG_ALSO_STORERGB(ri) \
do{ \
unsigned char *rip= RI_PIXEL((ri),x,y); \
- rip[0]= rgb >> 16; \
- rip[1]= rgb >> 8; \
- rip[2]= rgb; \
+ rip[0]= r; \
+ rip[1]= g; \
+ rip[2]= b; \
}while(0)
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff