diff options
| author | Matthias Clasen <mclasne@redhat.com> | 2008-02-10 06:30:12 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-02-10 06:30:12 +0000 |
| commit | de2bebed70ef851133603838a67196e55156ad12 (patch) | |
| tree | 51d1317dd91940192080e7a575f3b7498355f49a | |
| parent | aedbca9c4fe52f6f0f3909e39c014a91c279f267 (diff) | |
| download | gdk-pixbuf-de2bebed70ef851133603838a67196e55156ad12.tar.gz | |
Try harder to return pixbufs of the requested size. (#494515, Mike
2008-02-10 Matthias Clasen <mclasne@redhat.com>
* gdk-pixbuf-scaled-anim.c: Try harder to return pixbufs
of the requested size. (#494515, Mike Morrison)
svn path=/branches/gtk-2-12/; revision=19505
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-scaled-anim.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 59d44a07b..fec235a2d 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2008-02-10 Matthias Clasen <mclasne@redhat.com> + + * gdk-pixbuf-scaled-anim.c: Try harder to return pixbufs + of the requested size. (#494515, Mike Morrison) + 2008-01-29 Matthias Clasen <mclasen@redhat.com> * === Released 2.12.7 === diff --git a/gdk-pixbuf/gdk-pixbuf-scaled-anim.c b/gdk-pixbuf/gdk-pixbuf-scaled-anim.c index b9b593dd2..06d1cc087 100644 --- a/gdk-pixbuf/gdk-pixbuf-scaled-anim.c +++ b/gdk-pixbuf/gdk-pixbuf-scaled-anim.c @@ -139,8 +139,8 @@ get_scaled_pixbuf (GdkPixbufScaledAnim *scaled, /* Get a new scaled pixbuf */ scaled->current = gdk_pixbuf_scale_simple (pixbuf, - (int) (gdk_pixbuf_get_width (pixbuf) * scaled->xscale), - (int) (gdk_pixbuf_get_height (pixbuf) * scaled->yscale), + (int) (gdk_pixbuf_get_width (pixbuf) * scaled->xscale + .5), + (int) (gdk_pixbuf_get_height (pixbuf) * scaled->yscale + .5), GDK_INTERP_BILINEAR); /* Copy the original pixbuf options to the scaled pixbuf */ @@ -170,9 +170,9 @@ get_size (GdkPixbufAnimation *anim, GDK_PIXBUF_ANIMATION_GET_CLASS (scaled->anim)->get_size (scaled->anim, width, height); if (width) - *width = (int)(*width * scaled->xscale); + *width = (int)(*width * scaled->xscale + .5); if (height) - *height = (int)(*height * scaled->yscale); + *height = (int)(*height * scaled->yscale + .5); } static GdkPixbufAnimationIter * |