Fixes for some compiler warnings

This commit is contained in:
Emmanuele Bassi 2009-06-06 14:37:41 +01:00
parent 5f0afa5218
commit c3dc03997c
3 changed files with 9 additions and 2 deletions

View File

@ -8316,6 +8316,8 @@ clutter_actor_allocate_available_size (ClutterActor *self,
priv = self->priv; priv = self->priv;
width = height = 0.0;
switch (priv->request_mode) switch (priv->request_mode)
{ {
case CLUTTER_REQUEST_HEIGHT_FOR_WIDTH: case CLUTTER_REQUEST_HEIGHT_FOR_WIDTH:

View File

@ -1951,6 +1951,7 @@ clutter_texture_set_filter_quality (ClutterTexture *texture,
{ {
gint min_filter, mag_filter; gint min_filter, mag_filter;
min_filter = mag_filter = COGL_MATERIAL_FILTER_LINEAR;
clutter_texture_quality_to_filters (filter_quality, clutter_texture_quality_to_filters (filter_quality,
&min_filter, &min_filter,
&mag_filter); &mag_filter);

View File

@ -487,8 +487,8 @@ clutter_unit_type_name (ClutterUnitType unit_type)
gchar * gchar *
clutter_units_to_string (const ClutterUnits *units) clutter_units_to_string (const ClutterUnits *units)
{ {
const gchar *unit_name; const gchar *unit_name = NULL;
gchar *fmt; gchar *fmt = NULL;
g_return_val_if_fail (units != NULL, NULL); g_return_val_if_fail (units != NULL, NULL);
@ -513,6 +513,10 @@ clutter_units_to_string (const ClutterUnits *units)
unit_name = "px"; unit_name = "px";
fmt = g_strdup_printf ("%d", (int) units->value); fmt = g_strdup_printf ("%d", (int) units->value);
break; break;
default:
g_assert_not_reached ();
break;
} }
return g_strconcat (fmt, " ", unit_name, NULL); return g_strconcat (fmt, " ", unit_name, NULL);