stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2010-06-21 22:04:23 -07:00
commit 01848008df
6 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/make/sun/pisces/Makefile
View File

@ -52,5 +52,11 @@ build: copy-files
copy-files: $(FILES_copy) copy-files: $(FILES_copy)
$(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/java2d/pisces/META-INF/services/% ifneq ($(PLATFORM), windows)
SERVICE_SRC = $(PLATFORM_SRC)
else
SERVICE_SRC = $(SHARE_SRC)
endif
$(SERVICEDIR)/%: $(SERVICE_SRC)/classes/sun/java2d/pisces/META-INF/services/%
$(install-file) $(install-file)

5
jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
View File

@ -1,5 +1,2 @@
# Jules Rendering Engine module
sun.java2d.jules.JulesRenderingEngine
# Pisces Rendering Engine module # Pisces Rendering Engine module
sun.java2d.pisces.PiscesRenderingEngine sun.java2d.pisces.PiscesRenderingEngine

2
jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
View File

@ -182,7 +182,7 @@ SplashDecodePngStream(Splash * splash, SplashStream * stream)
int success = 0; int success = 0;
stream->read(stream, sig, SIG_BYTES); stream->read(stream, sig, SIG_BYTES);
if (!png_check_sig(sig, SIG_BYTES)) { if (png_sig_cmp(sig, 0, SIG_BYTES)) {
goto done; goto done;
} }
success = SplashDecodePng(splash, my_png_read_stream, stream); success = SplashDecodePng(splash, my_png_read_stream, stream);

19
jdk/src/share/native/sun/font/freetypeScaler.c
View File

@ -490,22 +490,23 @@ Java_sun_font_FreetypeFontScaler_getFontMetricsNative(
/* ascent */ /* ascent */
ax = 0; ax = 0;
ay = -(jfloat) FT26Dot6ToFloat( ay = -(jfloat) FT26Dot6ToFloat(FT_MulFix(
scalerInfo->face->size->metrics.ascender + ((jlong) scalerInfo->face->ascender + bmodifier/2),
bmodifier/2); (jlong) scalerInfo->face->size->metrics.y_scale));
/* descent */ /* descent */
dx = 0; dx = 0;
dy = -(jfloat) FT26Dot6ToFloat( dy = -(jfloat) FT26Dot6ToFloat(FT_MulFix(
scalerInfo->face->size->metrics.descender + ((jlong) scalerInfo->face->descender + bmodifier/2),
bmodifier/2); (jlong) scalerInfo->face->size->metrics.y_scale));
/* baseline */ /* baseline */
bx = by = 0; bx = by = 0;
/* leading */ /* leading */
lx = 0; lx = 0;
ly = (jfloat) FT26Dot6ToFloat( ly = (jfloat) FT26Dot6ToFloat(FT_MulFix(
scalerInfo->face->size->metrics.height + (jlong) scalerInfo->face->height + bmodifier,
bmodifier) + ay - dy; (jlong) scalerInfo->face->size->metrics.y_scale))
+ ay - dy;
/* max advance */ /* max advance */
mx = (jfloat) FT26Dot6ToFloat( mx = (jfloat) FT26Dot6ToFloat(
scalerInfo->face->size->metrics.max_advance + scalerInfo->face->size->metrics.max_advance +

5
jdk/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine Normal file
View File

@ -0,0 +1,5 @@
# Jules Rendering Engine module
sun.java2d.jules.JulesRenderingEngine
# Pisces Rendering Engine module
sun.java2d.pisces.PiscesRenderingEngine

4
jdk/src/windows/native/sun/font/fontpath.c
View File

@ -154,7 +154,7 @@ static int CALLBACK EnumFontFacesInFamilyProcA(
fullname = JNU_NewStringPlatform(env, lpelfe->elfFullName); fullname = JNU_NewStringPlatform(env, lpelfe->elfFullName);
fullnameLC = (*env)->CallObjectMethod(env, fullname, fullnameLC = (*env)->CallObjectMethod(env, fullname,
fmi->toLowerCaseMID, fmi->locale); fmi->toLowerCaseMID, fmi->locale);
(*env)->CallObjectMethod(env, fmi->list, fmi->addMID, fullname); (*env)->CallBooleanMethod(env, fmi->list, fmi->addMID, fullname);
(*env)->CallObjectMethod(env, fmi->fontToFamilyMap, (*env)->CallObjectMethod(env, fmi->fontToFamilyMap,
fmi->putMID, fullnameLC, fmi->family); fmi->putMID, fullnameLC, fmi->family);
return 1; return 1;
@ -238,7 +238,7 @@ static int CALLBACK EnumFontFacesInFamilyProcW(
wcslen((LPWSTR)lpelfe->elfFullName)); wcslen((LPWSTR)lpelfe->elfFullName));
fullnameLC = (*env)->CallObjectMethod(env, fullname, fullnameLC = (*env)->CallObjectMethod(env, fullname,
fmi->toLowerCaseMID, fmi->locale); fmi->toLowerCaseMID, fmi->locale);
(*env)->CallObjectMethod(env, fmi->list, fmi->addMID, fullname); (*env)->CallBooleanMethod(env, fmi->list, fmi->addMID, fullname);
(*env)->CallObjectMethod(env, fmi->fontToFamilyMap, (*env)->CallObjectMethod(env, fmi->fontToFamilyMap,
fmi->putMID, fullnameLC, fmi->family); fmi->putMID, fullnameLC, fmi->family);
return 1; return 1;