/hg/icedtea7-forest/jdk: 7 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Feb 6 19:43:29 UTC 2017
changeset 52de2c27b131 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=52de2c27b131
author: andrew
date: Tue Jan 24 23:02:54 2017 +0000
PR3318: Fix compatibility with vanilla Fontconfig
Contributed-by: Matthias Dahl <ml_openjdk-lists at binary-island.eu>
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.
changeset 809e541ee8ff in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=809e541ee8ff
author: andrew
date: Tue Jan 24 23:21:34 2017 +0000
PR3318: Fix glyph y advance
Contributed-by: Matthias Dahl <ml_openjdk-lists at binary-island.eu>
The y advance needs to be negated as the final step, otherwise the
rounding will naturally be wrong.
This did show itself for example as shifted into each other glyphs in
Android Studio for text where a rotation was applied (e.g. scale on
the ui builder).
changeset 412d3eb66e5b in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=412d3eb66e5b
author: andrew
date: Tue Jan 24 23:41:30 2017 +0000
PR3318: Always round glyph advance in 26.6 space
Contributed-by: Matthias Dahl <ml_openjdk-lists at binary-island.eu>
By rounding in the 26.6 space, the glyph advance can be snapped to the
next 64 boundary by integer arithmetic alone, thus avoiding floating
arithmetic and improving accuracy.
changeset fbda034f33b2 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=fbda034f33b2
author: andrew
date: Wed Jan 25 00:24:10 2017 +0000
PR3318: Simplify glyph advance handling
Contributed-by: Matthias Dahl <ml_openjdk-lists at binary-island.eu>
Reduce the branches and always round and convert the advance, no matter
if its zero or not since it is guaranteed that 0 divided by a floating
point always equals zero.
changeset e7f45775d9a8 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=e7f45775d9a8
author: andrew
date: Mon Feb 06 04:37:12 2017 +0000
PR3318: Replace 'infinality' with 'improved font rendering'
changeset 2f95b16f0065 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=2f95b16f0065
author: andrew
date: Mon Feb 06 09:39:53 2017 +0000
Bump to icedtea-2.7.0pre09
changeset 59286ffdd75a in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=59286ffdd75a
author: andrew
date: Mon Feb 06 19:40:28 2017 +0000
Added tag icedtea-2.7.0pre09 for changeset 2f95b16f0065
diffstat:
.hgtags | 1 +
make/jdk_generic_profile.sh | 2 +-
make/sun/font/Makefile | 6 +-
src/share/native/sun/font/freetypeScaler.c | 121 +++++++++++++++-------------
4 files changed, 69 insertions(+), 61 deletions(-)
diffs (283 lines):
diff -r 0c8d453a5b46 -r 59286ffdd75a .hgtags
--- a/.hgtags Mon Mar 21 11:24:09 2016 +0100
+++ b/.hgtags Mon Feb 06 19:40:28 2017 +0000
@@ -644,3 +644,4 @@
cc1ed9a351886645eb729144696e41d187564ec2 jdk7u111-b01
5e3d7e2b2a002891085b3483d204bdd9f85af395 icedtea-2.7.0pre07
15b47679f447bb41684452a043c230e334222329 icedtea-2.7.0pre08
+2f95b16f0065477e54b1601b5da0907812176446 icedtea-2.7.0pre09
diff -r 0c8d453a5b46 -r 59286ffdd75a make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh Mon Mar 21 11:24:09 2016 +0100
+++ b/make/jdk_generic_profile.sh Mon Feb 06 19:40:28 2017 +0000
@@ -671,7 +671,7 @@
# IcedTea versioning
export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.7.0pre08"
+export PACKAGE_VERSION="2.7.0pre09"
export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
echo "Building ${DERIVATIVE_ID}"
diff -r 0c8d453a5b46 -r 59286ffdd75a make/sun/font/Makefile
--- a/make/sun/font/Makefile Mon Mar 21 11:24:09 2016 +0100
+++ b/make/sun/font/Makefile Mon Feb 06 19:40:28 2017 +0000
@@ -113,8 +113,8 @@
endif
# Turn on infinality rendering support when requested
-ifeq ($(INFINALITY_SUPPORT),true)
- OTHER_CFLAGS += $(FONTCONFIG_CFLAGS) -DINFINALITY
+ifeq ($(IMPROVED_FONT_RENDERING),true)
+ OTHER_CFLAGS += $(FONTCONFIG_CFLAGS) -DIMPROVED_FONT_RENDERING
endif
#In the non-OpenJDK mode we need to build T2K
@@ -158,7 +158,7 @@
OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) $(FT2_LIBS)
endif
-ifeq ($(INFINALITY_SUPPORT),true)
+ifeq ($(IMPROVED_FONT_RENDERING),true)
OTHER_LDLIBS += $(FONTCONFIG_LIBS)
endif
diff -r 0c8d453a5b46 -r 59286ffdd75a src/share/native/sun/font/freetypeScaler.c
--- a/src/share/native/sun/font/freetypeScaler.c Mon Mar 21 11:24:09 2016 +0100
+++ b/src/share/native/sun/font/freetypeScaler.c Mon Feb 06 19:40:28 2017 +0000
@@ -38,7 +38,7 @@
#include FT_SIZES_H
#include FT_OUTLINE_H
#include FT_SYNTHESIS_H
-#ifdef INFINALITY
+#ifdef IMPROVED_FONT_RENDERING
#include FT_LCD_FILTER_H
#include <fontconfig/fontconfig.h>
#endif
@@ -49,7 +49,7 @@
#define FloatToFTFixed(f) (FT_Fixed)((f) * (float)(ftFixed1))
#define FTFixedToFloat(x) ((x) / (float)(ftFixed1))
#define FT26Dot6ToFloat(x) ((x) / ((float) (1<<6)))
-#define ROUND(x) ((int) (x+0.5))
+#define ROUND26Dot6(x) ((x + 63) & -64)
typedef struct {
/* Important note:
@@ -655,7 +655,7 @@
}
}
-#ifdef INFINALITY
+#ifdef IMPROVED_FONT_RENDERING
typedef struct {
FT_Render_Mode ftRenderMode;
int ftLoadFlags;
@@ -691,50 +691,66 @@
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;
- // 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) {
+ // 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;
+ }
+
+ // 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;
@@ -750,7 +766,7 @@
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;
@@ -763,9 +779,8 @@
}
// 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;
@@ -812,7 +827,7 @@
GlyphInfo *glyphInfo;
int glyph_index;
FT_GlyphSlot ftglyph;
-#ifndef INFINALITY
+#ifndef IMPROVED_FONT_RENDERING
int renderFlags = FT_LOAD_RENDER, target;
#endif
@@ -831,10 +846,10 @@
return ptr_to_jlong(getNullGlyphImage());
}
-#ifdef INFINALITY
+#ifdef IMPROVED_FONT_RENDERING
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) {
@@ -862,7 +877,7 @@
glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-#ifdef INFINALITY
+#ifdef IMPROVED_FONT_RENDERING
FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);
error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
#else
@@ -887,7 +902,7 @@
/* generate bitmap if it is not done yet
e.g. if algorithmic styling is performed and style was added to outline */
-#ifdef INFINALITY
+#ifdef IMPROVED_FONT_RENDERING
FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode);
#else
if (ftglyph->format == FT_GLYPH_FORMAT_OUTLINE) {
@@ -925,18 +940,10 @@
glyphInfo->advanceY =
(float) (advh * FTFixedToFloat(context->transform.xy));
} else {
- if (!ftglyph->advance.y) {
- glyphInfo->advanceX =
- (float) ROUND(FT26Dot6ToFloat(ftglyph->advance.x));
- glyphInfo->advanceY = 0;
- } else if (!ftglyph->advance.x) {
- glyphInfo->advanceX = 0;
- glyphInfo->advanceY =
- (float) ROUND(FT26Dot6ToFloat(-ftglyph->advance.y));
- } else {
- glyphInfo->advanceX = FT26Dot6ToFloat(ftglyph->advance.x);
- glyphInfo->advanceY = FT26Dot6ToFloat(-ftglyph->advance.y);
- }
+ glyphInfo->advanceX =
+ (float) FT26Dot6ToFloat(ROUND26Dot6(ftglyph->advance.x));
+ glyphInfo->advanceY =
+ (float) -FT26Dot6ToFloat(ROUND26Dot6(ftglyph->advance.y));
}
if (imageSize == 0) {
@@ -1107,7 +1114,7 @@
static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
FTScalerContext *context, FTScalerInfo* scalerInfo,
jint glyphCode, jfloat xpos, jfloat ypos) {
-#ifndef INFINALITY
+#ifndef IMPROVED_FONT_RENDERING
int renderFlags;
#endif
int glyph_index;
@@ -1124,17 +1131,17 @@
return NULL;
}
-#ifdef INFINALITY
+#ifdef IMPROVED_FONT_RENDERING
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
glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-#ifdef INFINALITY
+#ifdef IMPROVED_FONT_RENDERING
error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
#else
error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
More information about the distro-pkg-dev
mailing list