New colour canonification based on tree

[ypp-sc-tools.db-test.git] / pctb / structure.h

diff --git a/pctb/structure.h b/pctb/structure.h
index f3fbb72ed2d157ea01a3b103e2d2854544bb2f85..ec7b4bf5b2490411141b66eb2e996d0423b80fe3 100644 (file)
--- a/pctb/structure.h
+++ b/pctb/structure.h
@@ -33,19 +33,27 @@
 #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);
 
+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                               \
-     *   unsigned long rgb;                                    \
+     *   Rgb rgb;                                              \
      * given the values of                                     \
      *   int x,y;                                              \
      * all of which are anamorphic.  Result is stored in im.   \
@@ -56,25 +64,12 @@ CanonImage *alloc_canon_image(int w, int h);
     (im)->rgb= alloc_rgb_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;                                     \
+        unsigned char r,g,b;                                   \
        COMPUTE_RGB;                                            \
         CANONIMG_ALSO_STORERGB((im)->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;                                            \
-           }                                                   \
-         }                                                     \
-       }                                                       \
+       (im)->d[y*(w) + x]= canon_lookup_colour(r,g,b);         \
       }                                                                \
       if (DEBUGP(rect)) {                                      \
        fprintf(debug, "%4d ",y);                               \
@@ -89,9 +84,9 @@ CanonImage *alloc_canon_image(int w, int h);
 #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)