summaryrefslogtreecommitdiff
path: root/src/cff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2008-04-26 12:52:57 +0000
committerWerner Lemberg <wl@gnu.org>2008-04-26 12:52:57 +0000
commitde9479a00dee5aea9e470775d39c70a8f1f7acb3 (patch)
tree3f2aa9fdb172ce733c36cd0945d62b4925a7f505 /src/cff
parent4ebc890e0658b8b9c13795559e142b255781aeb5 (diff)
downloadfreetype2-de9479a00dee5aea9e470775d39c70a8f1f7acb3.tar.gz
* 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.
Diffstat (limited to 'src/cff')
-rw-r--r--src/cff/cffgload.c8
-rw-r--r--src/cff/cffgload.h10
2 files changed, 4 insertions, 14 deletions
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index cbd4fda4e..73c08685e 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 f67864a69..167c57246 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;