Lines 1-4
Link Here
|
1 |
--- jdk/src/share/native/sun/font/freetypeScaler.c.orig 2017-01-20 17:04:07 UTC |
1 |
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2019-07-18 21:55:16 UTC |
|
|
2 |
+++ jdk/make/lib/Awt2dLibraries.gmk |
3 |
@@ -943,7 +943,7 @@ |
4 |
LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
5 |
LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
6 |
LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
7 |
- LDFLAGS_SUFFIX_bsd := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
8 |
+ LDFLAGS_SUFFIX_bsd := -L%%LOCALBASE%%/lib -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
9 |
LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ |
10 |
-ljava -ljvm, \ |
11 |
LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
12 |
--- jdk/src/share/native/sun/font/freetypeScaler.c.orig 2019-07-18 21:55:16 UTC |
2 |
+++ jdk/src/share/native/sun/font/freetypeScaler.c |
13 |
+++ jdk/src/share/native/sun/font/freetypeScaler.c |
3 |
@@ -38,6 +38,8 @@ |
14 |
@@ -38,6 +38,8 @@ |
4 |
#include FT_SIZES_H |
15 |
#include FT_SIZES_H |
Lines 9-15
Link Here
|
9 |
|
20 |
|
10 |
#include "fontscaler.h" |
21 |
#include "fontscaler.h" |
11 |
|
22 |
|
12 |
@@ -693,6 +695,132 @@ static void CopyFTSubpixelVToSubpixel(co |
23 |
@@ -665,6 +667,132 @@ static void CopyFTSubpixelVToSubpixel(co |
13 |
} |
24 |
} |
14 |
} |
25 |
} |
15 |
|
26 |
|
Lines 142-154
Link Here
|
142 |
|
153 |
|
143 |
/* |
154 |
/* |
144 |
* Class: sun_font_FreetypeFontScaler |
155 |
* Class: sun_font_FreetypeFontScaler |
145 |
@@ -726,32 +850,15 @@ Java_sun_font_FreetypeFontScaler_getGlyp |
156 |
@@ -698,31 +826,15 @@ Java_sun_font_FreetypeFontScaler_getGlyp |
146 |
return ptr_to_jlong(getNullGlyphImage()); |
157 |
return ptr_to_jlong(getNullGlyphImage()); |
147 |
} |
158 |
} |
148 |
|
159 |
|
149 |
- /* if algorithmic styling is required then we do not request bitmap */ |
160 |
- if (!context->useSbits) { |
150 |
- if (context->doBold || context->doItalize) { |
161 |
- renderFlags |= FT_LOAD_NO_BITMAP; |
151 |
- renderFlags = FT_LOAD_DEFAULT; |
|
|
152 |
- } |
162 |
- } |
153 |
- |
163 |
- |
154 |
- /* NB: in case of non identity transform |
164 |
- /* NB: in case of non identity transform |
Lines 181-187
Link Here
|
181 |
if (error) { |
191 |
if (error) { |
182 |
//do not destroy scaler yet. |
192 |
//do not destroy scaler yet. |
183 |
//this can be problem of particular context (e.g. with bad transform) |
193 |
//this can be problem of particular context (e.g. with bad transform) |
184 |
@@ -770,9 +877,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp |
194 |
@@ -741,9 +853,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp |
185 |
|
195 |
|
186 |
/* generate bitmap if it is not done yet |
196 |
/* generate bitmap if it is not done yet |
187 |
e.g. if algorithmic styling is performed and style was added to outline */ |
197 |
e.g. if algorithmic styling is performed and style was added to outline */ |
Lines 192-198
Link Here
|
192 |
|
202 |
|
193 |
width = (UInt16) ftglyph->bitmap.width; |
203 |
width = (UInt16) ftglyph->bitmap.width; |
194 |
height = (UInt16) ftglyph->bitmap.rows; |
204 |
height = (UInt16) ftglyph->bitmap.rows; |
195 |
@@ -1001,11 +1106,14 @@ static FT_Outline* getFTOutline(JNIEnv* |
205 |
@@ -972,11 +1082,14 @@ static FT_Outline* getFTOutline(JNIEnv* |
196 |
return NULL; |
206 |
return NULL; |
197 |
} |
207 |
} |
198 |
|
208 |
|
Lines 209-222
Link Here
|
209 |
if (error) { |
219 |
if (error) { |
210 |
return NULL; |
220 |
return NULL; |
211 |
} |
221 |
} |
212 |
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-07-18 14:30:01.000000000 -0700 |
|
|
213 |
+++ jdk/make/lib/Awt2dLibraries.gmk 2015-07-18 14:30:08.000000000 -0700 |
214 |
@@ -943,7 +943,7 @@ |
215 |
LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
216 |
LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
217 |
LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
218 |
- LDFLAGS_SUFFIX_bsd := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
219 |
+ LDFLAGS_SUFFIX_bsd := -L%%LOCALBASE%%/lib -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
220 |
LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ |
221 |
-ljava -ljvm, \ |
222 |
LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |