CanonImage *page_images[MAX_PAGES];
int npages;
-RawImage *page0_rawimage;
+RgbImage *page0_rgbimage;
char *ocean, *pirate;
assert(sm->rshift < LONG_BIT);
}
-static CanonImage *convert_page(Snapshot *sn, RawImage *ri) {
+static CanonImage *convert_page(Snapshot *sn, RgbImage *ri) {
ShMask shiftmasks[3];
CanonImage *im;
fputc(sample, screenshot_file);
}
if (ri)
- CANONIMG_ALSO_STORERAW(ri);
+ CANONIMG_ALSO_STORERGB(ri);
});
sysassert(!ferror(screenshot_file));
raise_and_get_details();
sync_after_input();
wait_for_stability(¤t,0,0, "taking screenshot...");
- //page0_rawimage= alloc_raw_image(sn->width, sn->height);
+ //page0_rgbimage= alloc_rgb_image(sn->width, sn->height);
page_images[0]= convert_page(current, 0);
npages= 1;
progress_log("collected single screenshot.");
static Rect islandnamer;
-void find_structure_islandname(CanonImage *im, RawImage *ri) {
+void find_structure_islandname(CanonImage *im, RgbImage *ri) {
Rect sunshiner;
sunshiner.tl.x= cim->w - 1034 + 885;
* 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;
+} RgbImage;
-RawImage *alloc_raw_image(int w, int h);
+RgbImage *alloc_rgb_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; \