diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:44:23 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:44:23 +0000 |
| commit | 3d75ea33ecf80c3539b38a993092cd16325a9525 (patch) | |
| tree | 2c833d7262e8c8e52b052930b7cef9053abf1943 /src/FreeType/ftfuncs.c | |
| parent | 8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'src/FreeType/ftfuncs.c')
| -rw-r--r-- | src/FreeType/ftfuncs.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index cc6d712..365374c 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -25,8 +25,9 @@ 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: xc/lib/font/FreeType/ftfuncs.c,v 1.1.4.4.2.2.6.3 2004/04/13 03:16:31 gisburn Exp $ */ -/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.44 2004/02/24 01:13:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */ #include "fontmisc.h" @@ -51,7 +52,10 @@ THE SOFTWARE. #include FT_XFREE86_H #include FT_BBOX_H #include FT_INTERNAL_TRUETYPE_TYPES_H -#include "ttobjs.h" +#ifdef USE_INTERNAL_FREETYPE +# include "ttobjs.h" +#endif + /* * If you want to use FT_Outline_Get_CBox instead of * FT_Outline_Get_BBox, define here. @@ -118,7 +122,7 @@ static char *xlfd_props[] = { static int ftypeInitP = 0; /* is the engine initialised? */ -static FT_Library ftypeLibrary; +FT_Library ftypeLibrary; static FTFacePtr faceTable[NUMFACEBUCKETS]; @@ -906,9 +910,15 @@ 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 ) ) { +#ifdef USE_INTERNAL_FREETYPE 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) + && tt_size->strike_index != 0xFFFFU ) ) +#else + if((instance->load_flags & FT_LOAD_NO_BITMAP) + || (face->face->face_flags & FT_FACE_FLAG_FIXED_SIZES) == 0) +#endif + correct=1; } } } |