comparison src/image.c @ 112106:70be6bbb683b

Don't use png_jmpbuf, it doesn't work with dynamic loading. image.c (png_jmpbuf): Remove definition. (my_png_error, png_load): Don't use png_jmpbuf.

112105:d0bb1b112e73

#define fn_png_read_end			png_read_end
#define fn_png_error			png_error

#endif /* HAVE_NTGUI */

/* libpng before 1.4.0 didn't have png_jmpbuf; v1.4.0 and later
   deprecate direct access to png_ptr fields.  */
#ifndef png_jmpbuf
# define png_jmpbuf(PTR)  ((PTR)->jmpbuf)
#endif

/* Error and warning handlers installed when the PNG library
   is initialized.  */

static void
my_png_error (png_struct *png_ptr, const char *msg)
{
  xassert (png_ptr != NULL);
  /* Avoid compiler warning about deprecated direct access to
     png_ptr's fields in libpng versions 1.4.x.  */
  image_error ("PNG error: %s", build_string (msg), Qnil);
  longjmp (png_jmpbuf (png_ptr), 1);
}


static void
my_png_warning (png_struct *png_ptr, const char *msg)

      return 0;
    }

  /* Set error jump-back.  We come back here when the PNG library
     detects an error.  */
  if (setjmp (png_jmpbuf (png_ptr)))
    {
    error:
      if (png_ptr)
        fn_png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
      xfree (pixels);

112106:70be6bbb683b

#define fn_png_read_end			png_read_end
#define fn_png_error			png_error

#endif /* HAVE_NTGUI */

/* Error and warning handlers installed when the PNG library
   is initialized.  */

static void
my_png_error (png_struct *png_ptr, const char *msg)
{
  xassert (png_ptr != NULL);
  /* Avoid compiler warning about deprecated direct access to
     png_ptr's fields in libpng versions 1.4.x.  */
  image_error ("PNG error: %s", build_string (msg), Qnil);
  longjmp (png_ptr->jmpbuf, 1);
}


static void
my_png_warning (png_struct *png_ptr, const char *msg)

      return 0;
    }

  /* Set error jump-back.  We come back here when the PNG library
     detects an error.  */
  if (setjmp (png_ptr->jmpbuf))
    {
    error:
      if (png_ptr)
        fn_png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
      xfree (pixels);