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

8061392: PrinterJob NPE when drawing translucent image with null user clip

Browse Source 
Reviewed-by: bae, jgodinez
This commit is contained in:
Phil Race 2014-10-20 11:22:58 -07:00
parent 96909cf5f1
commit 395720bf70
2 changed files with 77 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java
View File

@ -1400,7 +1400,9 @@ final class WPathGraphics extends PathGraphics {
* The saved device transform is needed as the current transform
* is not likely to be the same.
*/
deviceClip(savedClip.getPathIterator(savedTransform));
if (savedClip != null) {
deviceClip(savedClip.getPathIterator(savedTransform));
}
/* Scale the bounding rectangle by the scale transform.
* Because the scaling transform has only x and y

74
jdk/test/java/awt/print/PrinterJob/ImagePrinting/NullClipARGB.java Normal file
View File

@ -0,0 +1,74 @@
/*
* Copyright (c) 2014, 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
* @bug 8061392
* @summary Test no NPE when printing transparency with null clip.
*/
import java.awt.*;
import java.awt.image.*;
import java.awt.print.*;
public class NullClipARGB implements Printable {
public static void main( String[] args ) {
try {
PrinterJob pj = PrinterJob.getPrinterJob();
pj.setPrintable(new NullClipARGB());
pj.print();
} catch (Exception ex) {
throw new RuntimeException(ex);
}
}
public int print(Graphics g, PageFormat pf, int pageIndex)
throws PrinterException{
if (pageIndex != 0) {
return NO_SUCH_PAGE;
}
Graphics2D g2 = (Graphics2D)g;
System.out.println("original clip="+g2.getClip());
g2.translate(pf.getImageableX(), pf.getImageableY());
g2.rotate(0.2);
g2.setClip(null);
g2.setColor( Color.BLACK );
g2.drawString("This text should be visible through the image", 0, 20);
BufferedImage bi = new BufferedImage(100, 100,
BufferedImage.TYPE_INT_ARGB );
Graphics ig = bi.createGraphics();
ig.setColor( new Color( 192, 192, 192, 80 ) );
ig.fillRect( 0, 0, 100, 100 );
ig.setColor( Color.BLACK );
ig.drawRect( 0, 0, 99, 99 );
ig.dispose();
g2.drawImage(bi, 10, 0, 90, 90, null );
g2.translate(100, 100);
g2.drawString("This text should also be visible through the image", 0, 20);
g2.drawImage(bi, 10, 0, 90, 90, null );
return PAGE_EXISTS;
}
}