diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 11:08:31 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 11:08:31 +0000 |
| commit | f89c45a5bfa0c138a62df688ebd36b8e24e32793 (patch) | |
| tree | d24d46dd225a82527d36499eb105b82e1381e074 | |
| parent | 0e1b755020cc74f800690c2bfbd31f4e3ca79005 (diff) | |
reverted some OS2 related glitches that where missed during a merge with
XFree86.
17. Fixed Freetype2 compile glitches with different versions of freetype.
The build has been tested with Freetyp 2.1.4 and 2.1.7 (Egbert Eich).
16. Changed default font renderer for TrueType that is loaded by the
Xserver to freetype (Egbert Eich).
15. Removed dependecy of freetype Xserver module into freetype internals
(Keith Packard).
14. Flagged mailing addresses that still need to be decided upon with &&&&&
to allow for easy tracking (Egbert Eich).
13. Fixed keyboard rate setting thru ioctls on linux (Egbert Eich).
| -rw-r--r-- | src/FreeType/ftfuncs.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index 556a511..143fef0 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -25,6 +25,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/* $XdotOrg$ */ /* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */ @@ -51,7 +52,7 @@ THE SOFTWARE. #include FT_XFREE86_H #include FT_BBOX_H #include FT_INTERNAL_TRUETYPE_TYPES_H -#include "ttobjs.h" + /* * If you want to use FT_Outline_Get_CBox instead of * FT_Outline_Get_BBox, define here. @@ -906,9 +907,9 @@ FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp, /* 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; } } } |