8240342: Custom composite is ignored when printing an opaque image to a page
Reviewed-by: serb, psadhukhan
This commit is contained in:
parent
3c937001b5
commit
38716935d2
src/java.desktop
share/classes/sun/print
windows/classes/sun/awt/windows
test/jdk/java/awt/print/PrinterJob
@ -423,7 +423,9 @@ class PSPathGraphics extends PathGraphics {
|
||||
* rendering just the opaque pixels.
|
||||
*/
|
||||
boolean drawOpaque = true;
|
||||
if (!handlingTransparency && hasTransparentPixels(img)) {
|
||||
if (isCompositing(getComposite())) {
|
||||
drawOpaque = false;
|
||||
} else if (!handlingTransparency && hasTransparentPixels(img)) {
|
||||
drawOpaque = false;
|
||||
if (isBitmaskTransparency(img)) {
|
||||
if (bgcolor == null) {
|
||||
|
@ -35,6 +35,8 @@ import sun.font.FontManager;
|
||||
import sun.font.FontManagerFactory;
|
||||
import sun.font.FontUtilities;
|
||||
|
||||
import java.awt.AlphaComposite;
|
||||
import java.awt.Composite;
|
||||
import java.awt.Color;
|
||||
import java.awt.Font;
|
||||
import java.awt.Graphics2D;
|
||||
@ -1890,4 +1892,25 @@ public abstract class PathGraphics extends ProxyGraphics2D {
|
||||
|
||||
}
|
||||
|
||||
protected boolean isCompositing(Composite composite) {
|
||||
|
||||
boolean isCompositing = false;
|
||||
|
||||
if (composite instanceof AlphaComposite) {
|
||||
AlphaComposite alphaComposite = (AlphaComposite) composite;
|
||||
float alpha = alphaComposite.getAlpha();
|
||||
int rule = alphaComposite.getRule();
|
||||
|
||||
if (alpha != 1.0
|
||||
|| (rule != AlphaComposite.SRC
|
||||
&& rule != AlphaComposite.SRC_OVER))
|
||||
{
|
||||
isCompositing = true;
|
||||
}
|
||||
|
||||
} else {
|
||||
isCompositing = true;
|
||||
}
|
||||
return isCompositing;
|
||||
}
|
||||
}
|
||||
|
@ -1092,7 +1092,9 @@ final class WPathGraphics extends PathGraphics {
|
||||
* rendering just the opaque pixels.
|
||||
*/
|
||||
boolean drawOpaque = true;
|
||||
if (!handlingTransparency && hasTransparentPixels(img)) {
|
||||
if (isCompositing(getComposite())) {
|
||||
drawOpaque = false;
|
||||
} else if (!handlingTransparency && hasTransparentPixels(img)) {
|
||||
drawOpaque = false;
|
||||
if (isBitmaskTransparency(img)) {
|
||||
if (bgcolor == null) {
|
||||
|
146
test/jdk/java/awt/print/PrinterJob/CustomCompositePrintTest.java
Normal file
146
test/jdk/java/awt/print/PrinterJob/CustomCompositePrintTest.java
Normal file
@ -0,0 +1,146 @@
|
||||
/*
|
||||
* Copyright (c) 2020, 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 8240342
|
||||
* @summary Verify custom composite is called for image drawing
|
||||
*/
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Composite;
|
||||
import java.awt.CompositeContext;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.RenderingHints;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.awt.image.ColorModel;
|
||||
import java.awt.image.Raster;
|
||||
import java.awt.image.WritableRaster;
|
||||
import java.awt.print.PageFormat;
|
||||
import java.awt.print.Printable;
|
||||
import java.awt.print.PrinterException;
|
||||
import javax.print.DocFlavor;
|
||||
import javax.print.DocPrintJob;
|
||||
import javax.print.SimpleDoc;
|
||||
import javax.print.StreamPrintService;
|
||||
import javax.print.StreamPrintServiceFactory;
|
||||
import javax.print.attribute.HashDocAttributeSet;
|
||||
import javax.print.attribute.HashPrintRequestAttributeSet;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
||||
public class CustomCompositePrintTest
|
||||
implements Printable, Composite, CompositeContext {
|
||||
|
||||
private BufferedImage mTestImage;
|
||||
static volatile int composeCallCount = 0;
|
||||
|
||||
public CustomCompositePrintTest(BufferedImage testImage) {
|
||||
mTestImage = testImage;
|
||||
}
|
||||
|
||||
public static void main(String [] args) throws Exception {
|
||||
|
||||
DocFlavor flavor = DocFlavor.SERVICE_FORMATTED.PRINTABLE;
|
||||
String mime = DocFlavor.BYTE_ARRAY.POSTSCRIPT.getMimeType();
|
||||
|
||||
StreamPrintServiceFactory[] factories =
|
||||
StreamPrintServiceFactory.
|
||||
lookupStreamPrintServiceFactories(flavor, mime);
|
||||
if (factories.length == 0) {
|
||||
System.out.println("No print service found.");
|
||||
return;
|
||||
}
|
||||
|
||||
ByteArrayOutputStream output = new ByteArrayOutputStream();
|
||||
StreamPrintService service = factories[0].getPrintService(output);
|
||||
|
||||
BufferedImage img = new BufferedImage(200, 200,
|
||||
BufferedImage.TYPE_INT_RGB);
|
||||
Graphics2D g2d = img.createGraphics();
|
||||
g2d.setColor(Color.yellow);
|
||||
g2d.fillRect(0,0,200,200);
|
||||
|
||||
SimpleDoc doc =
|
||||
new SimpleDoc(new CustomCompositePrintTest(img),
|
||||
DocFlavor.SERVICE_FORMATTED.PRINTABLE,
|
||||
new HashDocAttributeSet());
|
||||
DocPrintJob job = service.createPrintJob();
|
||||
job.print(doc, new HashPrintRequestAttributeSet());
|
||||
if (composeCallCount < 2) {
|
||||
throw new RuntimeException("Compose called " + composeCallCount +
|
||||
"times. Expected at least 2");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int print(Graphics graphics, PageFormat pf, int pageIndex)
|
||||
throws PrinterException {
|
||||
|
||||
if (pageIndex == 0) {
|
||||
Graphics2D g2 = (Graphics2D)graphics;
|
||||
g2.translate(pf.getImageableX(), pf.getImageableY());
|
||||
g2.setComposite(this);
|
||||
g2.drawImage(mTestImage, 0, 0, null);
|
||||
return PAGE_EXISTS;
|
||||
} else {
|
||||
return NO_SUCH_PAGE;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompositeContext createContext(ColorModel srcColorModel,
|
||||
ColorModel dstColorModel,
|
||||
RenderingHints hints) {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void compose(Raster src, Raster dstIn, WritableRaster dstOut) {
|
||||
|
||||
composeCallCount++;
|
||||
|
||||
int w = dstOut.getWidth();
|
||||
int h = dstOut.getHeight();
|
||||
int[] samples3Band = { 0xff, 0x0, 0xff };
|
||||
int[] samples4Band = { 0xff, 0x0, 0xff, 0xff };
|
||||
int bands = dstOut.getNumBands();
|
||||
int[] samples = null;
|
||||
if (bands == 3) {
|
||||
samples = new int[] { 0xff, 0x0, 0xff };
|
||||
} else if (bands == 4) {
|
||||
samples = new int[] { 0xff, 0x0, 0xff, 0xff };
|
||||
} else {
|
||||
return; // at least compose() was called, so OK.
|
||||
}
|
||||
for (int i=0; i<w; i++) {
|
||||
for (int j=0; j<h; j++) {
|
||||
dstOut.setPixel(i, j, samples);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dispose() {
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user