diff --git a/src/share/classes/sun/java2d/pisces/PiscesCache.java b/src/share/classes/sun/java2d/pisces/PiscesCache.java index a26e7aa05f30bb47863473c348d3b565286246f2..fd8cfa7917f11c61088f5473ba17181a01ba47e1 100644 --- a/src/share/classes/sun/java2d/pisces/PiscesCache.java +++ b/src/share/classes/sun/java2d/pisces/PiscesCache.java @@ -167,15 +167,6 @@ final class PiscesCache { rowAARLE[row][1] = end; } - void getBBox(int bbox[]) { - // Since we add +1 to bboxX1,bboxY1 so when PTG asks for bbox, - // we will give after -1 - bbox[0] = bboxX0; - bbox[1] = bboxY0; - bbox[2] = bboxX1 - 1; - bbox[3] = bboxY1 - 1; - } - @Override public String toString() { String ret = "bbox = ["+ diff --git a/src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java b/src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java index 7f1b49eca54f22ed43c77a1eca1985e11e295b78..2fc2e9c7e7cccb899bf0ea379b136e38df74f1c9 100644 --- a/src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java +++ b/src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java @@ -76,7 +76,10 @@ final class PiscesTileGenerator implements AATileGenerator { } public void getBbox(int bbox[]) { - cache.getBBox(bbox); + bbox[0] = cache.bboxX0; + bbox[1] = cache.bboxY0; + bbox[2] = cache.bboxX1; + bbox[3] = cache.bboxY1; //System.out.println("bbox["+bbox[0]+", "+bbox[1]+" => "+bbox[2]+", "+bbox[3]+"]"); } diff --git a/test/sun/java2d/pisces/OpenJDKFillBug.java b/test/sun/java2d/pisces/OpenJDKFillBug.java deleted file mode 100644 index 1c39583d9222a994e9796c442e6cd46057d23d82..0000000000000000000000000000000000000000 --- a/test/sun/java2d/pisces/OpenJDKFillBug.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (c) 2015, 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. - */ -import java.awt.Color; -import java.awt.Composite; -import java.awt.CompositeContext; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.AffineTransform; -import java.awt.geom.GeneralPath; -import java.awt.image.BufferedImage; -import java.awt.image.ColorModel; -import java.awt.image.Raster; -import java.awt.image.WritableRaster; -import java.awt.image.RasterFormatException; - -/** - * @test - * @bug 8048782 - * @summary Test program that demonstrates PiscesRendering bug in - * OpenJDK 1.7.0.60 (and probably in all other OpenJDK versions, too). - */ - -public class OpenJDKFillBug -{ - /** - * Test program that demonstrates a bug in OpenJDK 1.7.0.60 (and - * probably in all other OpenJDK versions, too). To see the bug, simply run - * the 'main' program with OpenJDK. The bug makes the 'g2d.fill' - * method fail with the following exception: - * - * This bug is found in OpenJDK but also is present in OracleJDK - * if run with - * -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine - * - * The bug is related to sun.java2d.pisces.PiscesCache constructor - * that accepts '(int minx,int miny,int maxx,int maxy)' arguments: - * the internal 'bboxX1' and 'bboxY1' are set to values one greater - * than given maximum X and Y values. Those maximum values are then - * later used in AAShapePipe' class 'renderTiles' method, where a - * Y/X loop eventually calls 'GeneralCompositePipe' class - * 'renderPathTile' method. In that method, the operation will - * eventually call 'IntegerInterleavedRaster' class - * 'createWritableChild' method with arguments: - * - * - * - * This calls for a sub-raster with bounds that fall outside the - * original raster, and therefore the 'createWritableChild' method - * correctly throws 'RasterFormatException'. - * - * The bug is closely related to the use of a custom Composite - * implementation, which are quite rare. The application where this - * bug was first detected implements a high-quality PDF rendering - * engine that needs custom Composite operations to properly - * implement PDF advanced color blending and masking operators. - */ - - public static void main(String args[]) - { - BufferedImage bi = new BufferedImage(801,1202, - BufferedImage.TYPE_INT_ARGB); - Graphics2D g2d = bi.createGraphics(); - GeneralPath gp = new GeneralPath(); - AffineTransform m = new AffineTransform(2.483489907915543, - 0.0, - 0.0, - -2.4844977263331955, - 0.0, - 1202.0); - Composite c = new CustomComposite(); - - gp.moveTo(-4.511, -14.349); - gp.lineTo(327.489, -14.349); - gp.lineTo(327.489, 494.15); - gp.lineTo(-4.511, 494.15); - gp.closePath(); - - g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, - RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_RENDERING, - RenderingHints.VALUE_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, - RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_TEXT_LCD_CONTRAST, - Integer.valueOf(140)); - g2d.setRenderingHint(RenderingHints.KEY_DITHERING, - RenderingHints.VALUE_DITHER_ENABLE); - g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, - RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, - RenderingHints.VALUE_STROKE_NORMALIZE); - g2d.setPaint(Color.red); - g2d.setComposite(c); - g2d.setTransform(m); - try { - g2d.fill(gp); - } catch (RasterFormatException rfe) { - System.out.println("Test failed"); - throw new RuntimeException("xmax/ymax rounding cause RasterFormatException: " + rfe); - } - g2d.dispose(); - System.out.println("Test passed"); - } - - // === CustomComposite === - - /** - * Dummy custom Composite implementation. - */ - - public static class CustomComposite implements Composite - { - @Override - public CompositeContext createContext(ColorModel srcColorModel, - ColorModel dstColorModel, - RenderingHints hints) - { - return new CustomCompositeContext(); - } - - // === CustomCompositeContext === - - /** - * Dummy custom CompositeContext implementation. - */ - - public static class CustomCompositeContext implements CompositeContext - { - - @Override - public void dispose() - { - // NOP - } - - @Override - public void compose(Raster src,Raster dstIn,WritableRaster dstOut) - { - // NOP - } - } - } -}