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

diff --git a/pctb/structure.h b/pctb/structure.h
index 77396cf..ec7b4bf 100644
--- 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.	\
@@ -53,23 +61,19 @@ CanonImage *alloc_canon_image(int w, int h);
      * 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++) {					\
-        const CanonColourInfo *cci;				\
-        unsigned long rgb;					\
+        unsigned char r,g,b;					\
 	COMPUTE_RGB;						\
-	for (cci=canoncolourinfos; cci->c; cci++) {		\
-	  if (cci->rgb == rgb) {				\
-	    (im)->d[y*(w) + x]= cci->c;				\
-	    break;						\
-	  }							\
-	}							\
+        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);			\
+	fwrite(im->d + y*(w), 1,(w), debug);			\
 	fputc('\n',debug);					\
       }								\
     }								\
@@ -77,25 +81,13 @@ CanonImage *alloc_canon_image(int w, int h);
   }while(0)
 
 
-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 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;				\
+    unsigned char *rip= RI_PIXEL((ri),x,y);	\
+    rip[0]= r;					\
+    rip[1]= g;					\
+    rip[2]= b;					\
   }while(0)
 
+
 #endif /*STRUCTURE_H*/