X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fstructure.c;h=bf4fcbd6399c496e0e800b3d05f5f16ad12d7129;hp=370892c2785b02fb26c9e2dbfe91f4a4f975c34c;hb=9334b48a221df6f96a88933be8fde35e2ef41b35;hpb=05700033bb05f67407798385699519a96da803c0;ds=sidebyside

diff --git a/pctb/structure.c b/pctb/structure.c
index 370892c..bf4fcbd 100644
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -378,7 +378,6 @@ static void file_read_image_ppm(FILE *f) {
   struct pam inpam;
   unsigned char rgb_buf[3];
   CanonImage *im;
-  RgbImage *ri=0;
 
   pnm_readpaminit(f, &inpam, sizeof(inpam));
   if (!(inpam.maxval == 255 &&
@@ -386,9 +385,6 @@ static void file_read_image_ppm(FILE *f) {
 	inpam.format == RPPM_FORMAT))
     fatal("PNM screenshot(s) file must be 8bpp 1 byte per sample RGB");
 
-  if (!npages)
-    page0_rgbimage= ri= alloc_rgb_image(inpam.width, inpam.height);
-
   CANONICALISE_IMAGE(im, inpam.width, inpam.height, {
     int r= fread(&rgb_buf,1,3,f);
     sysassert(!ferror(f));
@@ -399,8 +395,6 @@ static void file_read_image_ppm(FILE *f) {
 	((unsigned long)rgb_buf[1]<<8) |
 	               (rgb_buf[2]);
 
-    if (ri)
-      CANONIMG_ALSO_STORERGB(ri);
   });
 
   sysassert(!ferror(screenshot_file));
@@ -563,7 +557,7 @@ void find_islandname(RgbImage *ri) {
 
   const unsigned char *srcp;
   unsigned char *destp, *endp;
-  for (srcp=page0_rgbimage->data, destp=ri->data,
+  for (srcp=page_images[0]->rgb->data, destp=ri->data,
 	 endp= ri->data + 3 * ri->w * ri->h;
        destp < endp;
        srcp++, destp++) {