diff options
| author | Dmitry Batrak <Dmitry.Batrak@jetbrains.com> | 2018-06-05 18:24:35 +0300 |
|---|---|---|
| committer | Dmitry Batrak <Dmitry.Batrak@jetbrains.com> | 2018-06-05 18:24:35 +0300 |
| commit | 2509b151395402f1259bb398ca6b3158c87692db (patch) | |
| tree | 425ab5d66e9e5ab5182a6da7a941fe70ad40af87 | |
| parent | a11337ebb4aed7efc9d8dc96e1818bbaa35ad87a (diff) | |
| download | jdk8u_jdk-2509b151395402f1259bb398ca6b3158c87692db.tar.gz | |
refix IDEA-150876 (OpenJDK fonts for toolwindow names look worse than Oracles's) by backporting fix for JDK-8203485 from JDK11jb8u152-b1279
| -rw-r--r-- | src/share/native/sun/font/freetypeScaler.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/share/native/sun/font/freetypeScaler.c b/src/share/native/sun/font/freetypeScaler.c index 8d619c49a1..ea651831f6 100644 --- a/src/share/native/sun/font/freetypeScaler.c +++ b/src/share/native/sun/font/freetypeScaler.c @@ -62,7 +62,7 @@ #define FTFixedToFloat(x) ((x) / (float)(ftFixed1)) #define FT26Dot6ToFloat(x) ((x) / ((float) (1<<6))) #define FT26Dot6ToDouble(x) ((x) / ((double) (1<<6))) -#define ROUND(x) ((int) (x+0.5)) +#define FT26Dot6ToInt(x) (((int)(x)) >> 6) #define DEFAULT_DPI 72 #define MAX_DPI 1024 #define ADJUST_FONT_SIZE(X, DPI) (((X)*DEFAULT_DPI + ((DPI)>>1))/(DPI)) @@ -1254,12 +1254,12 @@ Java_sun_font_FreetypeFontScaler_getGlyphImageNative( } else { if (!ftglyph->advance.y) { glyphInfo->advanceX = - (float) ROUND(FT26Dot6ToFloat(ftglyph->advance.x)); + (float) FT26Dot6ToInt(ftglyph->advance.x); glyphInfo->advanceY = 0; } else if (!ftglyph->advance.x) { glyphInfo->advanceX = 0; glyphInfo->advanceY = - (float) ROUND(FT26Dot6ToFloat(-ftglyph->advance.y)); + (float) FT26Dot6ToInt(-ftglyph->advance.y); } else { glyphInfo->advanceX = FT26Dot6ToFloat(ftglyph->advance.x); glyphInfo->advanceY = FT26Dot6ToFloat(-ftglyph->advance.y); |