From 1f540eff0b1d62f2fcfff2da9af68f33c41fcf13 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 20 Jun 2009 13:24:08 +0200 Subject: [PATCH] Remove unused variables. * include/freetype/internal/psaux.h (T1_BuilderRec), src/cff/cffgload.h (CFF_Builder): Remove `last'. Update all users. --- ChangeLog | 8 ++++++++ include/freetype/internal/psaux.h | 4 ---- src/cff/cffgload.c | 2 -- src/cff/cffgload.h | 6 +----- src/psaux/psobjs.c | 2 -- src/psaux/t1decode.c | 8 ++++---- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 383d6dfdc..b958c5820 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-06-20 Werner Lemberg + + Remove unused variables. + + * include/freetype/internal/psaux.h (T1_BuilderRec), + src/cff/cffgload.h (CFF_Builder): Remove `last'. + Update all users. + 2009-06-20 Werner Lemberg [psaux] Check large integers while parsing charstrings. diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h index 7fb4c9916..d078ac9fc 100644 --- a/include/freetype/internal/psaux.h +++ b/include/freetype/internal/psaux.h @@ -533,8 +533,6 @@ FT_BEGIN_HEADER /* */ /* max_contours :: Maximal number of contours in builder outline. */ /* */ - /* last :: The last point position. */ - /* */ /* pos_x :: The horizontal translation (if composite glyph). */ /* */ /* pos_y :: The vertical translation (if composite glyph). */ @@ -567,8 +565,6 @@ FT_BEGIN_HEADER FT_Outline* base; FT_Outline* current; - FT_Vector last; - FT_Pos pos_x; FT_Pos pos_y; diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 03956cab8..ff77e4e5a 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -472,8 +472,6 @@ point->x = x >> 16; point->y = y >> 16; *control = (FT_Byte)( flag ? FT_CURVE_TAG_ON : FT_CURVE_TAG_CUBIC ); - - builder->last = *point; } outline->n_points++; diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h index 667134e3b..ff28670dc 100644 --- a/src/cff/cffgload.h +++ b/src/cff/cffgload.h @@ -4,7 +4,7 @@ /* */ /* OpenType Glyph Loader (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -53,8 +53,6 @@ FT_BEGIN_HEADER /* */ /* current :: The current glyph outline. */ /* */ - /* last :: The last point position. */ - /* */ /* pos_x :: The horizontal translation (if composite glyph). */ /* */ /* pos_y :: The vertical translation (if composite glyph). */ @@ -88,8 +86,6 @@ FT_BEGIN_HEADER FT_Outline* base; FT_Outline* current; - FT_Vector last; - FT_Pos pos_x; FT_Pos pos_y; diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 52e30a413..b3f3a70de 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -1559,8 +1559,6 @@ point->x = x; point->y = y; *control = (FT_Byte)( flag ? FT_CURVE_TAG_ON : FT_CURVE_TAG_CUBIC ); - - builder->last = *point; } outline->n_points++; } diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index e6ade0edc..47681f8d9 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -1070,8 +1070,8 @@ builder->advance.x = top[1]; builder->advance.y = 0; - orig_x = builder->last.x = x = builder->pos_x + top[0]; - orig_y = builder->last.y = y = builder->pos_y; + orig_x = x = builder->pos_x + top[0]; + orig_y = y = builder->pos_y; FT_UNUSED( orig_y ); @@ -1098,8 +1098,8 @@ builder->advance.x = top[2]; builder->advance.y = top[3]; - builder->last.x = x = builder->pos_x + top[0]; - builder->last.y = y = builder->pos_y + top[1]; + x = builder->pos_x + top[0]; + y = builder->pos_y + top[1]; /* the `metrics_only' indicates that we only want to compute */ /* the glyph's metrics (lsb + advance width), not load the */