diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-01-14 11:30:34 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-01-14 11:30:34 +0000 |
| commit | 112dad66954c84e91300959f8d5fe20dccd5d8f1 (patch) | |
| tree | 08b714e704c41246be2a8ec21cbc517a5d5422f7 /gdk-pixbuf | |
| parent | 7027d8fc16020302042ff4794570f8f2f4d7def1 (diff) | |
| download | gtk+-112dad66954c84e91300959f8d5fe20dccd5d8f1.tar.gz | |
cast the return value of _gdk_pixbuf_scaled_anim_new() to fix incompatible
2008-01-14 Michael Natterer <mitch@imendio.com>
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_prepare): cast the return
value of _gdk_pixbuf_scaled_anim_new() to fix incompatible pointer
warning.
svn path=/trunk/; revision=19364
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 6 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-loader.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 0c3da6bfe2..560eeff38c 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +2008-01-14 Michael Natterer <mitch@imendio.com> + + * gdk-pixbuf-loader.c (gdk_pixbuf_loader_prepare): cast the return + value of _gdk_pixbuf_scaled_anim_new() to fix incompatible pointer + warning. + 2007-12-09 Matthias Clasen <mclasen@redhat.com> * io-jpeg.c: Fix the spinguard logic for big buffers. diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index 981874c085..cb167ddd42 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -279,10 +279,10 @@ gdk_pixbuf_loader_prepare (GdkPixbuf *pixbuf, anim = gdk_pixbuf_non_anim_new (pixbuf); if (priv->needs_scale) { - priv->animation = _gdk_pixbuf_scaled_anim_new (anim, + priv->animation = GDK_PIXBUF_ANIMATION (_gdk_pixbuf_scaled_anim_new (anim, (double) priv->width / gdk_pixbuf_get_width (pixbuf), (double) priv->height / gdk_pixbuf_get_height (pixbuf), - 1.0); + 1.0)); g_object_unref (anim); } else |