/hg/icedtea6: S6961732: FontMetrics.getLeading() may be negative...

[andrew at icedtea.classpath.org]

changeset da2ba8396450 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=da2ba8396450
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 22 19:14:32 2010 +0100

	S6961732: FontMetrics.getLeading() may be negative in freetype-based
	OpenJDK builds

	2010-06-22 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add new patch.
		* patches/openjdk/6961732.patch: Backport of 6961732:
	FontMetrics.getLeading() may be negative in freetype-based
	OpenJDK builds


diffstat:

3 files changed, 54 insertions(+), 1 deletion(-)
ChangeLog                     |    7 ++++++
Makefile.am                   |    3 +-
patches/openjdk/6961732.patch |   45 +++++++++++++++++++++++++++++++++++++++++

diffs (76 lines):

diff -r 038bfe38cab1 -r da2ba8396450 ChangeLog
--- a/ChangeLog	Tue Jun 22 19:10:30 2010 +0100
+++ b/ChangeLog	Tue Jun 22 19:14:32 2010 +0100
@@ -1,3 +1,10 @@ 2010-06-22  Andrew John Hughes  <ahughes
+2010-06-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/openjdk/6961732.patch:
+	Backport of 6961732: FontMetrics.getLeading()
+	may be negative in freetype-based OpenJDK builds
+
 2010-06-22  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 038bfe38cab1 -r da2ba8396450 Makefile.am
--- a/Makefile.am	Tue Jun 22 19:10:30 2010 +0100
+++ b/Makefile.am	Tue Jun 22 19:14:32 2010 +0100
@@ -311,7 +311,8 @@ ICEDTEA_PATCHES = \
 	patches/extensions/netx-umask.patch \
 	patches/icedtea-jtreg-httpTest.patch \
 	patches/arm.patch \
-	patches/shark-debug-option.patch
+	patches/shark-debug-option.patch \
+	patches/openjdk/6961732.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 038bfe38cab1 -r da2ba8396450 patches/openjdk/6961732.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6961732.patch	Tue Jun 22 19:14:32 2010 +0100
@@ -0,0 +1,45 @@
+# HG changeset patch
+# User neugens
+# Date 1276713970 -7200
+# Node ID 388276965253fbfd368d9d095cfb1efd746181d9
+# Parent  40ad1b388fc2df199ee50d233fdc3f1eac273701
+6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds.
+Summary: Fix premature integer roundings to preserve correct height, width and descent values for fonts
+Reviewed-by: prr
+
+diff -r 40ad1b388fc2 -r 388276965253 src/share/native/sun/font/freetypeScaler.c
+--- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c	Fri Jun 18 01:18:22 2010 -0700
++++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	Wed Jun 16 20:46:10 2010 +0200
+@@ -490,22 +490,23 @@
+ 
+     /* ascent */
+     ax = 0;
+-    ay = -(jfloat) FT26Dot6ToFloat(
+-                       scalerInfo->face->size->metrics.ascender +
+-                       bmodifier/2);
++    ay = -(jfloat) FT26Dot6ToFloat(FT_MulFix(
++                       ((jlong) scalerInfo->face->ascender + bmodifier/2),
++                       (jlong) scalerInfo->face->size->metrics.y_scale));
+     /* descent */
+     dx = 0;
+-    dy = -(jfloat) FT26Dot6ToFloat(
+-                       scalerInfo->face->size->metrics.descender +
+-                       bmodifier/2);
++    dy = -(jfloat) FT26Dot6ToFloat(FT_MulFix(
++                       ((jlong) scalerInfo->face->descender + bmodifier/2),
++                       (jlong) scalerInfo->face->size->metrics.y_scale));
+     /* baseline */
+     bx = by = 0;
+ 
+     /* leading */
+     lx = 0;
+-    ly = (jfloat) FT26Dot6ToFloat(
+-                      scalerInfo->face->size->metrics.height +
+-                      bmodifier) + ay - dy;
++    ly = (jfloat) FT26Dot6ToFloat(FT_MulFix(
++                      (jlong) scalerInfo->face->height + bmodifier,
++                      (jlong) scalerInfo->face->size->metrics.y_scale))
++                  + ay - dy;
+     /* max advance */
+     mx = (jfloat) FT26Dot6ToFloat(
+                      scalerInfo->face->size->metrics.max_advance +