From 18b6f133952d5bb4e5af31507f0dbd17ac6500eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 23 Sep 2015 19:57:42 +0200 Subject: [PATCH] st: Fix signed-unsigned comparisons --- src/st/st-drawing-area.c | 4 ++-- src/st/st-private.c | 2 +- src/st/st-theme-node-drawing.c | 8 ++++---- src/st/st-widget.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/st/st-drawing-area.c b/src/st/st-drawing-area.c index 5faf7dd8c..f64a5354f 100644 --- a/src/st/st-drawing-area.c +++ b/src/st/st-drawing-area.c @@ -94,8 +94,8 @@ st_drawing_area_paint (ClutterActor *self) } if (priv->texture != NULL && - (width != cogl_texture_get_width (priv->texture) || - height != cogl_texture_get_height (priv->texture))) + (width != (int)cogl_texture_get_width (priv->texture) || + height != (int)cogl_texture_get_height (priv->texture))) { cogl_object_unref (priv->texture); priv->texture = NULL; diff --git a/src/st/st-private.c b/src/st/st-private.c index f48e1a514..f27955c8d 100644 --- a/src/st/st-private.c +++ b/src/st/st-private.c @@ -211,7 +211,7 @@ calculate_gaussian_kernel (gdouble sigma, { gdouble *ret, sum; gdouble exp_divisor; - gint half, i; + guint half, i; g_return_val_if_fail (sigma > 0, NULL); diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c index 9fe213149..be2aa550d 100644 --- a/src/st/st-theme-node-drawing.c +++ b/src/st/st-theme-node-drawing.c @@ -960,7 +960,7 @@ st_theme_node_prerender_background (StThemeNode *node, gboolean draw_background_image_shadow = FALSE; gboolean has_visible_outline; ClutterColor border_color; - int border_width[4]; + guint border_width[4]; guint rowstride; guchar *data; ClutterActorBox actor_box; @@ -1588,10 +1588,10 @@ st_theme_node_paint_borders (StThemeNodePaintState *state, { StThemeNode *node = state->node; float width, height; - int border_width[4]; + guint border_width[4]; guint border_radius[4]; - int max_border_radius = 0; - int max_width_radius[4]; + guint max_border_radius = 0; + guint max_width_radius[4]; int corner_id, side_id; ClutterColor border_color; guint8 alpha; diff --git a/src/st/st-widget.c b/src/st/st-widget.c index 7fd8310ea..ebdc3392d 100644 --- a/src/st/st-widget.c +++ b/src/st/st-widget.c @@ -349,7 +349,7 @@ static void st_widget_finalize (GObject *gobject) { StWidgetPrivate *priv = ST_WIDGET (gobject)->priv; - int i; + guint i; g_free (priv->style_class); g_free (priv->pseudo_class); @@ -1495,7 +1495,7 @@ static void st_widget_init (StWidget *actor) { StWidgetPrivate *priv; - int i; + guint i; actor->priv = priv = ST_WIDGET_GET_PRIVATE (actor); priv->transition_animation = NULL;