shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* src/pcf/pcfread.c (pcf_load_font): removed immature support of
        the AVERAGE_WIDTH property..

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,8 @@

+2002-02-07  David Turner  <[email protected]>

+

+        * src/pcf/pcfread.c (pcf_load_font): removed immature support of

+        the AVERAGE_WIDTH property..

+

 2002-02-06  David Turner   <[email protected]>

         * src/sfnt/sfobjs.c (SFNT_Load_Face): since many fonts embedded in

--- a/src/pcf/pcfread.c

+++ b/src/pcf/pcfread.c

@@ -972,10 +972,12 @@

       {

         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 @@

           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 );