[gnome-color-manager] Compile the static library with all the warning flags, and fix up and problems

[Richard Hughes <rhughes src gnome org>]

commit d1fe7a1d1af869b77d1e4f5f1b243c9e9cdfd7d8
Author: Richard Hughes <richard hughsie com>
Date:   Wed Nov 4 12:04:53 2009 +0000

    Compile the static library with all the warning flags, and fix up and problems

 src/Makefile.am   |    3 +++
 src/gcm-clut.c    |   27 ++++++++++++++-------------
 src/gcm-edid.c    |    6 +++---
 src/gcm-profile.c |    8 ++------
 src/gcm-utils.c   |    1 -
 5 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index a81f2bc..c474156 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,9 @@ libgcmshared_a_SOURCES =				\
 	gcm-profile.c					\
 	gcm-profile.h
 
+libgcmshared_a_CFLAGS =					\
+	$(WARNINGFLAGS_C)
+
 bin_PROGRAMS =						\
 	gcm-apply					\
 	gcm-prefs					\
diff --git a/src/gcm-clut.c b/src/gcm-clut.c
index dfae3dd..96b2c3c 100644
--- a/src/gcm-clut.c
+++ b/src/gcm-clut.c
@@ -300,15 +300,18 @@ out:
 	return ret;
 }
 
+/**
+ * gcm_clut_get_adjusted_value:
+ **/
 static guint
-gcm_clut_get_adjusted_value (guint value, gfloat min, gfloat max, gfloat gamma)
+gcm_clut_get_adjusted_value (guint value, gfloat min, gfloat max, gfloat custom_gamma)
 {
 	guint retval;
 
 	/* optimise for the common case */
-	if (min < 0.01f && max > 0.99f && gamma > 0.99 && gamma < 1.01)
+	if (min < 0.01f && max > 0.99f && custom_gamma > 0.99 && custom_gamma < 1.01)
 		return value;
-	retval = 65536.0f * ((powf (((gfloat)value/65536.0f), gamma) * (max - min)) + min);
+	retval = 65536.0f * ((powf (((gfloat)value/65536.0f), custom_gamma) * (max - min)) + min);
 	return retval;
 }
 
@@ -325,7 +328,7 @@ gcm_clut_get_array (GcmClut *clut)
 	GcmClutData *data;
 	gfloat min;
 	gfloat max;
-	gfloat gamma;
+	gfloat custom_gamma;
 
 	g_return_val_if_fail (GCM_IS_CLUT (clut), FALSE);
 	g_return_val_if_fail (clut->priv->size != 0, FALSE);
@@ -333,7 +336,7 @@ gcm_clut_get_array (GcmClut *clut)
 
 	min = clut->priv->brightness / 100.0f;
 	max = (1.0f - min) * (clut->priv->contrast / 100.0f) + min;
-	gamma = clut->priv->gamma;
+	custom_gamma = clut->priv->gamma;
 
 	array = g_ptr_array_new_with_free_func (g_free);
 	if (clut->priv->array->len == 0) {
@@ -342,9 +345,9 @@ gcm_clut_get_array (GcmClut *clut)
 		for (i=0; i<clut->priv->size; i++) {
 			value = (i * 0xffff) / clut->priv->size;
 			data = g_new0 (GcmClutData, 1);
-			data->red = gcm_clut_get_adjusted_value (value, min, max, gamma);
-			data->green = gcm_clut_get_adjusted_value (value, min, max, gamma);
-			data->blue = gcm_clut_get_adjusted_value (value, min, max, gamma);
+			data->red = gcm_clut_get_adjusted_value (value, min, max, custom_gamma);
+			data->green = gcm_clut_get_adjusted_value (value, min, max, custom_gamma);
+			data->blue = gcm_clut_get_adjusted_value (value, min, max, custom_gamma);
 			g_ptr_array_add (array, data);
 		}
 	} else {
@@ -352,14 +355,12 @@ gcm_clut_get_array (GcmClut *clut)
 		for (i=0; i<clut->priv->size; i++) {
 			tmp = g_ptr_array_index (clut->priv->array, i);
 			data = g_new0 (GcmClutData, 1);
-			data->red = gcm_clut_get_adjusted_value (tmp->red, min, max, gamma);
-			data->green = gcm_clut_get_adjusted_value (tmp->green, min, max, gamma);
-			data->blue = gcm_clut_get_adjusted_value (tmp->blue, min, max, gamma);
+			data->red = gcm_clut_get_adjusted_value (tmp->red, min, max, custom_gamma);
+			data->green = gcm_clut_get_adjusted_value (tmp->green, min, max, custom_gamma);
+			data->blue = gcm_clut_get_adjusted_value (tmp->blue, min, max, custom_gamma);
 			g_ptr_array_add (array, data);
 		}
 	}
