diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2015-02-12 10:49:01 -0600 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2015-02-12 10:49:54 -0600 |
| commit | bc189a77050e4029e1fe9be3a7d7400bc0640c21 (patch) | |
| tree | 5f873a8a69db2731fadad89e71c2ebbe3a69e50f | |
| parent | 5d8e48bf386e4bc8ffefb9262c7ae37b3ee27d9f (diff) | |
| download | librsvg-bc189a77050e4029e1fe9be3a7d7400bc0640c21.tar.gz | |
Fix shadowed variables
| -rw-r--r-- | rsvg-filter.c | 2 | ||||
| -rw-r--r-- | rsvg-marker.c | 6 | ||||
| -rw-r--r-- | rsvg-marker.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/rsvg-filter.c b/rsvg-filter.c index d73fe402..74462ddf 100644 --- a/rsvg-filter.c +++ b/rsvg-filter.c @@ -2191,7 +2191,6 @@ rsvg_filter_primitive_component_transfer_render (RsvgFilterPrimitive * { gint x, y, c; guint i; - gint temp; gint rowstride, height, width; RsvgIRect boundarys; RsvgNodeComponentTransferFunc *channels[4]; @@ -2250,6 +2249,7 @@ rsvg_filter_primitive_component_transfer_render (RsvgFilterPrimitive * for (x = boundarys.x0; x < boundarys.x1; x++) { inpix = in_pixels + (y * rowstride + x * 4); for (c = 0; c < 4; c++) { + gint temp; int inval; if (c != achan) { if (inpix[achan] == 0) diff --git a/rsvg-marker.c b/rsvg-marker.c index ad363f32..bd289e58 100644 --- a/rsvg-marker.c +++ b/rsvg-marker.c @@ -100,15 +100,15 @@ rsvg_new_marker (void) } void -rsvg_marker_render (RsvgMarker * self, gdouble x, gdouble y, gdouble orient, gdouble linewidth, - RsvgDrawingCtx * ctx) +rsvg_marker_render (RsvgMarker * self, gdouble xpos, gdouble ypos, gdouble orient, gdouble linewidth, + RsvgDrawingCtx * ctx) { cairo_matrix_t affine, taffine; unsigned int i; gdouble rotation; RsvgState *state = rsvg_current_state (ctx); - cairo_matrix_init_translate (&taffine, x, y); + cairo_matrix_init_translate (&taffine, xpos, ypos); cairo_matrix_multiply (&affine, &taffine, &state->affine); if (self->orientAuto) diff --git a/rsvg-marker.h b/rsvg-marker.h index d43b714f..0e4081e2 100644 --- a/rsvg-marker.h +++ b/rsvg-marker.h @@ -45,8 +45,8 @@ struct _RsvgMarker { G_GNUC_INTERNAL RsvgNode *rsvg_new_marker (void); G_GNUC_INTERNAL -void rsvg_marker_render (RsvgMarker * self, gdouble x, gdouble y, - gdouble orient, gdouble linewidth, RsvgDrawingCtx * ctx); +void rsvg_marker_render (RsvgMarker * self, gdouble xpos, gdouble ypos, + gdouble orient, gdouble linewidth, RsvgDrawingCtx * ctx); G_GNUC_INTERNAL RsvgNode *rsvg_marker_parse (const RsvgDefs * defs, const char *str); G_GNUC_INTERNAL |