From f28623a4666038fa2e0634dcbef98d5e5c69c058 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 22 May 2021 19:31:52 +0200 Subject: [PATCH] agg_font_freetype.cpp: avoid assigned value that is never used (CID 1503490) --- renderers/agg/src/agg_font_freetype.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/renderers/agg/src/agg_font_freetype.cpp b/renderers/agg/src/agg_font_freetype.cpp index 1875e7aa12..1308869d24 100644 --- a/renderers/agg/src/agg_font_freetype.cpp +++ b/renderers/agg/src/agg_font_freetype.cpp @@ -150,9 +150,6 @@ namespace mapserver { typedef typename PathStorage::value_type value_type; - FT_Vector v_last; - FT_Vector v_control; - FT_Vector v_start; double x1, y1, x2, y2, x3, y3; FT_Vector* point; @@ -172,10 +169,9 @@ namespace mapserver last = outline.contours[n]; limit = outline.points + last; - v_start = outline.points[first]; - v_last = outline.points[last]; + FT_Vector v_start = outline.points[first]; - v_control = v_start; + FT_Vector v_control = v_start; point = outline.points + first; tags = outline.tags + first; @@ -187,6 +183,8 @@ namespace mapserver // check first point to determine origin if( tag == FT_CURVE_TAG_CONIC) { + const FT_Vector v_last = outline.points[last]; + // first point is conic control. Yes, this happens. if(FT_CURVE_TAG(outline.tags[last]) == FT_CURVE_TAG_ON) { @@ -201,8 +199,6 @@ namespace mapserver // for closure v_start.x = (v_start.x + v_last.x) / 2; v_start.y = (v_start.y + v_last.y) / 2; - - v_last = v_start; } point--; tags--;