WIP island determination; before work on lookup_rgbrect

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

diff --git a/pctb/pages.c b/pctb/pages.c
index 1abc5ed63528e4fbc1881f05b88e04bddb08fdec..8a837595435d8181e7735ee00873fb80a7af7ada 100644 (file)
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -39,6 +39,7 @@
 
 CanonImage *page_images[MAX_PAGES];
 int npages;
+RawImage *page0_rawimage;
 
 char *ocean, *pirate;
 
@@ -364,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) {
+static CanonImage *convert_page(Snapshot *sn, RawImage *ri) {
   ShMask shiftmasks[3];
   CanonImage *im;
 
@@ -391,6 +392,8 @@ static CanonImage *convert_page(Snapshot *sn) {
       rgb |= sample;
       fputc(sample, screenshot_file);
     }
+    if (ri)
+      CANONIMG_ALSO_STORERAW(ri);
   });
 
   sysassert(!ferror(screenshot_file));
@@ -406,8 +409,9 @@ void take_screenshots(void) {
   /* find the window and check it's on the right kind of screen */
   raise_and_get_details();
   wait_for_stability(&current,0,0, "checking current YPP client screen...");
-  test= convert_page(current);
-  find_structure(test, &max_relevant_y);
+  test= convert_page(current, 0);
+  find_structure_commod(test, &max_relevant_y);
+  check_correct_commodities();
   free(test);
 
   /* page to the top - keep pressing page up until the image stops changing */
@@ -423,7 +427,7 @@ void take_screenshots(void) {
       fatal("Paging down seems to generate too many pages - max is %d.",
            MAX_PAGES);
     
-    page_images[npages]= convert_page(current);
+    page_images[npages]= convert_page(current, 0);
     free_snapshot(&last); last=current; current=0;
 
     debugf("PAGING page %d converted\n",npages);
@@ -454,7 +458,8 @@ void take_one_screenshot(void) {
   raise_and_get_details();
   sync_after_input();
   wait_for_stability(&current,0,0, "taking screenshot...");
-  page_images[0]= convert_page(current);
+  //page0_rawimage= alloc_raw_image(sn->width, sn->height);
+  page_images[0]= convert_page(current, 0);
   npages= 1;
   progress_log("collected single screenshot.");
 }