cache commodid and stallid in Perl

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

diff --git a/pctb/structure.h b/pctb/structure.h
index ec399a2aaa7cb974dfee2b636971ad2abb348415..263a26ad86fe1e8ea5e0ee588b88d4c1cba0393a 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);
 
-#define CANONICALISE_IMAGE(im,w,h, COMPUTE_RGB) do{                    \
+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,rgb_save, 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.           \
@@ -53,30 +61,19 @@ CanonImage *alloc_canon_image(int w, int h);
      * each pixel in reading order.                                    \
      */                                                                        \
     (im)= alloc_canon_image((w), (h));                                 \
+    (rgb_save)= 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;                                             \
+        Rgb 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;                                                    \
-           }                                                           \
-         }                                                             \
-       }                                                               \
+        CANONIMG_ALSO_STORERGB((rgb_save));                            \
+       (im)->d[y*(w) + x]= canon_lookup_colour(rgb, rgb>>8, rgb>>16);  \
       }                                                                        \
       if (DEBUGP(rect)) {                                              \
        fprintf(debug, "%4d ",y);                                       \
-       fwrite(im->d + y*w, 1,w, debug);                                \
+       fwrite(im->d + y*(w), 1,(w), debug);                            \
        fputc('\n',debug);                                              \
       }                                                                        \
     }                                                                  \
@@ -86,10 +83,8 @@ 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;                               \
+    Rgb *rip= RI_PIXEL32((ri),x,y);            \
+    *rip= rgb;                                 \
   }while(0)