- CanonImage *im= malloc(sizeof(CanonImage) + inpam.width*inpam.height);
- eassert(im);
- im->h= inpam.height;
- im->w= inpam.width;
-
- memset(im->d,'?',inpam.width*inpam.height);
-
- for (y=0; y<inpam.height; y++) {
- for (x=0; x<inpam.width; x++) {
- r= fread(&rgb,1,3,f); eassert(r==3);
- unsigned long rgb_l=
- ((unsigned long)rgb[0]<<16) |
- ((unsigned long)rgb[1]<<8) |
- (rgb[2]);
- for (cci=canoncolourinfos; cci->c; cci++)
- if (cci->rgb == rgb_l) {
- im->d[y*inpam.width + x]= cci->c;
- break;
- }
- }
-#ifdef DEBUG_RECTANGLES
- fprintf(debug, "%4d ",y);
- r= fwrite(im->d + y*inpam.width, 1,inpam.width, debug);
- eassert(r==inpam.width);
- fputc('\n',debug);
-#endif
- }
- debug_flush();
+ CANONICALISE_IMAGE(im, inpam.width, inpam.height, {
+ r= fread(&rgb_buf,1,3,f); eassert(r==3);
+
+ rgb=
+ ((unsigned long)rgb_buf[0]<<16) |
+ ((unsigned long)rgb_buf[1]<<8) |
+ (rgb_buf[2]);
+ });
+