st/vega: silence enum cast warnings
authorDylan Noblesmith <nobled@dreamwidth.org>
Sun, 1 Apr 2012 19:47:07 +0000 (19:47 +0000)
committerDylan Noblesmith <nobled@dreamwidth.org>
Fri, 13 Apr 2012 14:27:11 +0000 (14:27 +0000)
clang warns on these:

stroker.c:626:19: warning: implicit conversion from enumeration
type 'VGPathCommand' to different enumeration type 'VGPathSegment'
[-Wconversion]

No change in the underlying value.

Reviewed-by: Brian Paul <brianp@vmware.com>
src/gallium/state_trackers/vega/stroker.c

index d89b6cf..b9f0f2c 100644 (file)
@@ -623,7 +623,7 @@ static INLINE void create_round_join(struct stroker *stroker,
 
    /*stroker_emit_line_to(stroker, nx, ny);*/
 
-   arc_init(&arc, VG_SCCWARC_TO_ABS,
+   arc_init(&arc, VG_SCCWARC_TO,
             x1, y1, x2, y2, width/2, height/2, 0);
    arc_stroker_emit(&arc, stroker, &matrix);
 }
@@ -1097,12 +1097,12 @@ static void stroker_process_subpath(struct stroker *stroker)
                matrix_load_identity(&matrix);
 
                stroker_emit_move_to(stroker, cx + offset, cy);
-               arc_init(&arc, VG_SCCWARC_TO_ABS,
+               arc_init(&arc, VG_SCCWARC_TO,
                         cx + offset, cy,
                         cx - offset, cy,
                         offset, offset, 0);
                arc_stroker_emit(&arc, stroker, &matrix);
-               arc_init(&arc, VG_SCCWARC_TO_ABS,
+               arc_init(&arc, VG_SCCWARC_TO,
                          cx - offset, cy,
                          cx + offset, cy,
                          offset, offset, 0);
@@ -1291,7 +1291,8 @@ void stroker_init(struct stroker *stroker,
    stroker->path = path_create(VG_PATH_DATATYPE_F, 1.0f, 0.0f,
                                0, 0, VG_PATH_CAPABILITY_ALL);
 
-   stroker->last_cmd = VG_CLOSE_PATH;
+   /* Initialize with an invalid value */
+   stroker->last_cmd = (VGPathCommand)0;
 }
 
 void dash_stroker_init(struct stroker *str,