Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP1:Update
java-11-openjdk.9203
java11-improved-fonts.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File java11-improved-fonts.patch of Package java-11-openjdk.9203
--- jdk11/make/lib/Awt2dLibraries.gmk Wed Jun 20 19:46:44 2018 -0700 +++ jdk11/make/lib/Awt2dLibraries.gmk Thu Jun 21 10:20:34 2018 +0200 @@ -628,7 +628,7 @@ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ - LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ + LIBS_unix := -lawt -ljava -ljvm -lfontconfig $(LIBM) $(LIBCXX), \ LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ -framework CoreGraphics, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ --- jdk11/src/java.desktop/share/native/libfontmanager/freetypeScaler.c Wed Jun 20 19:46:44 2018 -0700 +++ jdk11/src/java.desktop/share/native/libfontmanager/freetypeScaler.c Thu Jun 21 10:20:34 2018 +0200 @@ -38,6 +38,10 @@ #include FT_SIZES_H #include FT_OUTLINE_H #include FT_SYNTHESIS_H +#ifdef IMPROVED_FONT_RENDERING +#include FT_LCD_FILTER_H +#include <fontconfig/fontconfig.h> +#endif #include "fontscaler.h" @@ -665,6 +669,162 @@ } } +#ifdef IMPROVED_FONT_RENDERING +typedef struct { + FT_Render_Mode ftRenderMode; + int ftLoadFlags; + FT_LcdFilter ftLcdFilter; +} RenderingProperties; + +static FcPattern* matchedPattern(const FcChar8* family, double ptSize) { + /* + we will create pattern to find our family and size in + fontconfig configuration, and then will return it's + properties: + */ + FcPattern* fcPattern = 0; + fcPattern = FcPatternCreate(); + FcValue fcValue; + fcValue.type = FcTypeString; + fcValue.u.s = family; + FcPatternAdd(fcPattern, FC_FAMILY, fcValue, FcTrue); + FcPatternAddBool(fcPattern, FC_SCALABLE, FcTrue); + FcPatternAddDouble(fcPattern, FC_SIZE, ptSize); + // TODO FcPatternAddInteger(pattern, FC_WEIGHT, weight_value); + // TODO FcPatternAddInteger(pattern, FC_SLANT, slant_value); + // TODO FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size_value); + // TODO FcPatternAddInteger(pattern, FC_WIDTH, stretch); 100 in most cases + FcConfigSubstitute(0, fcPattern, FcMatchPattern); + FcConfigSubstitute(0, fcPattern, FcMatchFont); + FcDefaultSubstitute(fcPattern); + FcResult res; + + FcPattern *pattern = 0; + pattern = FcFontMatch(0, fcPattern, &res); + FcPatternDestroy(fcPattern); + return pattern; +} + +static void readFontconfig(const FcChar8* family, FTScalerContext *context, RenderingProperties* rp) { + + FcPattern *pattern = matchedPattern(family, context->ptsz); + + int ftLoadFalgs = FT_LOAD_DEFAULT; + FT_Render_Mode ftRenderMode; + FT_LcdFilter ftLcdFilter; + char horizontal = 1; + 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; + } + + // 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 { + ftRenderMode = FT_RENDER_MODE_MONO; + context->aaType = TEXT_AA_OFF; // if this was forced through Fontconfig + } + + // loading mode: + if (!fcAntialias) + ftLoadFalgs |= FT_LOAD_TARGET_MONO; + else { + int hint_style = FC_HINT_NONE; + FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &hint_style); + switch (hint_style) { + case FC_HINT_NONE: + ftLoadFalgs |= FT_LOAD_NO_HINTING; + break; + case FC_HINT_SLIGHT: + ftLoadFalgs |= FT_LOAD_TARGET_LIGHT; + break; + case FC_HINT_MEDIUM: + ftLoadFalgs |= FT_LOAD_TARGET_NORMAL; + break; + case FC_HINT_FULL: + if (fcAntialias) + ftLoadFalgs |= FT_LOAD_TARGET_NORMAL; + else + ftLoadFalgs |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V; + break; + default: + // what else to use as default? + ftLoadFalgs |= FT_LOAD_TARGET_NORMAL; + break; + } + } + + // autohinting: + if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcBool) == FcResultMatch && fcBool) + ftLoadFalgs |= FT_LOAD_FORCE_AUTOHINT; + + // LCD filter: + int filter = FC_LCD_DEFAULT; + FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &filter); + switch (filter) { + case FC_LCD_NONE: + ftLcdFilter = FT_LCD_FILTER_NONE; + break; + case FC_LCD_DEFAULT: + ftLcdFilter = FT_LCD_FILTER_DEFAULT; + break; + case FC_LCD_LIGHT: + ftLcdFilter = FT_LCD_FILTER_LIGHT; + break; + case FC_LCD_LEGACY: + ftLcdFilter = FT_LCD_FILTER_LEGACY; + break; + default: + // new unknown lcd filter type?! will use default one: + ftLcdFilter = FT_LCD_FILTER_DEFAULT; + break; + } + + FcPatternDestroy(pattern); + + rp->ftRenderMode = ftRenderMode; + rp->ftLoadFlags = ftLoadFalgs; + rp->ftLcdFilter = ftLcdFilter; +} +#endif /* * Class: sun_font_FreetypeFontScaler @@ -680,7 +840,9 @@ UInt16 width, height; GlyphInfo *glyphInfo; int glyph_index; +#ifndef IMPROVED_FONT_RENDERING int renderFlags = FT_LOAD_RENDER, target; +#endif FT_GlyphSlot ftglyph; FTScalerContext* context = @@ -698,6 +860,11 @@ return ptr_to_jlong(getNullGlyphImage()); } +#ifdef IMPROVED_FONT_RENDERING + RenderingProperties renderingProperties; + readFontconfig((const FcChar8 *) scalerInfo->face->family_name, + context, &renderingProperties); +#else if (!context->useSbits) { renderFlags |= FT_LOAD_NO_BITMAP; } @@ -719,10 +886,17 @@ target = FT_LOAD_TARGET_LCD_V; } renderFlags |= target; +#endif glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode); +#ifdef IMPROVED_FONT_RENDERING + FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter); + error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); +#else error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); +#endif + if (error) { //do not destroy scaler yet. //this can be problem of particular context (e.g. with bad transform) @@ -741,9 +915,13 @@ /* generate bitmap if it is not done yet e.g. if algorithmic styling is performed and style was added to outline */ +#ifdef IMPROVED_FONT_RENDERING + FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode); +#else if (ftglyph->format == FT_GLYPH_FORMAT_OUTLINE) { FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target)); } +#endif width = (UInt16) ftglyph->bitmap.width; height = (UInt16) ftglyph->bitmap.rows; @@ -957,7 +1135,9 @@ static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D, FTScalerContext *context, FTScalerInfo* scalerInfo, jint glyphCode, jfloat xpos, jfloat ypos) { +#ifndef IMPROVED_FONT_RENDERING int renderFlags; +#endif int glyph_index; FT_Error error; FT_GlyphSlot ftglyph; @@ -972,11 +1152,22 @@ return NULL; } +#ifdef IMPROVED_FONT_RENDERING + RenderingProperties renderingProperties; + readFontconfig((const FcChar8 *) scalerInfo->face->family_name, + context, &renderingProperties); +#else renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP; +#endif glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode); +#ifdef IMPROVED_FONT_RENDERING + error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); +#else error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); +#endif + if (error) { return NULL; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
