diff options
| author | Matthias Clasen <maclas@gmx.de> | 2004-01-07 00:26:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-01-07 00:26:58 +0000 |
| commit | 5b26e695a1fc70c99b58f2e9c4c922412fbd1a08 (patch) | |
| tree | 2f5f563c13bfc6d7427311b48bfbb36dd60e78a9 /gdk-pixbuf/io-jpeg.c | |
| parent | 72b7abd535ba6aeb0c5911b6e6a19ec26f90ecf7 (diff) | |
| download | gtk+-5b26e695a1fc70c99b58f2e9c4c922412fbd1a08.tar.gz | |
Make it possible to call gdk_pixbuf_loader_set_size (loader, 0, 0) by
Wed Jan 7 01:17:36 2004 Matthias Clasen <maclas@gmx.de>
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_size_func):
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_set_size):
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_init): Make it possible
to call gdk_pixbuf_loader_set_size (loader, 0, 0) by changing
the initial values of priv->width/height to -1.
* io-tiff.c (tiff_image_parse):
* io-ras.c (RAS2State):
* io-pnm.c (gdk_pixbuf__pnm_image_load_increment):
* io-pcx.c (gdk_pixbuf__pcx_load_increment):
* io-jpeg.c (gdk_pixbuf__jpeg_image_load_increment):
* io-png.c (png_info_callback):
* io-ico.c (DecodeHeader):
* io-bmp.c (DecodeHeader): Call size_func once the size is known,
even if the module can't make use of the scaling information. If
size_func returns 0, don't allocate a pixbuf and return, if
necessary with an error.
* gdk-pixbuf.h:
* gdk-pixbuf-io.c (gdk_pixbuf_get_file_info): A new function
to determine the type and size of an image file without loading
it completely. (#53725)
Diffstat (limited to 'gdk-pixbuf/io-jpeg.c')
| -rw-r--r-- | gdk-pixbuf/io-jpeg.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c index 191372890b..85d75dfe60 100644 --- a/gdk-pixbuf/io-jpeg.c +++ b/gdk-pixbuf/io-jpeg.c @@ -650,7 +650,12 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data, width = cinfo->image_width; height = cinfo->image_height; - (* context->size_func) (&width, &height, context->user_data); + if (context->size_func) { + (* context->size_func) (&width, &height, context->user_data); + if (width == 0 || height == 0) + return FALSE; + } + for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) { jpeg_calc_output_dimensions (cinfo); if (cinfo->output_width < width || cinfo->output_height < height) { |