[PATCH 1/4] Fix compatibility with vanilla Fontconfig
Matthias Dahl
ml_openjdk-lists at binary-island.eu
Wed Dec 28 15:31:10 UTC 2016
From: Matthias Dahl <matthias.dahl at binary-island.eu>
Date: Tue, 27 Dec 2016 16:58:25 +0100
Subject: [PATCH 1/4] Fix compatibility with vanilla Fontconfig
With vanilla Fontconfig, most text is not rendered.
The "Infinality"-patched Fontconfig with its own configuration, supplies
an additional config file that sets the antialias key (FC_ANTIALIAS) which
is not part of the vanilla Fontconfig and also has no default in its
source code.
In the case that FC_ANTIALIAS is not being provided for a given font
because the font does not contain the appropriate information (which is
quite common) or a specific config file is missing, FcPatternGetBool for
the key will return an error and no valid result. Thus, ftRenderMode
stays uninitialized due to the way its initialized in the conditional
constructs, eventually causing the text rendering anomaly.
Furthermore, the logic is flawed as well. The specific subpixel
rendering modes are only properly set if FC_ANTIALIAS is set and true,
no matter what was requested by the caller (aaType).
This patch makes the following changes to address those problems:
1. ftRenderMode is always properly initialized.
2. FC_ANTIALIAS is only evaluated if antialiasing was requested and only
used to turn off antialiasing if that is suggested by Fontconfig.
3. Subpixel rendering modes are properly set according to Fontconfig
results and only if subpixel rendering was actually requested.
In order to properly adjust for the "forced off" antialiasing, it is
necessary to change the signature of readFontconfig and give it full
access to FTScalerContext, so it can properly set the new aaType.
Fixes: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3271
---
src/share/native/sun/font/freetypeScaler.c | 85 ++++++++++++++++++------------
1 file changed, 50 insertions(+), 35 deletions(-)
diff --git a/src/share/native/sun/font/freetypeScaler.c b/src/share/native/sun/font/freetypeScaler.c
index ed8141e92..09dbef7ab 100644
--- a/src/share/native/sun/font/freetypeScaler.c
+++ b/src/share/native/sun/font/freetypeScaler.c
@@ -696,50 +696,66 @@ static FcPattern* matchedPattern(const FcChar8* family, double ptSize) {
return pattern;
}
-static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) {
+static void readFontconfig(const FcChar8* family, FTScalerContext *context, RenderingProperties* rp) {
- FcPattern *pattern = matchedPattern(family, ptSize);
+ FcPattern *pattern = matchedPattern(family, context->ptsz);
int ftLoadFalgs = FT_LOAD_DEFAULT;
FT_Render_Mode ftRenderMode;
FT_LcdFilter ftLcdFilter;
char horizontal = 1;
- FcBool b;
+ FcBool fcAntialias = false, fcBool;
+
+ // If the user has no antialias information set in their fontconfig directory
+ // and the font itself does not provide any hints either (which is common),
+ // Fontconfig may not return any antialias hint about the selected font since
+ // it does not set any default for this key internally.
+ // Use the antialias hint when it is available but only if antialiasing was
+ // actually requested by the caller.
+ // If antialiasing was requested but Fontconfig states to use no antialiasing,
+ // that takes precedence and also modifies the supplied context to account for
+ // the change (sets context->aaType to TEXT_AA_OFF as a side-effect in the render
+ // mode conditional block down below).
+ if (context->aaType != TEXT_AA_OFF) {
+ if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &fcAntialias) != FcResultMatch)
+ fcAntialias = true;
+ }
- // subpixel order:
- if (aaType == TEXT_AA_ON)
- ftRenderMode = FT_RENDER_MODE_NORMAL;
- else if (aaType == TEXT_AA_OFF)
- ftRenderMode = FT_RENDER_MODE_MONO;
- else if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &b) == FcResultMatch)
- if (b) {
+ // render mode:
+ if (fcAntialias) {
+ if (context->aaType == TEXT_AA_ON)
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ else {
+ // subpixel order:
int subpixel = FC_RGBA_UNKNOWN;
FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel);
if (subpixel == FC_RGBA_UNKNOWN)
subpixel = FC_RGBA_NONE;
- switch (subpixel) {
- case FC_RGBA_NONE:
- ftRenderMode = FT_RENDER_MODE_NORMAL;
- break;
- case FC_RGBA_RGB:
- case FC_RGBA_BGR:
- ftRenderMode = FT_RENDER_MODE_LCD;
- horizontal = 1;
- break;
- case FC_RGBA_VRGB:
- case FC_RGBA_VBGR:
- ftRenderMode = FT_RENDER_MODE_LCD_V;
- horizontal = 0;
- break;
- default:
- break;
- }
- } else {
+ switch (subpixel) {
+ case FC_RGBA_NONE:
ftRenderMode = FT_RENDER_MODE_NORMAL;
+ break;
+ case FC_RGBA_RGB:
+ case FC_RGBA_BGR:
+ ftRenderMode = FT_RENDER_MODE_LCD;
+ horizontal = 1;
+ break;
+ case FC_RGBA_VRGB:
+ case FC_RGBA_VBGR:
+ ftRenderMode = FT_RENDER_MODE_LCD_V;
+ horizontal = 0;
+ break;
+ default:
+ break;
}
+ }
+ } else {
+ ftRenderMode = FT_RENDER_MODE_MONO;
+ context->aaType = TEXT_AA_OFF; // if this was forced through Fontconfig
+ }
// loading mode:
- if (aaType == TEXT_AA_OFF)
+ if (!fcAntialias)
ftLoadFalgs |= FT_LOAD_TARGET_MONO;
else {
int hint_style = FC_HINT_NONE;
@@ -755,7 +771,7 @@ static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, Re
ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
break;
case FC_HINT_FULL:
- if (aaType == TEXT_AA_ON)
+ if (fcAntialias)
ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
else
ftLoadFalgs |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V;
@@ -768,9 +784,8 @@ static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, Re
}
// autohinting:
- if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &b) == FcResultMatch)
- if (b)
- ftLoadFalgs |= FT_LOAD_FORCE_AUTOHINT;
+ if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcBool) == FcResultMatch && fcBool)
+ ftLoadFalgs |= FT_LOAD_FORCE_AUTOHINT;
// LCD filter:
int filter = FC_LCD_DEFAULT;
@@ -839,7 +854,7 @@ Java_sun_font_FreetypeFontScaler_getGlyphImageNative(
#ifdef INFINALITY
RenderingProperties renderingProperties;
readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
- context->ptsz, context->aaType, &renderingProperties);
+ context, &renderingProperties);
#else
/* if algorithmic styling is required then we do not request bitmap */
if (context->doBold || context->doItalize) {
@@ -1132,7 +1147,7 @@ static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
#ifdef INFINALITY
RenderingProperties renderingProperties;
readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
- context->ptsz, context->aaType, &renderingProperties);
+ context, &renderingProperties);
#else
renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
#endif
--
2.11.0
More information about the distro-pkg-dev
mailing list