Commit de9479a00dee5aea9e470775d39c70a8f1f7acb3
2008-04-26T12:52:57
* 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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
diff --git a/ChangeLog b/ChangeLog
index 26bca16..dd8eb12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 4baf7a0..0e33709 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 cbd4fda..73c0868 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 f67864a..167c572 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 9570856..9d3ebdf 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;