PORTREVISION=	1

FONTCONFIG_IMPLIES=	X11

FONTCONFIG_EXTRA_PATCHES=	${PATCHDIR}/freetypeScaler-fontconfig.patch

FONTCONFIG_EXTRA_PATCHES_OFF=	${PATCHDIR}/freetypeScaler-fontconfig-off.patch

FONTCONFIG_LDFLAGS=	-L${LOCALBASE}/lib -lfontconfig

	@${REINPLACE_CMD} -e 's|%%FONTCONFIG_LDFLAGS%%|${FONTCONFIG_LDFLAGS}|' \

	    ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk

--- jdk/src/share/native/sun/font/freetypeScaler.c

+++ jdk/src/share/native/sun/font/freetypeScaler.c

@@ -60,6 +60,7 @@

     JNIEnv* env;

     FT_Library library;

     FT_Face face;

+    FT_Stream faceStream;

     jobject font2D;

     jobject directBuffer;

@@ -107,15 +108,10 @@

     if (scalerInfo == NULL)

         return;

-    //apparently Done_Face will only close the stream

-    // but will not relase the memory of stream structure.

-    // We need to free it explicitly to avoid leak.

-    //Direct access to the stream field might be not ideal solution as

-    // it is considred to be "private".

-    //Alternatively we could have stored pointer to the structure

-    // in the scalerInfo but this will increase size of the structure

-    // for no good reason

-    stream = scalerInfo->face->stream;

+    // FT_Done_Face always closes the stream, but only frees the memory

+    // of the data structure if it was internally allocated by FT.

+    // We hold on to a pointer to the stream structure if we provide it

+    // ourselves, so that we can free it here.

     FT_Done_Face(scalerInfo->face);

     FT_Done_FreeType(scalerInfo->library);

@@ -128,8 +124,8 @@

         free(scalerInfo->fontData);

     }

-   if (stream != NULL) {

-        free(stream);

+   if (scalerInfo->faceStream != NULL) {

+        free(scalerInfo->faceStream);

    }

     free(scalerInfo);

@@ -302,6 +298,10 @@

                                          &ft_open_args,

                                          indexInCollection,

                                          &scalerInfo->face);

+

+                    if (!error) {

+                        scalerInfo->faceStream = ftstream;

+                    }

                 }

                 if (error || scalerInfo->directBuffer == NULL) {

                     free(ftstream);

--- jdk/src/share/native/sun/font/freetypeScaler.c.orig	2017-01-20 17:04:07 UTC

+++ jdk/src/share/native/sun/font/freetypeScaler.c

@@ -38,6 +38,8 @@

 #include FT_SIZES_H

 #include FT_OUTLINE_H

 #include FT_SYNTHESIS_H

+#include FT_LCD_FILTER_H

+#include <fontconfig/fontconfig.h>

 #include "fontscaler.h"

@@ -60,6 +62,7 @@ typedef struct {

     JNIEnv* env;

     FT_Library library;

     FT_Face face;

+    FT_Stream faceStream;

     jobject font2D;

     jobject directBuffer;

@@ -107,15 +110,10 @@ static void freeNativeResources(JNIEnv *

     if (scalerInfo == NULL)

         return;

-    //apparently Done_Face will only close the stream

-    // but will not relase the memory of stream structure.

-    // We need to free it explicitly to avoid leak.

-    //Direct access to the stream field might be not ideal solution as

-    // it is considred to be "private".

-    //Alternatively we could have stored pointer to the structure

-    // in the scalerInfo but this will increase size of the structure

-    // for no good reason

-    stream = scalerInfo->face->stream;

+    // FT_Done_Face always closes the stream, but only frees the memory

+    // of the data structure if it was internally allocated by FT.

+    // We hold on to a pointer to the stream structure if we provide it

+    // ourselves, so that we can free it here.

     FT_Done_Face(scalerInfo->face);

     FT_Done_FreeType(scalerInfo->library);

@@ -128,8 +126,8 @@ static void freeNativeResources(JNIEnv *

         free(scalerInfo->fontData);

     }

-   if (stream != NULL) {

-        free(stream);

+   if (scalerInfo->faceStream != NULL) {

+        free(scalerInfo->faceStream);

    }

     free(scalerInfo);

@@ -333,6 +331,10 @@ Java_sun_font_FreetypeFontScaler_initNat

                                          &ft_open_args,

                                          indexInCollection,

                                          &scalerInfo->face);

+

+                    if (!error) {

+                        scalerInfo->faceStream = ftstream;

+                    }

                 }

                 if (error || scalerInfo->directBuffer == NULL) {

                     free(ftstream);

@@ -693,6 +695,128 @@ static void CopyFTSubpixelVToSubpixel(co

     }

 }

+typedef struct {

+    FT_Render_Mode ftRenderMode;

+    int ftLoadFlags;

+    FT_LcdFilter ftLcdFilter;

+} RenderingProperties;

+

+static FcPattern* matchedPattern(const FcChar8* family, double ptSize) {

+    FcPattern* pattern = FcPatternCreate();

+    if (!pattern)

+        return 0;

+

+    FcPatternAddString(pattern, FC_FAMILY, family);

+    FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);

+    FcPatternAddDouble(pattern, FC_SIZE, ptSize);

+

+    FcConfigSubstitute(0, pattern, FcMatchPattern);

+    FcDefaultSubstitute(pattern);

+

+    FcResult res;

+    FcPattern *match = FcFontMatch(0, pattern, &res);

+    FcPatternDestroy(pattern);

+    return match;

+}

+

+static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) {

+    FcPattern *pattern = matchedPattern(family, ptSize);

+

+    FT_Render_Mode ftRenderMode = FT_RENDER_MODE_NORMAL;

+    int ftLoadFlags = FT_LOAD_DEFAULT;

+    FT_LcdFilter ftLcdFilter = FT_LCD_FILTER_DEFAULT;

+    FcBool fcAntialias = 0;

+    char horizontal = 1;

+

+    // subpixel order

+    if (aaType == TEXT_AA_ON)

+        ftRenderMode = FT_RENDER_MODE_NORMAL;

+    else if (aaType == TEXT_AA_OFF)

+        ftRenderMode = FT_RENDER_MODE_MONO;

+    else {

+        int fcRGBA = FC_RGBA_UNKNOWN;

+        FcPatternGetInteger(pattern, FC_RGBA, 0, &fcRGBA);

+        switch (fcRGBA) {

+        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:

+            ftRenderMode = FT_RENDER_MODE_NORMAL;

+            break;

+        }

+    }

+

+    // loading mode

+    if (aaType == TEXT_AA_OFF)

+        ftLoadFlags |= FT_LOAD_TARGET_MONO;

+    else {

+        int fcHintStyle = FC_HINT_NONE;

+        FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &fcHintStyle);

+        switch (fcHintStyle) {

+        case FC_HINT_NONE:

+            ftLoadFlags |= FT_LOAD_NO_HINTING;

+            break;

+        case FC_HINT_SLIGHT:

+            ftLoadFlags |= FT_LOAD_TARGET_LIGHT;

+            break;

+        case FC_HINT_MEDIUM:

+            ftLoadFlags |= FT_LOAD_TARGET_NORMAL;

+            break;

+        case FC_HINT_FULL:

+            if (aaType == TEXT_AA_ON)

+                ftLoadFlags |= FT_LOAD_TARGET_NORMAL;

+            else

+                ftLoadFlags |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V;

+            break;

+        default:

+            ftLoadFlags |= FT_LOAD_TARGET_NORMAL;

+            break;

+        }

+    }

