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

diff --git a/pctb/structure.h b/pctb/structure.h
index 77396cf..3e30e28 100644
--- a/pctb/structure.h
+++ b/pctb/structure.h
@@ -77,20 +77,7 @@ 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;				\
@@ -98,4 +85,5 @@ RawImage *alloc_raw_image(int w, int h);
     rip[2]= rgb;				\
   }while(0)
 
+
 #endif /*STRUCTURE_H*/