summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliot Lee <sopwith@src.gnome.org>2000-02-14 20:06:23 +0000
committerElliot Lee <sopwith@src.gnome.org>2000-02-14 20:06:23 +0000
commit9bf3a0be0cc3a41cf3f1f3d7f09692683dde22b3 (patch)
treea43a49a79ed738986207c22f8198d93ccf1490cf
parent37cfb7d74b85d3fd8f1714e83b94c8d449c08cb9 (diff)
downloadgtk+-9bf3a0be0cc3a41cf3f1f3d7f09692683dde22b3.tar.gz
Make passed-in argument 'const'.
* gdk-pixbuf/gdk-pixbuf.h, gdk-pixbuf/gdk-pixbuf-data.c: Make passed-in argument 'const'.
-rw-r--r--gdk-pixbuf/ChangeLog3
-rw-r--r--gdk-pixbuf/gdk-pixbuf-data.c6
-rw-r--r--gdk-pixbuf/gdk-pixbuf.h2
3 files changed, 7 insertions, 4 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 2fe762d87a..38ee6d736c 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,6 @@
+2000-02-14 Elliot Lee <sopwith@redhat.com>
+ * gdk-pixbuf/gdk-pixbuf.h, gdk-pixbuf/gdk-pixbuf-data.c: Make passed-in argument 'const'.
+
2000-02-04 Michael Meeks <mmeeks@gnu.org>
* gdk-pixbuf/io-gif.c (struct _GifContext): add x,y_offset.
diff --git a/gdk-pixbuf/gdk-pixbuf-data.c b/gdk-pixbuf/gdk-pixbuf-data.c
index 4c3bd36106..247a67e4fd 100644
--- a/gdk-pixbuf/gdk-pixbuf-data.c
+++ b/gdk-pixbuf/gdk-pixbuf-data.c
@@ -43,7 +43,7 @@
* 1.
**/
GdkPixbuf *
-gdk_pixbuf_new_from_data (guchar *data, ArtPixFormat format, gboolean has_alpha,
+gdk_pixbuf_new_from_data (const guchar *data, ArtPixFormat format, gboolean has_alpha,
int width, int height, int rowstride,
ArtDestroyNotify dfunc, gpointer dfunc_data)
{
@@ -57,10 +57,10 @@ gdk_pixbuf_new_from_data (guchar *data, ArtPixFormat format, gboolean has_alpha,
g_return_val_if_fail (height > 0, NULL);
if (has_alpha)
- art_pixbuf = art_pixbuf_new_rgba_dnotify (data, width, height, rowstride,
+ art_pixbuf = art_pixbuf_new_rgba_dnotify ((art_u8 *)data, width, height, rowstride,
dfunc_data, dfunc);
else
- art_pixbuf = art_pixbuf_new_rgb_dnotify (data, width, height, rowstride,
+ art_pixbuf = art_pixbuf_new_rgb_dnotify ((art_u8 *)data, width, height, rowstride,
dfunc_data, dfunc);
g_assert (art_pixbuf != NULL);
diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index c3d053cf49..a5b4b2b3be 100644
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -111,7 +111,7 @@ GdkPixbuf *gdk_pixbuf_new (ArtPixFormat format, gboolean has_alpha, int bits_per
GdkPixbuf *gdk_pixbuf_new_from_file (const char *filename);
-GdkPixbuf *gdk_pixbuf_new_from_data (guchar *data,
+GdkPixbuf *gdk_pixbuf_new_from_data (const guchar *data,
ArtPixFormat format,
gboolean has_alpha,
int width, int height,