+

+    // autohinting

+    FcBool fcAutohint = 0;

+    if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcAutohint) == FcResultMatch)

+        if (fcAutohint)

+            ftLoadFlags |= FT_LOAD_FORCE_AUTOHINT;

+

+    // LCD filter

+    int fcLCDFilter = FC_LCD_DEFAULT;

+    FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &fcLCDFilter);

+    switch (fcLCDFilter) {

+    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:

+        ftLcdFilter = FT_LCD_FILTER_DEFAULT;

+        break;

+    }

+

+    FcPatternDestroy(pattern);

+

+    rp->ftRenderMode = ftRenderMode;

+    rp->ftLoadFlags = ftLoadFlags;

+    rp->ftLcdFilter = ftLcdFilter;

+}

 /*

  * Class:     sun_font_FreetypeFontScaler

@@ -726,32 +850,15 @@ Java_sun_font_FreetypeFontScaler_getGlyp

         return ptr_to_jlong(getNullGlyphImage());

     }

-    /* if algorithmic styling is required then we do not request bitmap */

-    if (context->doBold || context->doItalize) {

-        renderFlags =  FT_LOAD_DEFAULT;

-    }

-

-    /* NB: in case of non identity transform

-     we might also prefer to disable transform before hinting,

-     and apply it explicitly after hinting is performed.

-     Or we can disable hinting. */

-

-    /* select appropriate hinting mode */

-    if (context->aaType == TEXT_AA_OFF) {

-        target = FT_LOAD_TARGET_MONO;

-    } else if (context->aaType == TEXT_AA_ON) {

-        target = FT_LOAD_TARGET_NORMAL;

-    } else if (context->aaType == TEXT_AA_LCD_HRGB ||

-               context->aaType == TEXT_AA_LCD_HBGR) {

-        target = FT_LOAD_TARGET_LCD;

-    } else {

-        target = FT_LOAD_TARGET_LCD_V;

-    }

-    renderFlags |= target;

+    RenderingProperties renderingProperties;

+    readFontconfig((const FcChar8 *) scalerInfo->face->family_name,

+                   context->ptsz, context->aaType, &renderingProperties);

     glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);

-    error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);

+    FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);

+    error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);

+

     if (error) {

         //do not destroy scaler yet.

         //this can be problem of particular context (e.g. with bad transform)

@@ -770,9 +877,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp

     /* generate bitmap if it is not done yet

      e.g. if algorithmic styling is performed and style was added to outline */

-    if (ftglyph->format == FT_GLYPH_FORMAT_OUTLINE) {

-        FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));

-    }

+    FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode);

     width  = (UInt16) ftglyph->bitmap.width;

     height = (UInt16) ftglyph->bitmap.rows;

@@ -1001,11 +1106,14 @@ static FT_Outline* getFTOutline(JNIEnv* 

         return NULL;

     }

-    renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;

+    RenderingProperties renderingProperties;

+    readFontconfig((const FcChar8 *) scalerInfo->face->family_name,

+                   context->ptsz, context->aaType, &renderingProperties);

     glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);

-    error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);

+    error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);

+

     if (error) {

         return NULL;

     }

@@ -943,7 +943,7 @@

     LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \

     LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \

     LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\

-    LDFLAGS_SUFFIX_bsd := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \

+    LDFLAGS_SUFFIX_bsd := %%FONTCONFIG_LDFLAGS%% -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \

     LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \

         -ljava -ljvm, \

     LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \