diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:15:07 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:15:07 +0000 |
| commit | f14530e3d772ba915c9ba876b2240426d45cd23f (patch) | |
| tree | 806c06bc4f41ba6dd5ca379f1430fe2bf3ffc051 | |
| parent | d266ffc25a49b224ad05ac49df8de1be50466f68 (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landing
| -rw-r--r-- | src/FreeType/ftfuncs.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index 81682e4..f47e03a 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,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. @@ -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; } } } |