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

diff --git a/pctb/structure.h b/pctb/structure.h
index 77396cf..0ad92a6 100644
--- a/pctb/structure.h
+++ b/pctb/structure.h
@@ -77,25 +77,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*/