Attachment 567 Details for Bug 925 – a patch for performance improvement

[patch] a patch for performance improvement

1.6_to_1.7.patch (text/plain), 3.10 KB, created by Chisato Yamauchi on 2004-08-04 04:36:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chisato Yamauchi

Created: 2004-08-04 04:36:42 UTC

Size: 3.10 KB

patch

obsolete

>--- ftfuncs.c.1.6	2004-08-04 19:54:16.000000000 +0900
>+++ ftfuncs.c	2004-08-04 20:00:25.000000000 +0900
>@@ -92,12 +92,6 @@
> #define DEFAULT_VERY_LAZY 2     	/* Multi-byte only */
> /* #define DEFAULT_VERY_LAZY 256 */   	/* Unicode only */
> 
>-#if (FREETYPE_VERSION < 2001008)
>-#ifdef DEFAULT_VERY_LAZY
>-#undef DEFAULT_VERY_LAZY
>-#endif
>-#endif
>-
> /* Does the X accept noSuchChar? */
> #define X_ACCEPTS_NO_SUCH_CHAR
> /* Does the XAA accept NULL noSuchChar.bits?(dangerous) */
>@@ -912,7 +906,8 @@
> 
> static FT_Error
> FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index,
>-		    FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return )
>+		    FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return,
>+		    int *sbitchk_incomplete_but_exist )
> {
> #if (FREETYPE_VERSION >= 2001008)
>     SFNT_Service       sfnt;
>@@ -979,7 +974,15 @@
>   Exit:
>       return error;
> #else	/* if (FREETYPE_VERSION < 2001008) */
>-      return -1;
>+    TT_Face            face;
>+    SFNT_Service       sfnt;
>+    if ( ! FT_IS_SFNT( ft_face ) ) return -1;
>+    face = (TT_Face)ft_face;
>+    sfnt = (SFNT_Service)face->sfnt;
>+    if ( strike_index != 0xFFFFU && sfnt->load_sbits ) {
>+        if ( sbitchk_incomplete_but_exist ) *sbitchk_incomplete_but_exist=1;
>+    }
>+    return -1;
> #endif
> }
> 
>@@ -999,6 +1002,7 @@
>     int dx, dy;
>     int leftSideBearing, rightSideBearing, characterWidth, rawCharacterWidth,
>         ascent, descent;
>+    int sbitchk_incomplete_but_exist;
>     double bbox_center_raw;
> 
>     face = instance->face;
>@@ -1027,14 +1031,15 @@
> 	    int new_width;
> 	    double ratio;
> 
>+	    sbitchk_incomplete_but_exist=0;
> 	    if( ! (instance->load_flags & FT_LOAD_NO_BITMAP) ) {
> 		if( FT_Do_SBit_Metrics(face->face,instance->size,instance->strike_index,
>-				       idx,&sbit_metrics)==0 ) {
>+				       idx,&sbit_metrics,&sbitchk_incomplete_but_exist)==0 ) {
> 		    bitmap_metrics = &sbit_metrics;
> 		}
> 	    }
> 	    if( bitmap_metrics == NULL ) {
>-		if ( instance->ttcap.flags & TTCAP_IS_VERY_LAZY ) {
>+		if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
> 		    if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
> 					       instance->ttcap.vl_slant,
> 					       &instance->transformation.matrix,
>@@ -1053,7 +1058,7 @@
> 	    }
> 
> 	    if( bitmap_metrics ) {
>-		int factor;
>+		FT_Pos factor;
> 		
> 		leftSideBearing = bitmap_metrics->horiBearingX / 64;
> 		rightSideBearing = (bitmap_metrics->width + bitmap_metrics->horiBearingX) / 64;
>@@ -1170,14 +1175,16 @@
>     else if( flags & FT_FORCE_CONSTANT_SPACING ) correct=1;
>     else{
> 	int sbit_available=0;
>+	sbitchk_incomplete_but_exist=0;
> 	if( !(instance->load_flags & FT_LOAD_NO_BITMAP) ) {
> 	    if( FT_Do_SBit_Metrics(face->face,instance->size,
>-				   instance->strike_index,idx,NULL)==0 ) {
>+				   instance->strike_index,idx,NULL,
>+				   &sbitchk_incomplete_but_exist)==0 ) {
> 		sbit_available=1;
> 	    }
> 	}
> 	if( sbit_available == 0 ) {
>-	    if ( instance->ttcap.flags & TTCAP_IS_VERY_LAZY ) {
>+	    if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
> 		if( FT_IS_SFNT(face->face) ) correct=1;
> 	    }
> 	}

Actions: View | Splinter Review

Attachments on bug 925: 561 | 562 | 567

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.