Patch which fixes bug #6703377 (font outline transformation)

[Dr Andrew John Hughes]

On 17:07 Fri 15 Oct     , Pavel Tisnovsky wrote:
> Hi all,
> 
> I prepared yet another patch for IcedTea6 HEAD. This patch refine
> computation of x and y coordinates during font outline transformation
> when negative values are used
> (see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6703377)
> 
> Attached files:
> 
> 6703377-freetypescaler.patch - the patch itself
> hg_export_icedtea6.diff - changes I would like to make in IcedTea
> 
> Correct behaviour of outline transformation is (partially) checked by
> regression test:
> java/awt/font/Rotate/TranslatedOutlineTest.java
> 
> Can anyone please review this patch?
> 

Looks good.  Please apply to HEAD and 1.9.
(From what you said on IRC, I presume it depends on the DirectX backport
in 1.9).

> Thank you in advance,
> Pavel

> --- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c	2010-10-15 15:19:35.000000000 +0200
> +++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	2010-10-15 15:19:35.000000000 +0200
> @@ -979,7 +979,7 @@
>  }
>  
>  
> -#define FloatToF26Dot6(x) ((unsigned int) ((x)*64))
> +#define FloatToF26Dot6(x) ((int) ((x)*64))
>  
>  static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
>          FTScalerContext *context, FTScalerInfo* scalerInfo,

> # HG changeset patch
> # User ptisnovs
> # Date 1287150573 -7200
> # Node ID eae703fb6d8eb18bdd8cd0c17f674f8409b70a56
> # Parent  12902038b45bf361824ceb6c9506f1c6eb3dcdad
> Added patch which fixes bug #6703377.
> 
> diff -r 12902038b45b -r eae703fb6d8e ChangeLog
> --- a/ChangeLog	Fri Oct 15 15:32:50 2010 +0200
> +++ b/ChangeLog	Fri Oct 15 15:49:33 2010 +0200
> @@ -1,3 +1,8 @@
> +2010-10-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
> +
> +	* patches/openjdk/6703377-freetypescaler.patch:
> +	Added patch which fixes bug #6703377.
> +
>  2010-10-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
>  
>  	* patches/openjdk/6853592-BadWindow-warning-fix.patch:
> diff -r 12902038b45b -r eae703fb6d8e Makefile.am
> --- a/Makefile.am	Fri Oct 15 15:32:50 2010 +0200
> +++ b/Makefile.am	Fri Oct 15 15:49:33 2010 +0200
> @@ -325,7 +325,8 @@
>  	patches/icedtea-shark.patch \
>  	patches/icedtea-linux-separate-debuginfo.patch \
>  	patches/openjdk/6951319-sparc_build_fixes.patch \
> -        patches/openjdk/6853592-badwindow-warning-fix.patch
> +        patches/openjdk/6853592-badwindow-warning-fix.patch \
> +        patches/openjdk/6703377-freetypescaler.patch
>  endif
>  
>  if WITH_RHINO
> diff -r 12902038b45b -r eae703fb6d8e patches/openjdk/6703377-freetypescaler.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/openjdk/6703377-freetypescaler.patch	Fri Oct 15 15:49:33 2010 +0200
> @@ -0,0 +1,11 @@
> +--- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c	2010-10-15 15:19:35.000000000 +0200
> ++++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	2010-10-15 15:19:35.000000000 +0200
> +@@ -979,7 +979,7 @@
> + }
> + 
> + 
> +-#define FloatToF26Dot6(x) ((unsigned int) ((x)*64))
> ++#define FloatToF26Dot6(x) ((int) ((x)*64))
> + 
> + static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
> +         FTScalerContext *context, FTScalerInfo* scalerInfo,


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8