Mercurial > hg > release > icedtea6-1.5
changeset 540:d416a2d5ad11 cacao
2007-12-20 Lillian Angel <langel@redhat.com>
Fixes Bug #65
* patches/icedtea-antialias.patch: Changed to only turn on AA when
text AA is on. Otherwise, AA is ignored.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Thu, 20 Dec 2007 14:13:59 -0500 |
parents | 9215c325a2bd |
children | 72d0bf249385 |
files | ChangeLog patches/icedtea-antialias.patch |
diffstat | 2 files changed, 17 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Dec 20 09:49:54 2007 -0500 +++ b/ChangeLog Thu Dec 20 14:13:59 2007 -0500 @@ -1,3 +1,9 @@ +2007-12-20 Lillian Angel <langel@redhat.com> + + Fixes Bug #65 + * patches/icedtea-antialias.patch: Changed to only turn on AA when + text AA is on. Otherwise, AA is ignored. + 2007-12-20 Lillian Angel <langel@redhat.com> * Makefile.am: Added checks for ICEDTEA_HOME and SYSTEM_GCJ_DIR.
--- a/patches/icedtea-antialias.patch Thu Dec 20 09:49:54 2007 -0500 +++ b/patches/icedtea-antialias.patch Thu Dec 20 14:13:59 2007 -0500 @@ -1,58 +1,20 @@ ---- ../openjdkib23/openjdk/jdk/src/share/classes/sun/java2d/SunGraphics2D.java 2007-10-30 04:37:32.000000000 -0400 -+++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphics2D.java 2007-11-13 12:58:04.000000000 -0500 -@@ -640,11 +640,7 @@ - aahint = ((SunHints.Value)frc.getAntiAliasingHint()).getIndex(); - } - if (aahint == SunHints.INTVAL_TEXT_ANTIALIAS_DEFAULT) { -- if (antialiasHint == SunHints.INTVAL_ANTIALIAS_ON) { -- aahint = SunHints.INTVAL_TEXT_ANTIALIAS_ON; -- } else { - aahint = SunHints.INTVAL_TEXT_ANTIALIAS_OFF; -- } - } else { - /* If we are in checkFontInfo because a rendering hint has been - * set then all pipes are revalidated. But we can also ---- ../openjdkb23/opienjdk/jdk/src/share/classes/sun/java2d/SurfaceData.java 2007-10-30 04:37:32.000000000 -0400 -+++ openjdk/jdk/src/share/classes/sun/java2d/SurfaceData.java 2007-11-13 14:32:06.000000000 -0500 -@@ -509,6 +509,7 @@ +--- openjdk.orig/jdk/src/share/classes/sun/java2d/SurfaceData.java 2007-12-10 15:47:39.000000000 -0500 ++++ openjdk/jdk/src/share/classes/sun/java2d/SurfaceData.java 2007-12-20 13:44:53.000000000 -0500 +@@ -509,7 +509,7 @@ // assert(sg2d.surfaceData == this); } } else if (sg2d.compositeState == sg2d.COMP_CUSTOM) { -+/* - if (sg2d.antialiasHint == SunHints.INTVAL_ANTIALIAS_ON) { +- if (sg2d.antialiasHint == SunHints.INTVAL_ANTIALIAS_ON) { ++ if (sg2d.textAntialiasHint == SunHints.INTVAL_TEXT_ANTIALIAS_ON) { if (sg2d.clipState == sg2d.CLIP_SHAPE) { sg2d.drawpipe = AAClipCompViaShape; -@@ -522,6 +523,7 @@ - sg2d.textpipe = compText; - } - } else { -+*/ - sg2d.drawpipe = compViaShape; - sg2d.fillpipe = compViaShape; - sg2d.shapepipe = compShape; -@@ -530,7 +532,7 @@ - } else { + sg2d.fillpipe = AAClipCompViaShape; +@@ -531,7 +531,7 @@ sg2d.textpipe = compText; } -- } -+/* } - } else if (sg2d.antialiasHint == SunHints.INTVAL_ANTIALIAS_ON) { + } +- } else if (sg2d.antialiasHint == SunHints.INTVAL_ANTIALIAS_ON) { ++ } else if (sg2d.textAntialiasHint == SunHints.INTVAL_TEXT_ANTIALIAS_ON) { sg2d.alphafill = getMaskFill(sg2d); // assert(sg2d.surfaceData == this); -@@ -549,7 +551,7 @@ - { - sg2d.textpipe = colorText; - } else { -- sg2d.textpipe = getTextPipe(sg2d, true /* AA==ON */); -+ sg2d.textpipe = getTextPipe(sg2d, true /* AA==ON *); - } - } - } else { -@@ -565,6 +567,7 @@ - sg2d.textpipe = paintText; - } - } -+*/ - } else if (sg2d.paintState > sg2d.PAINT_ALPHACOLOR || - sg2d.compositeState > sg2d.COMP_ISCOPY || - sg2d.clipState == sg2d.CLIP_SHAPE) + if (sg2d.alphafill != null) {