comparison src/image.c @ 66430:2f521eba6f82

[MAC_OS] (image_load_qt_1): Check image size. Use GraphicsImportGetImageDescription instead of GraphicsImportGetNaturalBounds. [MAC_OSX] (image_load_quartz2d): Check image size. [MAC_OS] (xpm_load_image): Likewise.

66429:2b2388e245c9

{
  OSErr err;
  GraphicsImportComponent gi;
  Rect rect;
  int width, height;
  short draw_all_pixels;
  Lisp_Object specified_bg;
  XColor color;
  XImagePtr ximg;
  RGBColor bg_color;

	  image_error ("Cannot set data handle to graphics importer for `%s'",
		       img->spec, Qnil);
	  goto error;
	}
    }
  err = GraphicsImportGetNaturalBounds (gi, &rect);
  if (err != noErr)
    {
      image_error ("Error reading `%s'", img->spec, Qnil);
      goto error;
    }
  width = img->width = rect.right - rect.left;
  height = img->height = rect.bottom - rect.top;
  err = GraphicsImportDoesDrawAllPixels (gi, &draw_all_pixels);
#if 0
  /* Don't check the error code here.  It may have an undocumented
     value -32766. */
  if (err != noErr)

    {
      UNGCPRO;
      image_error ("Error reading image `%s'", img->spec, Qnil);
      return 0;
    }

  if (png_p)
    {
      specified_bg = image_spec_value (img->spec, QCbackground, NULL);
      if (!STRINGP (specified_bg) ||

	  color.red = RED16_FROM_ULONG (color.pixel);
	  color.green = GREEN16_FROM_ULONG (color.pixel);
	  color.blue = BLUE16_FROM_ULONG (color.pixel);
	}
    }
  width = img->width = CGImageGetWidth (image);
  height = img->height = CGImageGetHeight (image);
  if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
    {
      CGImageRelease (image);
      UNGCPRO;
      return 0;

  if (sscanf (buffer, "%d %d %d %d", &width, &height,
	      &num_colors, &chars_per_pixel) != 4
      || width <= 0 || height <= 0
      || num_colors <= 0 || chars_per_pixel <= 0)
    goto failure;
  expect (',');

  XSETFRAME (frame, f);
  if (!NILP (Fxw_display_color_p (frame)))
    best_key = XPM_COLOR_KEY_C;

66430:2f521eba6f82

{
  OSErr err;
  GraphicsImportComponent gi;
  Rect rect;
  int width, height;
  ImageDescriptionHandle desc_handle;
  short draw_all_pixels;
  Lisp_Object specified_bg;
  XColor color;
  XImagePtr ximg;
  RGBColor bg_color;

	  image_error ("Cannot set data handle to graphics importer for `%s'",
		       img->spec, Qnil);
	  goto error;
	}
    }
  err = GraphicsImportGetImageDescription (gi, &desc_handle);
  if (err != noErr || desc_handle == NULL)
    {
      image_error ("Error reading `%s'", img->spec, Qnil);
      goto error;
    }
  width = img->width = (*desc_handle)->width;
  height = img->height = (*desc_handle)->height;
  DisposeHandle ((Handle)desc_handle);

  if (!check_image_size (f, width, height))
    {
      image_error ("Invalid image size", Qnil, Qnil);
      goto error;
    }

  err = GraphicsImportDoesDrawAllPixels (gi, &draw_all_pixels);
#if 0
  /* Don't check the error code here.  It may have an undocumented
     value -32766. */
  if (err != noErr)

    {
      UNGCPRO;
      image_error ("Error reading image `%s'", img->spec, Qnil);
      return 0;
    }
  width = img->width = CGImageGetWidth (image);
  height = img->height = CGImageGetHeight (image);

  if (!check_image_size (f, width, height))
    {
      UNGCPRO;
      image_error ("Invalid image size", Qnil, Qnil);
      return 0;
    }

  if (png_p)
    {
      specified_bg = image_spec_value (img->spec, QCbackground, NULL);
      if (!STRINGP (specified_bg) ||

	  color.red = RED16_FROM_ULONG (color.pixel);
	  color.green = GREEN16_FROM_ULONG (color.pixel);
	  color.blue = BLUE16_FROM_ULONG (color.pixel);
	}
    }

  if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
    {
      CGImageRelease (image);
      UNGCPRO;
      return 0;

  if (sscanf (buffer, "%d %d %d %d", &width, &height,
	      &num_colors, &chars_per_pixel) != 4
      || width <= 0 || height <= 0
      || num_colors <= 0 || chars_per_pixel <= 0)
    goto failure;

  if (!check_image_size (f, width, height))
    {
      image_error ("Invalid image size", Qnil, Qnil);
      goto failure;
    }

  expect (',');

  XSETFRAME (frame, f);
  if (!NILP (Fxw_display_color_p (frame)))
    best_key = XPM_COLOR_KEY_C;