comparison src/image.c @ 112152:f87a5809d0c2

Fix some resource leaks in ImageMagick image loader * src/image.c (imagemagick_load_image): Fix some resource leaks and error handling.

112151:5ba6192ecf75

/* Functions for image support on window system.
   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
                 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
                 Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

      image_info->number_scenes = 1;
      image_info->scene = ino;
      exception = AcquireExceptionInfo ();

      im_image = ReadImage (image_info, exception);
      CatchException (exception);

      image_wand = NewMagickWandFromImage (im_image);
    }
  else
    {
      image_wand = NewMagickWand ();
      status = MagickReadImageBlob (image_wand, contents, size);

  /* Finaly we are done manipulating the image, figure out resulting
     width, height, and then transfer ownerwship to Emacs.  */
  height = MagickGetImageHeight (image_wand);
  width = MagickGetImageWidth (image_wand);
  if (status == MagickFalse)
    {
      image_error ("Imagemagick image get size failed", Qnil, Qnil);
      goto imagemagick_error;
    }

  if (! check_image_size (f, width, height))
    {
      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
      goto imagemagick_error;

    {
      /* Try to create a x pixmap to hold the imagemagick pixmap.  */
      if (!x_create_x_image_and_pixmap (f, width, height, 0,
                                        &ximg, &img->pixmap))
        {
          image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
          goto imagemagick_error;
        }

      /* Copy imagegmagick image to x with primitive yet robust pixel

      /* Copy pixels from the imagemagick image structure to the x image map. */
      iterator = NewPixelIterator (image_wand);
      if (iterator == (PixelIterator *) NULL)
        {
          image_error ("Imagemagick pixel iterator creation failed",
                       Qnil, Qnil);
          goto imagemagick_error;
        }

      char* exportdepth = imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/
      /* Try to create a x pixmap to hold the imagemagick pixmap.  */
      if (!x_create_x_image_and_pixmap (f, width, height, imagedepth,
                                        &ximg, &img->pixmap))
	{
	  image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
	  goto imagemagick_error;
	}

  DestroyMagickWand (image_wand);

  return 1;

 imagemagick_error:
  /* TODO more cleanup.  */
  image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil);
  return 0;
}

112152:f87a5809d0c2

/* Functions for image support on window system.
   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
                 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
		 2011 Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

      image_info->number_scenes = 1;
      image_info->scene = ino;
      exception = AcquireExceptionInfo ();

      im_image = ReadImage (image_info, exception);
      DestroyExceptionInfo (exception);

      if (im_image != NULL)
	{
	  image_wand = NewMagickWandFromImage (im_image);
	  status = MagickTrue;
	}
      else
	status = MagickFalse;
    }
  else
    {
      image_wand = NewMagickWand ();
      status = MagickReadImageBlob (image_wand, contents, size);

  /* Finaly we are done manipulating the image, figure out resulting
     width, height, and then transfer ownerwship to Emacs.  */
  height = MagickGetImageHeight (image_wand);
  width = MagickGetImageWidth (image_wand);

  if (! check_image_size (f, width, height))
    {
      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
      goto imagemagick_error;

    {
      /* Try to create a x pixmap to hold the imagemagick pixmap.  */
      if (!x_create_x_image_and_pixmap (f, width, height, 0,
                                        &ximg, &img->pixmap))
        {
#ifdef COLOR_TABLE_SUPPORT
	  free_color_table ();
#endif
          image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
          goto imagemagick_error;
        }

      /* Copy imagegmagick image to x with primitive yet robust pixel

      /* Copy pixels from the imagemagick image structure to the x image map. */
      iterator = NewPixelIterator (image_wand);
      if (iterator == (PixelIterator *) NULL)
        {
#ifdef COLOR_TABLE_SUPPORT
	  free_color_table ();
#endif
	  x_destroy_x_image (ximg);
          image_error ("Imagemagick pixel iterator creation failed",
                       Qnil, Qnil);
          goto imagemagick_error;
        }

      char* exportdepth = imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/
      /* Try to create a x pixmap to hold the imagemagick pixmap.  */
      if (!x_create_x_image_and_pixmap (f, width, height, imagedepth,
                                        &ximg, &img->pixmap))
	{
#ifdef COLOR_TABLE_SUPPORT
	  free_color_table ();
#endif
	  image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
	  goto imagemagick_error;
	}

  DestroyMagickWand (image_wand);

  return 1;

 imagemagick_error:
  DestroyMagickWand (image_wand);
  /* TODO more cleanup.  */
  image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil);
  return 0;
}