X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fstructure.h;h=f3fbb72ed2d157ea01a3b103e2d2854544bb2f85;hp=77396cf390db06ade4c30f7279b0105aa42377c7;hb=9334b48a221df6f96a88933be8fde35e2ef41b35;hpb=c70c2c7701a7777524881f3f88ab2db2851f932a

diff --git a/pctb/structure.h b/pctb/structure.h
index 77396cf..f3fbb72 100644
--- a/pctb/structure.h
+++ b/pctb/structure.h
@@ -53,23 +53,32 @@ 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;							\
+    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;						\
-	for (cci=canoncolourinfos; cci->c; cci++) {		\
-	  if (cci->rgb == rgb) {				\
-	    (im)->d[y*(w) + x]= cci->c;				\
-	    break;						\
+        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;						\
+	    }							\
 	  }							\
 	}							\
       }								\
       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 +86,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);		\
+    unsigned char *rip= RI_PIXEL((ri),x,y);	\
     rip[0]= rgb >> 16;				\
     rip[1]= rgb >> 8;				\
     rip[2]= rgb;				\
   }while(0)
 
+
 #endif /*STRUCTURE_H*/