WIP island determination; rename rawimage etc. to rgbimage

[ypp-sc-tools.db-test.git] / pctb / pages.c

diff --git a/pctb/pages.c b/pctb/pages.c
index 8a837595435d8181e7735ee00873fb80a7af7ada..17ec836c0729d2e6c71a29322507b6c7f393413e 100644 (file)
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -39,7 +39,7 @@
 
 CanonImage *page_images[MAX_PAGES];
 int npages;
-RawImage *page0_rawimage;
+RgbImage *page0_rgbimage;
 
 char *ocean, *pirate;
 
@@ -365,7 +365,7 @@ static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) {
   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;
 
@@ -393,7 +393,7 @@ static CanonImage *convert_page(Snapshot *sn, RawImage *ri) {
       fputc(sample, screenshot_file);
     }
     if (ri)
-      CANONIMG_ALSO_STORERAW(ri);
+      CANONIMG_ALSO_STORERGB(ri);
   });
 
   sysassert(!ferror(screenshot_file));
@@ -458,7 +458,7 @@ void take_one_screenshot(void) {
   raise_and_get_details();
   sync_after_input();
   wait_for_stability(&current,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.");