diff options
| author | Werner Lemberg <wl@gnu.org> | 2008-04-26 12:52:57 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2008-04-26 12:52:57 +0000 |
| commit | de9479a00dee5aea9e470775d39c70a8f1f7acb3 (patch) | |
| tree | 3f2aa9fdb172ce733c36cd0945d62b4925a7f505 | |
| parent | 4ebc890e0658b8b9c13795559e142b255781aeb5 (diff) | |
* include/freetype/internal/psaux.h (T1_BuilderRec): Mark `scale_x'
and `scale_y' as obsolete since they aren't used.
* src/psaux/psobjs.c (t1_builder_init): Updated.
* src/cff/cffgload.h (CFF_Builder): Mark `scale_x' and `scale_y' as
obsolete since they aren't used.
* src/cff/cffgload.c (cff_builder_init): Updated.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | include/freetype/internal/psaux.h | 11 | ||||
| -rw-r--r-- | src/cff/cffgload.c | 8 | ||||
| -rw-r--r-- | src/cff/cffgload.h | 10 | ||||
| -rw-r--r-- | src/psaux/psobjs.c | 6 |
5 files changed, 17 insertions, 28 deletions
@@ -1,3 +1,13 @@ +2008-04-26 Werner Lemberg <wl@gnu.org> + + * include/freetype/internal/psaux.h (T1_BuilderRec): Mark `scale_x' + and `scale_y' as obsolete since they aren't used. + * src/psaux/psobjs.c (t1_builder_init): Updated. + + * src/cff/cffgload.h (CFF_Builder): Mark `scale_x' and `scale_y' as + obsolete since they aren't used. + * src/cff/cffgload.c (cff_builder_init): Updated. + 2008-04-14 Werner Lemberg <wl@gnu.org> * src/pcf/pcfdrivr.c (PCF_Face_Init): Protect call to diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h index 4baf7a09..0e33709c 100644 --- a/include/freetype/internal/psaux.h +++ b/include/freetype/internal/psaux.h @@ -5,7 +5,7 @@ /* Auxiliary functions and data structures related to PostScript fonts */ /* (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2008 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -530,11 +530,6 @@ FT_BEGIN_HEADER /* */ /* last :: The last point position. */ /* */ - /* scale_x :: The horizontal scaling value (FUnits to */ - /* sub-pixels). */ - /* */ - /* scale_y :: The vertical scaling value (FUnits to sub-pixels). */ - /* */ /* pos_x :: The horizontal translation (if composite glyph). */ /* */ /* pos_y :: The vertical translation (if composite glyph). */ @@ -569,8 +564,8 @@ FT_BEGIN_HEADER FT_Vector last; - FT_Fixed scale_x; - FT_Fixed scale_y; + FT_Fixed scale_x; /* obsolete */ + FT_Fixed scale_y; /* obsolete */ FT_Pos pos_x; FT_Pos pos_y; diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index cbd4fda4..73c08685 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -4,7 +4,7 @@ /* */ /* OpenType Glyph Loader (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -262,12 +262,6 @@ } } - if ( size ) - { - builder->scale_x = size->root.metrics.x_scale; - builder->scale_y = size->root.metrics.y_scale; - } - builder->pos_x = 0; builder->pos_y = 0; diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h index f67864a6..167c5724 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 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -55,10 +55,6 @@ FT_BEGIN_HEADER /* */ /* last :: The last point position. */ /* */ - /* scale_x :: The horizontal scale (FUnits to sub-pixels). */ - /* */ - /* scale_y :: The vertical scale (FUnits to sub-pixels). */ - /* */ /* pos_x :: The horizontal translation (if composite glyph). */ /* */ /* pos_y :: The vertical translation (if composite glyph). */ @@ -94,8 +90,8 @@ FT_BEGIN_HEADER FT_Vector last; - FT_Fixed scale_x; - FT_Fixed scale_y; + FT_Fixed scale_x; /* obsolete */ + FT_Fixed scale_y; /* obsolete */ FT_Pos pos_x; FT_Pos pos_y; diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 95708566..9d3ebdf2 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -1483,12 +1483,6 @@ builder->hints_funcs = glyph->internal->glyph_hints; } - if ( size ) - { - builder->scale_x = size->metrics.x_scale; - builder->scale_y = size->metrics.y_scale; - } - builder->pos_x = 0; builder->pos_y = 0; |