Attachment 72726 Details for Bug 157441

[patch] Fix for pitch problem with CJK fonts

ft2-autofit-04-cjk-fixed-pitch.diff (text/plain), 2.12 KB, created by Takashi Iwai on 2006-03-14 09:29:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2006-03-14 09:29:21 UTC

Size: 2.12 KB

patch

obsolete

>--- src/autofit/afcjk.c-dist	2006-03-13 23:13:47.000000000 +0100
>+++ src/autofit/afcjk.c	2006-03-13 23:47:30.000000000 +0100
>@@ -44,6 +44,10 @@ af_cjk_hints_init(AF_GlyphHints hints, A
> 		hints->other_flags |= AF_LATIN_HINTS_STEM_ADJUST;
> 	if (mode == FT_RENDER_MODE_MONO)
> 		hints->other_flags |= AF_LATIN_HINTS_MONO;
>+
>+	/* fixed pitch is preferred for CJK glyphs */
>+	metrics->scaler.is_fixed = 1;
>+
> 	return 0;
> }
> 
>--- src/autofit/afloader.c-dist	2006-03-13 23:14:20.000000000 +0100
>+++ src/autofit/afloader.c	2006-03-13 23:15:19.000000000 +0100
>@@ -402,19 +402,11 @@
> 
>       /* for mono-width fonts (like Andale, Courier, etc.) we need */
>       /* to keep the original rounded advance width                */
>-#if 0
>-      if ( !FT_IS_FIXED_WIDTH( slot->face ) )
>-        slot->metrics.horiAdvance = loader->pp2.x - loader->pp1.x;
>-      else
>-        slot->metrics.horiAdvance = FT_MulFix( slot->metrics.horiAdvance,
>-                                               x_scale );
>-#else
>-      if ( !FT_IS_FIXED_WIDTH( slot->face ) )
>+      if ( ! metrics->scaler.is_fixed )
>         slot->metrics.horiAdvance = loader->pp2.x - loader->pp1.x;
>       else
>         slot->metrics.horiAdvance = FT_MulFix( slot->metrics.horiAdvance,
>                                                metrics->scaler.x_scale );
>-#endif
> 
>       slot->metrics.horiAdvance = FT_PIX_ROUND( slot->metrics.horiAdvance );
> 
>@@ -461,6 +453,7 @@
> 
>     scaler.render_mode = FT_LOAD_TARGET_MODE( load_flags );
>     scaler.flags       = 0;  /* XXX: fix this */
>+    scaler.is_fixed = FT_IS_FIXED_WIDTH( face ) != 0;
> 
>     error = af_loader_reset( loader, face );
>     if ( !error )
>--- src/autofit/aftypes.h-dist	2006-03-13 23:14:04.000000000 +0100
>+++ src/autofit/aftypes.h	2006-03-13 23:02:23.000000000 +0100
>@@ -196,6 +196,7 @@ FT_BEGIN_HEADER
>     FT_Pos          y_delta;     /* in 1/64th device pixels                 */
>     FT_Render_Mode  render_mode; /* monochrome, anti-aliased, LCD, etc.     */
>     FT_UInt32       flags;       /* additional control flags, see above     */
>+    FT_Bool         is_fixed;    /* is fixed pitch?                         */
> 
>   } AF_ScalerRec, *AF_Scaler;
>

Actions: View | Diff

Attachments on bug 157441: 72418 | 72726 | 72728 | 72808 | 72830 | 72831 | 72883 | 76171 | 76172 | 76174 | 76176 | 76177 | 76181