From 0008e8329d0bddfca95f730ad1db5bdedfb110de Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 25 Jun 2003 10:07:01 +0000 Subject: [PATCH] modules/cdisplay_colorblind.c (cdisplay_colorblind_load_state) 2003-06-25 Michael Natterer * modules/cdisplay_colorblind.c (cdisplay_colorblind_load_state) * modules/cdisplay_gamma.c (cdisplay_gamma_load_state) * modules/cdisplay_highcontrast.c (cdisplay_contrast_load_state): gimp_parasite_data() returns a pointer to const data now. --- ChangeLog | 7 +++++++ modules/cdisplay_colorblind.c | 2 +- modules/cdisplay_gamma.c | 5 ++++- modules/cdisplay_highcontrast.c | 5 ++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a53e1396c..74c692150f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-06-25 Michael Natterer + + * modules/cdisplay_colorblind.c (cdisplay_colorblind_load_state) + * modules/cdisplay_gamma.c (cdisplay_gamma_load_state) + * modules/cdisplay_highcontrast.c (cdisplay_contrast_load_state): + gimp_parasite_data() returns a pointer to const data now. + 2003-06-25 Sven Neumann * configure.in: removed "id" from ALL_LINGUAS until all required diff --git a/modules/cdisplay_colorblind.c b/modules/cdisplay_colorblind.c index 97f4e63bf8..b510effde7 100644 --- a/modules/cdisplay_colorblind.c +++ b/modules/cdisplay_colorblind.c @@ -418,7 +418,7 @@ cdisplay_colorblind_load_state (GimpColorDisplay *display, GimpParasite *state) { CdisplayColorblind *colorblind; - gchar *str; + const gchar *str; colorblind = CDISPLAY_COLORBLIND (display); diff --git a/modules/cdisplay_gamma.c b/modules/cdisplay_gamma.c index d365e43cf3..b0640dd2fc 100644 --- a/modules/cdisplay_gamma.c +++ b/modules/cdisplay_gamma.c @@ -263,7 +263,10 @@ cdisplay_gamma_load_state (GimpColorDisplay *display, memcpy (&gamma->gamma, gimp_parasite_data (state), sizeof (gdouble)); #else { - guint32 buf[2], *data = gimp_parasite_data (state); + guint32 buf[2]; + const guint32 *data; + + data = gimp_parasite_data (state); buf[0] = g_ntohl (data[1]); buf[1] = g_ntohl (data[0]); diff --git a/modules/cdisplay_highcontrast.c b/modules/cdisplay_highcontrast.c index 9b62e90472..32e749ed23 100644 --- a/modules/cdisplay_highcontrast.c +++ b/modules/cdisplay_highcontrast.c @@ -260,7 +260,10 @@ cdisplay_contrast_load_state (GimpColorDisplay *display, memcpy (&contrast->contrast, gimp_parasite_data (state), sizeof (gdouble)); #else { - guint32 buf[2], *data = gimp_parasite_data (state); + guint32 buf[2]; + const guint32 *data; + + data = gimp_parasite_data (state); buf[0] = g_ntohl (data[1]); buf[1] = g_ntohl (data[0]);