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 2013-09-26 17:13:39 -07:00
commit b99232819c
4 changed files with 167 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/src/share/classes/java/awt/font/TransformAttribute.java
View File

@ -141,14 +141,16 @@ public final class TransformAttribute implements Serializable {
* @since 1.6
*/
public boolean equals(Object rhs) {
try {
TransformAttribute that = (TransformAttribute)rhs;
if (transform == null) {
return that.transform == null;
if (rhs != null) {
try {
TransformAttribute that = (TransformAttribute)rhs;
if (transform == null) {
return that.transform == null;
}
return transform.equals(that.transform);
}
catch (ClassCastException e) {
}
return transform.equals(that.transform);
}
catch (ClassCastException e) {
}
return false;
}

5
jdk/src/solaris/classes/sun/java2d/xr/XRMaskImage.java
View File

@ -45,6 +45,7 @@ public class XRMaskImage {
int blitMaskPicture;
int lastMaskWidth = 0;
int lastMaskHeight = 0;
int lastEA = -1;
AffineTransform lastMaskTransform;
XRCompositeManager xrMgr;
@ -82,13 +83,15 @@ public class XRMaskImage {
lastMaskTransform = maskTX;
}
if (lastMaskWidth != maskWidth || lastMaskHeight != maskHeight) {
int currentEA = xrMgr.getAlphaColor().getAlpha();
if (lastMaskWidth != maskWidth || lastMaskHeight != maskHeight || lastEA != currentEA) {
//Only clear mask, if previous mask area is larger than new one, otherwise simple overpaint it
if (lastMaskWidth > maskWidth || lastMaskHeight > maskHeight) {
con.renderRectangle(blitMaskPicture, XRUtils.PictOpClear, XRColor.NO_ALPHA, 0, 0, lastMaskWidth, lastMaskHeight);
}
con.renderRectangle(blitMaskPicture, XRUtils.PictOpSrc, xrMgr.getAlphaColor(), 0, 0, maskWidth, maskHeight);
lastEA = currentEA;
}
lastMaskWidth = maskWidth;

60
jdk/test/java/awt/font/TransformAttribute/TransformEqualityTest.java Normal file
View File

@ -0,0 +1,60 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @summary test equals method
* @bug 7092764
*/
import java.awt.font.TransformAttribute;
import java.awt.geom.AffineTransform;
public class TransformEqualityTest {
public static void main(String[] args) {
AffineTransform tx1 = new AffineTransform(1, 0, 1, 1, 0, 0);
AffineTransform tx2 = new AffineTransform(1, 0, 1, 1, 0, 0);
AffineTransform tx3 = new AffineTransform(2, 0, 1, 1, 0, 0);
TransformAttribute ta1a = new TransformAttribute(tx1);
TransformAttribute ta1b = new TransformAttribute(tx1);
TransformAttribute ta2 = new TransformAttribute(tx2);
TransformAttribute ta3 = new TransformAttribute(tx3);
if (ta1a.equals(null)) {
throw new RuntimeException("should not be equal to null.");
}
if (!ta1a.equals(ta1a)) {
throw new RuntimeException("(1) should be equal.");
}
if (!ta1a.equals(ta1b)) {
throw new RuntimeException("(2) should be equal.");
}
if (!ta1a.equals(ta2)) {
throw new RuntimeException("(3) should be equal.");
}
if (ta2.equals(ta3)) {
throw new RuntimeException("should be different.");
}
}
}

94
jdk/test/java/awt/image/DrawImage/EABlitTest.java Normal file
View File

@ -0,0 +1,94 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.awt.*;
import java.awt.image.*;
import java.util.*;
import javax.swing.*;
/**
* @test
* @bug 8024895
* @summary tests if changing extra alpha values are honored for transformed blits
* @author ceisserer
*/
public class EABlitTest extends Frame {
protected void test() {
BufferedImage srcImg = createSrcImage();
Image dstImg = getGraphicsConfiguration().createCompatibleVolatileImage(20, 50);
//be over-cautious and render twice to avoid BI caching issues
renderToVI(srcImg, dstImg);
renderToVI(srcImg, dstImg);
BufferedImage validationImg = new BufferedImage(20, 50, BufferedImage.TYPE_INT_RGB);
Graphics2D valG = (Graphics2D) validationImg.getGraphics();
valG.drawImage(dstImg, 0, 0, null);
//Loop over all pixel, and count the different pixel values encountered.
TreeSet<Integer> colorCntSet = new TreeSet<>();
for (int x=0; x < validationImg.getWidth(); x++) {
for (int y=0; y < validationImg.getHeight(); y++) {
int rgb = validationImg.getRGB(x, y);
colorCntSet.add(rgb);
}
}
//Check if we encountered 3 different color values in total
if (colorCntSet.size() == 3) {
System.out.println("Passed!");
} else {
throw new RuntimeException("Test FAILED!");
}
}
protected void renderToVI(BufferedImage src, Image dst) {
Graphics2D g = (Graphics2D) dst.getGraphics();
g.setColor(Color.WHITE);
g.fillRect(0, 0, 50, 50);
g.rotate(0.5f);
g.setRenderingHint(RenderingHints.KEY_RENDERING,
RenderingHints.VALUE_RENDER_QUALITY);
g.setComposite(AlphaComposite.SrcOver.derive(1f));
g.drawImage(src, 10, 10, null);
g.setComposite(AlphaComposite.SrcOver.derive(0.5f));
g.drawImage(src, 20, 20, null);
}
protected BufferedImage createSrcImage() {
BufferedImage bi = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
Graphics2D g = (Graphics2D) bi.getGraphics();
g.setColor(Color.YELLOW);
g.fillRect(0, 0, 10, 10);
return bi;
}
public static void main(String[] args) {
new EABlitTest().test();
}
}