X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fstructure.h;h=263a26ad86fe1e8ea5e0ee588b88d4c1cba0393a;hb=b958771fa67513ba09630953ec91b9d21b3f42f9;hp=77396cf390db06ade4c30f7279b0105aa42377c7;hpb=c70c2c7701a7777524881f3f88ab2db2851f932a;p=ypp-sc-tools.web-live.git

diff --git a/pctb/structure.h b/pctb/structure.h
index 77396cf..263a26a 100644
--- a/pctb/structure.h
+++ b/pctb/structure.h
@@ -33,69 +33,59 @@
 #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;							\
-    for (y=0; y<(h); y++) {					\
-      for (x=0; x<(w); x++) {					\
-        const CanonColourInfo *cci;				\
-        unsigned long rgb;					\
-	COMPUTE_RGB;						\
-	for (cci=canoncolourinfos; cci->c; cci++) {		\
-	  if (cci->rgb == rgb) {				\
-	    (im)->d[y*(w) + x]= cci->c;				\
-	    break;						\
-	  }							\
-	}							\
-      }								\
-      if (DEBUGP(rect)) {					\
-	fprintf(debug, "%4d ",y);				\
-	fwrite(im->d + y*w, 1,w, debug);			\
-	fputc('\n',debug);					\
-      }								\
-    }								\
-    debug_flush();						\
-  }while(0)
-
+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];
+}
 
-typedef struct {
-  int w, h;
-  char data[];
-  /* red   = data[ y*w*3 + x*3 + 0 ] = RI_PIXEL(ri,x,y)[0]
-   * green = data[ y*w*3 + x*3 + 1 ] = RI_PIXEL(ri,x,y)[1]
-   * blue  = data[ y*w*3 + x*3 + 2 ] = RI_PIXEL(ri,x,y)[2]
-   */
-} RawImage;
-
-RawImage *alloc_raw_image(int w, int h);
+#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					\
+     *   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));					\
+    (rgb_save)= alloc_rgb_image((w), (h));				\
+									\
+    int x,y;								\
+    for (y=0; y<(h); y++) {						\
+      for (x=0; x<(w); x++) {						\
+        Rgb rgb;							\
+	COMPUTE_RGB;							\
+        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);				\
+	fputc('\n',debug);						\
+      }									\
+    }									\
+    debug_flush();							\
+  }while(0)
 
-#define RI_PIXEL(ri,x,y) ((ri)->data + ((y)*(ri)->w + (x)) * 3)
 
-#define CANONIMG_ALSO_STORERAW(ri)		\
+#define CANONIMG_ALSO_STORERGB(ri)		\
   do{						\
-    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)
 
+
 #endif /*STRUCTURE_H*/