diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-05-12 15:02:02 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-12 15:02:02 -0400 |
| commit | 006d5718fa927d9d3509fca1a1c1ca6522110b57 (patch) | |
| tree | 7badcb467e582a5bff918ce4dfe58f77a3d38b21 | |
| parent | f3fa17a16a06a42b1587f0f422928d9c8f2ce972 (diff) | |
| download | gdk-pixbuf-006d5718fa927d9d3509fca1a1c1ca6522110b57.tar.gz | |
Another attempt to handle pngs changing int types
| -rw-r--r-- | gdk-pixbuf/io-png.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c index 43db70aa1..844064a74 100644 --- a/gdk-pixbuf/io-png.c +++ b/gdk-pixbuf/io-png.c @@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) gchar *icc_profile_base64; const gchar *icc_profile_title; const gchar *icc_profile; - gulong icc_profile_size; + png_uint_32 icc_profile_size; guint32 retval; gint compression_type; @@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) (png_charpp) &icc_profile_title, &compression_type, (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); if (retval != 0) { - icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size); + icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size); gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profile_base64); g_free (icc_profile_base64); } @@ -607,7 +607,7 @@ png_info_callback (png_structp png_read_ptr, gchar *icc_profile_base64; const gchar *icc_profile_title; const gchar *icc_profile; - gulong icc_profile_size; + png_uint_32 icc_profile_size; guint32 retval; gint compression_type; @@ -679,9 +679,9 @@ png_info_callback (png_structp png_read_ptr, /* Extract embedded ICC profile */ retval = png_get_iCCP (png_read_ptr, png_info_ptr, (png_charpp) &icc_profile_title, &compression_type, - (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); + (png_charpp) &icc_profile, &icc_profile_size); if (retval != 0) { - icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size); + icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size); gdk_pixbuf_set_option (lc->pixbuf, "icc-profile", icc_profile_base64); g_free (icc_profile_base64); } |