undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
|
|
@ -0,0 +1,119 @@
|
|||
/*
|
||||
* Copyright (c) 2016, 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.Frame;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Image;
|
||||
import java.awt.MediaTracker;
|
||||
import java.awt.Toolkit;
|
||||
import java.awt.image.BaseMultiResolutionImage;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.File;
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.swing.GrayFilter;
|
||||
import java.awt.image.MultiResolutionImage;
|
||||
import javax.swing.JLabel;
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 8156182
|
||||
* @summary [macosx] HiDPI/Retina icons do not work for disabled
|
||||
* JButton/JMenuItem etc.
|
||||
* @run main/othervm -Dsun.java2d.uiScale=2 MultiResolutionDisabledImageTest
|
||||
*/
|
||||
public class MultiResolutionDisabledImageTest {
|
||||
|
||||
private static final String IMAGE_NAME_1X = "image.png";
|
||||
private static final String IMAGE_NAME_2X = "image@2x.png";
|
||||
private static final int IMAGE_SIZE = 100;
|
||||
private static final Color COLOR_1X = Color.GREEN;
|
||||
private static final Color COLOR_2X = Color.BLUE;
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
Image baseMRImage = new BaseMultiResolutionImage(createImage(1),
|
||||
createImage(2));
|
||||
testMRDisabledImage(baseMRImage);
|
||||
|
||||
saveImages();
|
||||
Image toolkitMRImage = Toolkit.getDefaultToolkit().getImage(IMAGE_NAME_1X);
|
||||
|
||||
if (toolkitMRImage instanceof MultiResolutionImage) {
|
||||
testMRDisabledImage(toolkitMRImage);
|
||||
}
|
||||
}
|
||||
|
||||
private static void testMRDisabledImage(Image image) throws Exception {
|
||||
|
||||
Image disabledImage = GrayFilter.createDisabledImage(image);
|
||||
MediaTracker mediaTracker = new MediaTracker(new JLabel());
|
||||
mediaTracker.addImage(disabledImage, 0);
|
||||
mediaTracker.waitForID(0);
|
||||
|
||||
BufferedImage buffImage = new BufferedImage(IMAGE_SIZE,
|
||||
IMAGE_SIZE,
|
||||
BufferedImage.TYPE_INT_RGB);
|
||||
|
||||
int x = IMAGE_SIZE / 2;
|
||||
int y = IMAGE_SIZE / 2;
|
||||
|
||||
Graphics2D g = buffImage.createGraphics();
|
||||
|
||||
g.scale(1, 1);
|
||||
g.drawImage(disabledImage, 0, 0, null);
|
||||
int rgb1x = buffImage.getRGB(x, y);
|
||||
|
||||
g.scale(2, 2);
|
||||
g.drawImage(disabledImage, 0, 0, null);
|
||||
int rgb2x = buffImage.getRGB(x, y);
|
||||
|
||||
g.dispose();
|
||||
|
||||
if (rgb1x == rgb2x) {
|
||||
throw new RuntimeException("Disabled image is the same for the base"
|
||||
+ "image and the resolution variant");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static BufferedImage createImage(int scale) throws Exception {
|
||||
BufferedImage image = new BufferedImage(scale * 200, scale * 300,
|
||||
BufferedImage.TYPE_INT_RGB);
|
||||
Graphics g = image.createGraphics();
|
||||
g.setColor(scale == 1 ? COLOR_1X : COLOR_2X);
|
||||
g.fillRect(0, 0, scale * 200, scale * 300);
|
||||
g.dispose();
|
||||
return image;
|
||||
}
|
||||
|
||||
private static void saveImages() throws Exception {
|
||||
saveImage(createImage(1), IMAGE_NAME_1X);
|
||||
saveImage(createImage(2), IMAGE_NAME_2X);
|
||||
}
|
||||
|
||||
private static void saveImage(BufferedImage image, String name) throws Exception {
|
||||
ImageIO.write(image, "png", new File(name));
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue