Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept unknown parameters with a warning when saving. (#405539, Daniel

Browse Source 
2007-04-28  Matthias Clasen <mclasen@redhat.com>

        * io-png.c:
        * io-jpeg.c: Accept unknown parameters with a warning
        when saving.  (#405539, Daniel Atallah)



svn path=/branches/gtk-2-10/; revision=17674
This commit is contained in:
Matthias Clasen
2007-04-28 14:49:43 +00:00
committed by Matthias Clasen
parent 28ec7761ee
commit 1bb1405cf1
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdk-pixbuf/ChangeLog
View File

@@ -1,3 +1,11 @@
2007-04-28 Matthias Clasen <mclasen@redhat.com>
Merge from trunk:
* io-png.c:
* io-jpeg.c: Accept unknown parameters with a warning
when saving. (#405539, Daniel Atallah)
2007-04-25 Matthias Clasen <mclasen@redhat.com>
Merge from trunk:

13
gdk-pixbuf/io-jpeg.c
View File

@@ -951,9 +951,7 @@ real_save_jpeg (GdkPixbuf *pixbuf,
return FALSE;
}
} else {
g_warning ("Bad option name '%s' passed to JPEG saver",
*kiter);
return FALSE;
g_warning ("Unrecognized parameter (%s) passed to JPEG saver.", *kiter);
}
++kiter;
@@ -969,7 +967,14 @@ real_save_jpeg (GdkPixbuf *pixbuf,
/* no image data? abort */
pixels = gdk_pixbuf_get_pixels (pixbuf);
g_return_val_if_fail (pixels != NULL, FALSE);
if (pixels == NULL) {
g_set_error (error,
GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
_("Image contains no pixels."));
return FALSE;
}
/* Allocate a small buffer to convert image data,
* and a larger buffer if doing to_callback save.

12
gdk-pixbuf/io-png.c
View File

@@ -344,8 +344,8 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
static void png_error_callback (png_structp png_read_ptr,
png_const_charp error_msg);
static void png_warning_callback(png_structp png_read_ptr,
png_const_charp warning_msg);
static void png_warning_callback (png_structp png_read_ptr,
png_const_charp warning_msg);
/* Called at the start of the progressive load */
static void png_info_callback (png_structp png_read_ptr,
@@ -739,8 +739,8 @@ png_error_callback(png_structp png_read_ptr,
}
static void
png_warning_callback(png_structp png_read_ptr,
png_const_charp warning_msg)
png_warning_callback (png_structp png_read_ptr,
png_const_charp warning_msg)
{
LoadContext* lc;
@@ -861,9 +861,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf,
return FALSE;
}
} else {
g_warning ("Bad option name '%s' passed to PNG saver",
*kiter);
return FALSE;
g_warning ("Unrecognized parameter (%s) passed to PNG saver.", *kiter);
}
++kiter;