diff options
| author | Matthias Clasen <mclasne@redhat.com> | 2008-02-12 16:38:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-02-12 16:38:15 +0000 |
| commit | a21cbfc27277a4aab3f42dabf127d5b1a797c862 (patch) | |
| tree | 1a453650619f6ec7e4e7c9f50b21f9db6ead9256 | |
| parent | 2caa0a86ef16e1a28743be578a553795947370cd (diff) | |
| download | gdk-pixbuf-a21cbfc27277a4aab3f42dabf127d5b1a797c862.tar.gz | |
Don't let the width or height go below 1. (#516024, Christian Persch)
2008-02-12 Matthias Clasen <mclasne@redhat.com>
* gdk-pixbuf-io.c (at_scale_size_prepared_cb): Don't let
the width or height go below 1. (#516024, Christian Persch)
svn path=/branches/gtk-2-12/; revision=19536
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index fec235a2d..89f896ea5 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2008-02-12 Matthias Clasen <mclasne@redhat.com> + + * gdk-pixbuf-io.c (at_scale_size_prepared_cb): Don't let + the width or height go below 1. (#516024, Christian Persch) + 2008-02-10 Matthias Clasen <mclasne@redhat.com> * gdk-pixbuf-scaled-anim.c: Try harder to return pixbufs diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 1dbbd26cf..0770962d0 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -975,6 +975,9 @@ size_prepared_cb (GdkPixbufLoader *loader, height = info->height; } + width = MAX (width, 1); + height = MAX (height, 1); + gdk_pixbuf_loader_set_size (loader, width, height); } |