-
-out:
 	return array;
 }
 
diff --git a/src/gcm-edid.c b/src/gcm-edid.c
index 23c58c8..e1deafa 100644
--- a/src/gcm-edid.c
+++ b/src/gcm-edid.c
@@ -125,13 +125,13 @@ gcm_edid_parse (GcmEdid *edid, const guint8 *data, GError **error)
 
 		/* any useful blocks? */
 		if (data[i+3] == GCM_DESCRIPTOR_DISPLAY_PRODUCT_NAME)
-			priv->monitor_name = g_strdup (&data[i+5]);
+			priv->monitor_name = g_strdup ((const gchar *) &data[i+5]);
 		else if (data[i+3] == GCM_DESCRIPTOR_DISPLAY_PRODUCT_SERIAL_NUMBER)
-			priv->serial_number = g_strdup (&data[i+5]);
+			priv->serial_number = g_strdup ((const gchar *) &data[i+5]);
 		else if (data[i+3] == GCM_DESCRIPTOR_COLOR_MANAGEMENT_DATA)
 			egg_warning ("failing to parse color management data");
 		else if (data[i+3] == GCM_DESCRIPTOR_ALPHANUMERIC_DATA_STRING)
-			priv->ascii_string = g_strdup (&data[i+5]);
+			priv->ascii_string = g_strdup ((const gchar *) &data[i+5]);
 		else if (data[i+3] == GCM_DESCRIPTOR_COLOR_POINT) {
 			if (data[i+3+9] != 0xff) {
 				egg_debug ("extended EDID block(1) which contains a better gamma value");
diff --git a/src/gcm-profile.c b/src/gcm-profile.c
index 5562df2..e91e6e4 100644
--- a/src/gcm-profile.c
+++ b/src/gcm-profile.c
@@ -169,7 +169,7 @@ gcm_parser_unencode_8 (const gchar *data, gsize offset)
 /**
  * gcm_prefs_get_tag_description:
  **/
-static gchar *
+static const gchar *
 gcm_prefs_get_tag_description (guint tag)
 {
 	if (tag == GCM_TAG_ID_PROFILE_DESCRIPTION)
@@ -449,7 +449,6 @@ gcm_parser_load_icc_trc_curve (GcmProfile *profile, const gchar *data, gsize off
 		/* save datatype */
 		profile->priv->has_curve_fixed = TRUE;
 	}
-out:
 	return ret;
 }
 
@@ -478,8 +477,7 @@ gcm_parser_load_icc_trc (GcmProfile *profile, const gchar *data, gsize offset, g
 gboolean
 gcm_profile_parse_data (GcmProfile *profile, const gchar *data, gsize length, GError **error)
 {
-	gboolean ret;
-	GError *error_local = NULL;
+	gboolean ret = FALSE;
 	guint num_tags;
 	guint i;
 	guint tag_id;
@@ -498,7 +496,6 @@ gcm_profile_parse_data (GcmProfile *profile, const gchar *data, gsize length, GE
 	if (length < 0x84) {
 		if (error != NULL)
 			*error = g_error_new (1, 0, "profile was not valid (file size too small)");
-		ret = FALSE;
 		goto out;
 	}
 
@@ -515,7 +512,6 @@ gcm_profile_parse_data (GcmProfile *profile, const gchar *data, gsize length, GE
 		if (error != NULL)
 			*error = g_error_new (1, 0, "not an ICC profile, signature is '%s', expecting 'acsp'", signature);
 		g_free (signature);
-		ret = FALSE;
 		goto out;
 	}
 
diff --git a/src/gcm-utils.c b/src/gcm-utils.c
index 65794ca..4819851 100644
--- a/src/gcm-utils.c
+++ b/src/gcm-utils.c
@@ -74,7 +74,6 @@ gchar *
 gcm_utils_get_output_name (GnomeRROutput *output)
 {
 	const guint8 *data;
-	guint i, j;
 	const gchar *output_name;
 	gchar *name = NULL;
 	GcmEdid *edid = NULL;