WIP island determination; can recognise a pixmap!

[ypp-sc-tools.db-test.git] / pctb / structure.h

diff --git a/pctb/structure.h b/pctb/structure.h
index 77396cf390db06ade4c30f7279b0105aa42377c7..0ad92a618e62386844f2ac50ebf652ac981ce754 100644 (file)
--- 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*/