[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src image.c
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] emacs/src image.c |
Date: |
Wed, 04 Mar 2009 12:59:11 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Jason Rumney <jasonr> 09/03/04 12:59:11
Modified files:
src : image.c
Log message:
(xbm_read_bitmap_data, png_load, svg_load_image):
Log an error message if check_image_size failed.
(xpm_load_image, pbm_load, jpeg_load, tiff_load, gif_load)
(gs_load): Mention max-image-size in size error message.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/image.c?cvsroot=emacs&r1=1.120&r2=1.121
Patches:
Index: image.c
===================================================================
RCS file: /sources/emacs/emacs/src/image.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- image.c 6 Feb 2009 17:19:10 -0000 1.120
+++ image.c 4 Mar 2009 12:59:11 -0000 1.121
@@ -2992,7 +2992,10 @@
}
if (!check_image_size (f, *width, *height))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
goto failure;
+ }
else if (data == NULL)
goto success;
@@ -4202,7 +4205,7 @@
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
goto failure;
}
@@ -5543,7 +5546,7 @@
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
goto error;
}
@@ -6079,8 +6082,10 @@
&interlace_type, NULL, NULL);
if (!check_image_size (f, width, height))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
goto error;
-
+ }
/* If image contains simply transparency data, we prefer to
construct a clipping mask. */
if (fn_png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
@@ -6787,7 +6792,7 @@
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
longjmp (mgr.setjmp_buffer, 2);
}
@@ -7238,7 +7243,7 @@
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
fn_TIFFClose (tiff);
UNGCPRO;
return 0;
@@ -7577,7 +7582,7 @@
/* Before reading entire contents, check the declared image size. */
if (!check_image_size (f, gif->SWidth, gif->SHeight))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
fn_DGifCloseFile (gif);
UNGCPRO;
return 0;
@@ -7620,7 +7625,7 @@
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
fn_DGifCloseFile (gif);
UNGCPRO;
return 0;
@@ -8047,7 +8052,10 @@
fn_rsvg_handle_get_dimensions (rsvg_handle, &dimension_data);
if (! check_image_size (f, dimension_data.width, dimension_data.height))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
goto rsvg_error;
+ }
/* We can now get a valid pixel buffer from the svg file, if all
went ok. */
@@ -8320,7 +8328,7 @@
if (!check_image_size (f, img->width, img->height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src image.c,
Jason Rumney <=