xc/lib/font/FreeType/ in "XORG-RELEASE-1"-branch differs from Xfree86 trunk...

[Roland Mainz]

Hi!

----

While checking whether the Xorg release branch FreeType font code is in
sync with the Xfree86 trunk I found the following difference:
-- snip --
--- xfree86_trunk/xc/lib/font/FreeType/ftfuncs.c        2004-02-24
02:13:04.000000000 +0100
+++ xorg_release1/xc/lib/font/FreeType/ftfuncs.c        2004-03-04
18:47:03.000000000 +0100
[snip]
 /*
  *  If you want to use FT_Outline_Get_CBox instead of 
  *  FT_Outline_Get_BBox, define here.
@@ -906,9 +907,9 @@
            /* If sbit is available, we don't use very lazy method. */
            /* See TT_Load_Glyph */
            if( FT_IS_SFNT( face->face ) ) {
-               TT_Size tt_size = (TT_Size)instance->size;
-               if( !( !(instance->load_flags & FT_LOAD_NO_BITMAP) 
-                      && tt_size->strike_index != 0xFFFFU ) )
correct=1;
+               if((instance->load_flags & FT_LOAD_NO_BITMAP)
+                  || (face->face->face_flags &
FT_FACE_FLAG_FIXED_SIZES) == 0)
+                   correct=1;
            }
        }
     }
-- snip --

Does anyone know who introduced this difference - and why ?

----

Bye,
Roland

-- 
  __ .  . __
 (o.\ \/ /.o) roland.mainz@nrubsig.org
  \__\/\/__/  MPEG specialist, C&&JAVA&&Sun&&Unix programmer
  /O /==\ O\  TEL +49 2426 901568 FAX +49 2426 901569
 (;O/ \/ \O;)