CanonImage *alloc_canon_image(int w, int h);
-#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; \
- * given the values of \
- * int x,y; \
- * all of which are anamorphic. Result is stored in im. \
- * The COMPUTE_RGB is executed exactly once for \
- * each pixel in reading order. \
- */ \
- (im)= alloc_canon_image((w), (h)); \
- \
- int x,y; \
- 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; \
- } \
- } \
- } \
- if (DEBUGP(rect)) { \
- fprintf(debug, "%4d ",y); \
- fwrite(im->d + y*w, 1,w, debug); \
- fputc('\n',debug); \
- } \
- } \
- debug_flush(); \
+#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; \
+ * given the values of \
+ * int x,y; \
+ * all of which are anamorphic. Result is stored in im. \
+ * The COMPUTE_RGB is executed exactly once for \
+ * each pixel in reading order. \
+ */ \
+ (im)= alloc_canon_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; \
+ 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); \
+ fputc('\n',debug); \
+ } \
+ } \
+ debug_flush(); \
}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]
- */
-} RgbImage;
-
-RgbImage *alloc_rgb_image(int w, int h);
-
-#define RI_PIXEL(ri,x,y) ((ri)->data + ((y)*(ri)->w + (x)) * 3)
-
#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*/