Commit 5a902ec20f3b0817c87f6761c830f29711e4df33
2002-02-07T16:59:38
* src/pcf/pcfread.c (pcf_load_font): removed immature support of the AVERAGE_WIDTH property..
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
diff --git a/ChangeLog b/ChangeLog
index c607a34..bb5c707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-07 David Turner <david@freetype.org>
+
+ * src/pcf/pcfread.c (pcf_load_font): removed immature support of
+ the AVERAGE_WIDTH property..
+
2002-02-06 David Turner <david@freetype.org>
* src/sfnt/sfobjs.c (SFNT_Load_Face): since many fonts embedded in
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index ffb28e9..b33a259 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -972,10 +972,12 @@ THE SOFTWARE.
{
root->available_sizes->height =
root->available_sizes->width = (FT_Short)( prop->value.integer );
-
+
+#if 0 /* average width property support removed until maturation */
prop = pcf_find_property( face, "AVERAGE_WIDTH" );
if ( prop != NULL )
root->available_sizes->width = (FT_Short)( prop->value.integer / 10 );
+#endif
size_set = 1;
}
@@ -991,16 +993,18 @@ THE SOFTWARE.
yres = pcf_find_property( face, "RESOLUTION_Y" );
avgw = pcf_find_property( face, "AVERAGE_WIDTH" );
- if ( ( yres != NULL ) && ( ( xres != NULL ) || ( avgw == NULL ) ) )
+ if ( ( yres != NULL ) && ( xres != NULL ) )
{
root->available_sizes->height =
(FT_Short)( prop->value.integer *
yres->value.integer / 720 );
+#if 0 /* average width property support removed until maturation */
if ( avgw != NULL )
root->available_sizes->width =
(FT_Short)( avgw->value.integer / 10 );
else
+#endif
root->available_sizes->width =
(FT_Short)( prop->value.integer *
xres->value.integer / 720 );