Re: Image support for Carbon Emacs

[YAMAMOTO Mitsuharu]

>>>>> On Fri, 16 Jan 2004 01:54:29 +0100, Hans-Peter Binder <address@hidden> 
>>>>> said:

> But when I try to view a PBM-File Emacs crashed.

Thanks for your experiment and report.  I could reproduce the problem
in Mac OS X 10.2.8.  In pbm_load, neither img->width nor img->height
are set before calling image_background, and that caused the crash.  I
think similar changes are also needed for xfns.c and w32fns.c.

                                     YAMAMOTO Mitsuharu
                                address@hidden

*** src/macfns.c-20040113       Tue Jan 13 17:38:05 2004
--- src/macfns.c        Fri Jan 16 13:03:32 2004
***************
*** 6926,6931 ****
--- 6926,6934 ----
    free_color_table ();
  #endif
  
+   img->width = width;
+   img->height = height;
+ 
    /* Maybe fill in the background field while we have ximg handy. */
    if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
      IMAGE_BACKGROUND (img, f, ximg);
***************
*** 6933,6941 ****
    /* Put the image into a pixmap.  */
    x_put_x_image (f, ximg, img->pixmap, width, height);
    x_destroy_x_image (ximg);
- 
-   img->width = width;
-   img->height = height;
  
    UNGCPRO;
    xfree (contents);
--- 6936,6941 ----