From e89fd1d2ceff82952a4859c0febe902412fcf064 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Thu, 3 Oct 2024 19:22:28 +0000
Subject: [PATCH] 8341128: open source some 2d graphics tests
Reviewed-by: psadhukhan
---
.../awt/Graphics2D/BasicStrokeValidate.java | 87 +++++++++
.../DrawImageIAETest/DrawImageIAETest.java | 169 ++++++++++++++++++
.../awt/Graphics2D/DrawImageIAETest/duke.gif | Bin 0 -> 1929 bytes
.../ImageRendering/ImageRendering.java | 66 +++++++
.../awt/Graphics2D/ImageRendering/snooze.gif | Bin 0 -> 2859 bytes
.../awt/Graphics2D/ScaledThinLineTest.java | 82 +++++++++
test/jdk/java/awt/Graphics2D/TextPerf.java | 159 ++++++++++++++++
7 files changed, 563 insertions(+)
create mode 100644 test/jdk/java/awt/Graphics2D/BasicStrokeValidate.java
create mode 100644 test/jdk/java/awt/Graphics2D/DrawImageIAETest/DrawImageIAETest.java
create mode 100644 test/jdk/java/awt/Graphics2D/DrawImageIAETest/duke.gif
create mode 100644 test/jdk/java/awt/Graphics2D/ImageRendering/ImageRendering.java
create mode 100644 test/jdk/java/awt/Graphics2D/ImageRendering/snooze.gif
create mode 100644 test/jdk/java/awt/Graphics2D/ScaledThinLineTest.java
create mode 100644 test/jdk/java/awt/Graphics2D/TextPerf.java
diff --git a/test/jdk/java/awt/Graphics2D/BasicStrokeValidate.java b/test/jdk/java/awt/Graphics2D/BasicStrokeValidate.java
new file mode 100644
index 00000000000..251f14e5081
--- /dev/null
+++ b/test/jdk/java/awt/Graphics2D/BasicStrokeValidate.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2000, 2024, 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 4363534
+ * @summary This test verifies that setting a non-thin-line BasicStroke
+ * on a Graphics2D obtained from a BufferedImage will correctly validate
+ * the pipelines for the line-widening pipeline even if that is the only
+ * non-default attribute on the graphics.
+ *
+ */
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+
+public class BasicStrokeValidate {
+
+ public static final int TESTW = 100;
+ public static final int TESTH = 100;
+
+ public static void main(String[] args) {
+ BufferedImage bi1 = createImage(false);
+ BufferedImage bi2 = createImage(true);
+ compare(bi1, bi2); // images should differ
+ }
+
+ static BufferedImage createImage(boolean dashed) {
+ BufferedImage bi = new BufferedImage(TESTW, TESTH, BufferedImage.TYPE_INT_RGB);
+ Graphics2D g2d = bi.createGraphics();
+ g2d.setColor(Color.white);
+ g2d.fillRect(0, 0, TESTW, TESTH);
+ g2d.setColor(Color.black);
+ if (dashed) {
+ g2d.setStroke(new BasicStroke(1.0f, BasicStroke.CAP_SQUARE,
+ BasicStroke.JOIN_MITER, 10.0f,
+ new float[] {2.5f, 3.5f},
+ 0.0f));
+ }
+ g2d.drawRect(10, 10, TESTW-20, TESTH-20);
+ g2d.setStroke(new BasicStroke(10f));
+ g2d.drawRect(20, 20, TESTW-40, TESTH-40);
+ return bi;
+ }
+
+ static void compare(BufferedImage i1, BufferedImage i2) {
+ boolean same = true;
+ int w = i1.getWidth(), h = i1.getHeight();
+ for (int y = 0; y < h; y++) {
+ for (int x = 0; x < w; x++) {
+ int p1 = i1.getRGB(x, y);
+ int p2 = i2.getRGB(x, y);
+ if (p1 != p2) {
+ same = false;
+ }
+ }
+ if (!same) {
+ break;
+ }
+ }
+ if (same) {
+ throw new RuntimeException("No difference");
+ }
+ }
+}
diff --git a/test/jdk/java/awt/Graphics2D/DrawImageIAETest/DrawImageIAETest.java b/test/jdk/java/awt/Graphics2D/DrawImageIAETest/DrawImageIAETest.java
new file mode 100644
index 00000000000..af7ebae72a6
--- /dev/null
+++ b/test/jdk/java/awt/Graphics2D/DrawImageIAETest/DrawImageIAETest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 1999, 2024, 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 4191004
+ * @summary Tests that no IllegalArgumentException is thrown when calling
+ * drawImage with certain conditions
+ * @key headful
+ */
+
+import java.awt.AlphaComposite;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+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.geom.GeneralPath;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+public class DrawImageIAETest extends Frame {
+
+ static String filename = "/duke.gif";
+ private volatile Image dimg;
+ private volatile BufferedImage bimg;
+ static volatile DrawImageIAETest app;
+ static volatile JFrame jframe;
+ static volatile boolean passed = true;
+ static volatile Exception exception = null;
+ static volatile CountDownLatch imageLatch = new CountDownLatch(1);
+
+ DrawImageIAETest(String title) {
+ super(title);
+ }
+
+ public static void main(final String[] args) throws Exception {
+ EventQueue.invokeAndWait(DrawImageIAETest:: createUI);
+ imageLatch.await(3, TimeUnit.MILLISECONDS);
+ try {
+ if (!passed) {
+ throw new RuntimeException("Test FAILED: exception caught:" + exception);
+ }
+ } finally {
+ if (jframe != null) {
+ EventQueue.invokeAndWait(jframe::dispose);
+ }
+ if (app != null) {
+ EventQueue.invokeAndWait(app::dispose);
+ }
+ }
+ }
+
+ static void createUI() {
+ app = new DrawImageIAETest("DrawImageIAETest");
+ app.setLayout (new BorderLayout());
+ app.setSize(200,200);
+ app.setLocationRelativeTo(null);
+ app.setVisible(true);
+
+ String file;
+ try {
+ String dir = System.getProperty("test.src",
+ System.getProperty("user.dir"));
+ file = dir + filename;
+ } catch (Exception e) {
+ file = "." + filename;
+ }
+
+ Image textureAlphaSource = null;
+ MediaTracker tracker = new MediaTracker(app);
+ app.dimg = Toolkit.getDefaultToolkit().getImage(file);
+ tracker.addImage(app.dimg, 1);
+ try {
+ tracker.waitForAll();
+ imageLatch.countDown();
+ } catch (Exception e) {
+ System.err.println("Can't load images");
+ }
+
+ if (app.dimg == null) {
+ passed = false;
+ return;
+ }
+
+ jframe = new JFrame("Test DrawImageIAETest");
+ jframe.setSize(300, 300);
+ JPanel jpanel;
+ jframe.getContentPane().add("Center", jpanel = new JPanel() {
+ public void paint(Graphics _g) {
+ Graphics2D g = (Graphics2D)_g;
+ Dimension d = getSize();
+ Graphics2D g2 = app.createGraphics2D(d.width, d.height);
+ app.drawDemo(d.width, d.height, g2);
+ g2.dispose();
+ g.drawImage(app.bimg, 0, 0, app);
+ }
+ });
+ jpanel.setSize(140, 140);
+ jframe.setVisible(true);
+ }
+
+ public void drawDemo(int w, int h, Graphics2D g2) {
+ GeneralPath p1 = new GeneralPath();
+ GeneralPath p2 = new GeneralPath();
+
+ int dukeX = 73;
+ int dukeY = 26;
+
+ double x = 118;
+ double y = 17;
+ double ew = 50;
+ double eh = 48;
+
+ p1.append(new Ellipse2D.Double(x, y, ew, eh), false);
+ p2.append(new Rectangle2D.Double(x+5, y+5, ew-10, eh-10),false);
+
+ g2.setClip(p1);
+ g2.clip(p2);
+ try {
+ g2.drawImage(dimg, dukeX, dukeY, null);
+ } catch (IllegalArgumentException e) {
+ passed = false;
+ exception = e;
+ }
+ }
+
+ public Graphics2D createGraphics2D(int w, int h) {
+ Graphics2D g2 = null;
+ if (bimg == null || bimg.getWidth() != w || bimg.getHeight() != h) {
+ bimg = (BufferedImage) createImage(w, h);
+ }
+ g2 = bimg.createGraphics();
+ g2.setBackground(getBackground());
+ g2.clearRect(0, 0, w, h);
+ g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
+ return g2;
+ }
+}
diff --git a/test/jdk/java/awt/Graphics2D/DrawImageIAETest/duke.gif b/test/jdk/java/awt/Graphics2D/DrawImageIAETest/duke.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ed32e0ff79b05c07b82863ce6fb07fa9898adaa2
GIT binary patch
literal 1929
zcmWlYe^AtB8pi`HvM4_?{J2I$8$dLc1#@!R2zwgXMWdj^k;9xr+bDW&4{JlE8WpDj
z7F-cwwK{H<)?L&#SJz$!;hJ{%BY2FYf)Wp^xl?aq!5Xcdi$c#hV~>m9_n-Hl=Xsy+
z=li^?*Q~;pZ+R1N1J40KRkeWM7ew3~jLM24A{CM-A}~TzqzYpq&od0GC=z71!w_=b
z-==B0rt2t*nA}((5YSLs6a*Z@X__WqiSjTW6oLo{5k<iyeTpP`Xj)M<MUgp%2?T<&
zEc<*umSq6|@E|zH)SHIk^Kl4*XpV}2Kfs5B99xfJZie9$WsF5|P18smlV!;g!!V-2
zn;7GvJv`6jI4%f+q3MRMtBBhU04&Ry?69iHJVr~BEXguSkeaHPbby83IEreP<$yJU
zUlheKF9@O_%VRiB_&WpPU{I1ohN5YT;srhs3=%l*<5(0yJRT28;JU73xZ9-sh=ofO
zC8UBR2oqyvMa9cVnye6lJcePa^*oFUh*gad1Rf3q{k}GiWh9=bDcYp{0l%N#W}))v
zngM|j3_^-3V<^h`+f2-(Fe1w^o#%OqqEt;&Rh1(s6hSGH^mu3=*Jj!BFsxx=p(#a{
zd>m&|K1mGAimYjhs#wwZtvV8SV~7LCFpgub+-TTAk%UQb0dE_cj+pc?!+0o?qG$?%
zVFD)%!w7Z;g)ndE8Uk6<V}@y6RST^}gurmnZnvf(DH2JCKmedUR<bI~)LSksiqgQC
zkFD2r&57bBUZ-oC|3sVB0K-s{B%WaOuq+DUpePNis%#jhZfF!mYPt$R(D`7%43B|!
z5JgcKf><w05QN<p_ry`5O-!YO$bdMEAZW1DZ&I?Vjp2lwqQi!v`~4g|AF-N^$qHl#
zArPEE+=ihU`V<I)VL{f7DFsGNQ-?v&&{YNRF-^;sbzUjsg)IUA3IK<-jliov0obR3
z5AErM5bSTVC%;i83mHX;AEmGD^!Y!9i&OH~Pegazi8u<+zVef};QV(@3+rl=y~S`|
z+ro8g8RqC2>Aky=+kLaUQ{UW`XS?Nn*s@SQ{VmFgGdkV{&&98EcEQ5hjc@H$`e)fX
zj@&GdchxpMUo|-A^M4iBP3(#Ib53Ap?5{nGT7SBA_V!o!TTzL5R~FUWe)4X?@iTd8
z1;TcF^rQLj?4p0uy?@ikb2eUSXdHVa_jIn=@W%a<6~57D>am6&Z!{lzc=@ZbuGB8`
zpU38H8d~@82Da!+qdYG5ls&Cx?~|oPMnbqTHMw%I*KlV~?fc{rSwe29?Om}fsknG#
z@n5IwY=4Mx>>0WJLG>=<wJkri44ypnpphB8Uld;%avo>yJX^WbHA30iQ$H!X)3<4K
zBe1|sf3NKKTS;)mg{$k(2eDJG^u5=&x{@M!V>EWgzRA((>}?o{WQBehp1mIHU!BGG
zYz5<PKM7?P;Z-hqMg0IYKD)fC2`{Qp#c}*PGuiCeFF{$a-|!Y+O|%`1xO+TuJHvs+
z!1C+`E#58;vh@yJz_0U+cV7L#qqcmRn>_6B(+KIVdCVoum2ItM&gXZd+SB^vQTN=a
zeYbbah=i-xCho2{4Pazv_i%2mH`EkM{r8XYDLbdY@(a7Ud}$%!$QrTN_DqwNXA9~g
zTGKxKyfto7NDp;5A3O5zgb(hyxjN@OAG!(zy^*Ug4!yjF=Y*8aHA@ovB1({&a4;sR
zTf1CVC{>Pgy`m$lG;P1$pC_6F7u%iP+qz0q4{lXT`i9g-ThiYgO^GXC`f?JNo*|@p
zr{b%U-tSKw99q0|YJa9{Va?`H{IaNICo>p5lGEY*+IDR4bfIUwq~CTRuC_mGWA%~W
zea{@eKJ(Iq^7MvdsPsR%&vt$@4i&s?bPptz#y#!FcRZEaMS0WFTyXMCUEfsNxnJ_9
zPwpt`Er4O>``2G{7=4r1GCSTO8#0xw+{<^L4X(K8y1wKj72KLrYD}Y7SJuY7y==wf
z;UkI5?(v?h+4r;vR{P*U`ul~=D@U7K5$eV8c!%rX-38vE>azU80<AIk)4^ZMA4h%d
z5`SBK>UrhFXCv#d`(ylZS4+i2a^vI91MTIxCx%9gd2&N&D9RC&xcpx8#f=GZv%9;F
z#?CEVT%UV$nk;L%RJA+d=f8ZB@U*Xz-TZbG?HKKT(VJZMBH!)$#qRuwbFc%Aljqha
zoNBs8od~V$_^vux0ZSk!iP!hI($t35SxY8`FV{pxCjpU}Ova2VIg1&>V)CvvMb_<X
z*!90jAmdxX*61uwt)25(Zl?WYIZ?giXCx*AssPawSuMAqE&Kk&(6i1)O9?Y0{+^5f
zcvyY9Exx4lRLZK4!424O^*=mi`)(<=O_!Qt<0GytnAp*ry3G^6+<z!VQo)p${W~9E
qB`qX3%gt72dTDs6HxP=`*JKL3Yrz%GU6VaOi8dNCzDWUr!v6!a5RWVX
literal 0
HcmV?d00001
diff --git a/test/jdk/java/awt/Graphics2D/ImageRendering/ImageRendering.java b/test/jdk/java/awt/Graphics2D/ImageRendering/ImageRendering.java
new file mode 100644
index 00000000000..209a93e92d5
--- /dev/null
+++ b/test/jdk/java/awt/Graphics2D/ImageRendering/ImageRendering.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 1999, 2024, 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 4203598
+ * @summary This test verifies that an image with transparent background can be displayed
+ * correctly with the red background color given.
+ * The correct display should be the sleeping Duke on a red background.
+ *
+ */
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import javax.imageio.ImageIO;
+
+public class ImageRendering {
+
+ public static void main(String[] args) throws Exception {
+
+ String imgName = "snooze.gif";
+ File file = new File(System.getProperty("test.src", "."), imgName);
+ BufferedImage image = ImageIO.read(file);
+ int w = image.getWidth();
+ int h = image.getHeight();
+ BufferedImage dest = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+ Graphics2D g2d = dest.createGraphics();
+ g2d.drawImage(image, 0, 0, Color.red, null);
+ int redPixel = Color.red.getRGB();
+ for (int y = 0; y < h; y++) {
+ for (int x = 0; x < w; x++) {
+ int srcPixel = image.getRGB(x, y);
+ if ((srcPixel & 0x0ff000000) == 0) {
+ int destPix = dest.getRGB(x, y);
+ if (destPix != redPixel) {
+ throw new RuntimeException("Not red at x=" + x +
+ " y=" + y +
+ "pix = " + Integer.toHexString(destPix));
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/test/jdk/java/awt/Graphics2D/ImageRendering/snooze.gif b/test/jdk/java/awt/Graphics2D/ImageRendering/snooze.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e357e316cdbef2743ee42ee54e040c4f6c4a6525
GIT binary patch
literal 2859
zcmeHH`%@G57XR+%wSf?pM{s%Xf&!s}1mzJC-5^4USZTCZ3`iG2iv=`1swnn$Ln2`1
z+JI5<nkryXu*L>j5Vh#?5TR;}R`F3s(`v<91#Vl#$F;d}=Kc-$r+eniIWuQIpYxe>
zX3j}XONp1}E(OJ4$`0&yJAxo6ieeZ>5QJDPmPjO0sWd4mNuf|El}eRLm6w-SSXfwA
zR#sVAsnhA|>go&zgVAVgZEZD~OkG`Fy}i9dLqiseWps4(?%lg%V`CE&6H`-Diliio
zSgb=)1b|8usl*%(CML$FrY6Q5(LQAvwRH7%nYv8IR->*?S6Ei4%2WN9Y_~glIRqR^
z7$HVb3?Qh%*jiSpo0_r@^;+^&g#;#6DwJcEF$5r^CW}(4uo!#0bgfcCLLivM(4{~n
zy?KtL6JtcHv<!0$3J@`Z5diH{>7*!ON-8vB3I#%l0a~WYlVF4qO)?S+B|<p#@&F-4
zFas)8Aw(S_sYJvEM4|*(5`yI+gboo)0jdI6B_Nb2VL&BDR8sgB>41rew{)x(b+8Dd
zqk@Wc2%!RK9zg5ff{985)1g=$>gbOF02qdG#Q)p>cmu>sHUxkc%zUf+_9g&g2Ry!?
z+}zZsMLfc@ht17>T(*0>QQq-$KbPa4p)cq-lv;xbGHiev(0m@YOqfoADlUkEG76eH
z51-=*q6hD6XAWQ9&MzO=ZI|_3KIE*0Cn=eh*C@~{78T$NVHgc60@h}lWGx#IMl&T=
zR-=C;PTFFcS%+39q`Z0MX{v7FdSmgERR2g%pnp0RzUv|0%f*)CeA_JQa~{Gnqfj5q
zIcrl&#lJiHY+nRKPA^b5kH0IVq?@K&iHFrZju%pHHY9C3RsDWeod9Tas;UUI0M9j7
zA2_w)XhedU{86TuHIM#lo^&DHIW4>g-BqP^zGb>$_e{r5zNmJ*h0G6DQE<Pn^5BY0
zQvc@l^9$ks_!Syp{qcvt?jHTzWe}wMrZ)jd&8e_LZ1=GDGTc2WnkBqCjnIV7V6v-`
z8Rll(#XXA2X2moy0QZ^`L_0+R4V#af0o#+ZW$u9MGBa4&#guAmgfO3}twO&AoBRZP
zYKNRl>g7ln?VY}~D(vT47>hSnn$j|+%MwdpQfu9k%?wy+sreFL<x}pJ9+07yY4J1S
zH8Nf!*Q3I<>*dY;Y3|<!ekw{g(+~&8gE?W3t3mUEt0((7ZZr4vaq1xToz1Cd(&&0L
zi~<mE_&MPEr0ZAm5<=`N9`1)DtcM{kZX?-#<#^bK5E_o`SnrL{joJr$vd#UmUjkL@
z(9zq+HVp04L#B_9Ji&!U2_mTfcIZ=bu`p&;XVI<iSAO!7*A^?hcnuD*y^DZ`C5jiV
z%SO9ThaN<~JnzO{2z|fu?9=YJJu>G^YE5AU9J}r`CvuPhoe{L=>jvf4g9{&QR^RDS
z7XR9D+UZKl*qPP)p8V_V@-@G;ZxuHf8!pTW9i%z_nGAUdo2wSVE=9|KA9>L??-!Vz
ztYFyQ*B1S;H2z>wgv{;JXMmlR8-IOJet*o`wzdS_eIiEV|NOkr-@JQ6u|z?aoqTsm
z{q4dPTirMX#rBX4wnzD-fwOU$PJMUklLC}|l|R!8xy!7xFNn5%)^n3Dq9sWOHj|qd
z*>dJL{VWi<c<_Xt^RIxG#kKkyo1gyqGWl9}<akkh;w00<BdOmYOKX0mj=EK=NkcA;
zUzv0pY6tA2lE9xJ0kSe&<`rwE;j^mgi5k_j?%<O5SmdkJd-rR|7QvGp1l!;*>PB*|
zO>n%*YEj}FbwIM3=a!MP=*5jlv0f%zFQ?!UE9VW-j`JRa`mM^-albIUl(r<yvyq9r
z2DunsIb~&VPXE&!nH^_^(yMIjID<yJzJlfF_vlcMc}Ir0j_=xt*G%i5biuz{3hYS1
z!SVLNQh9%$aASim0*}&E)CL9IL2E+e0h~G5GVYfVvcLU-I{1~$b#*lRoq6@H1P1Zt
zQSiKBjZ@ep?YHE<#tE%2n&0<hwIOO-(DYn>Hi`QzCgn-hHsKbaxmewAu;#AEo!aU_
z=Mb9cE@!WMl<WNfuaUWzvgsGvz(-atZb*qPze>Xh+t2w<d+__gsOON4yX3EC{R~9o
zcLv=S5>InyPwvWp5D&qBg|U8WN1E5RGg<BpY}!2F?P;#UhD*c&kLcJF;+`WHufX4I
z5yH{*-kqod`L<j;dvR3Ne6!3sW_T^{LDxBM6jkZWjEFiO**y<WF2xaygu{N-$GK2I
zT`@5C<CEMVE5q6w#GnH+XkI?a5->}nuS^BGn1P@am+_nS)w~l$!Y&vMYO&+s*oS0{
zw;PKcs&#!rp!BfTdneFLGyl29S2<GcMfnKxWrB}Lm{mljedcD1^$EM4>`~KzL{RlW
zF5{|5?F&2-BsDL)?5AGX`d&UM5``25&^<?5O2r~MIqlNsK$x<b7Uve;WSeJycYq83
zJ9y8+#uy-I+r0pLvCaTD0e<=SUng{cyOtGtif=P)c*cZ_tLYqnuTIGb$!c3O7%;>3
zO?eA*VJ5gex{-uKJ$3yEd>ppV+Y=Q4?$^SU_dxga6CXQ?0$lndIa|AT_B%09xb@P#
zxtqiu=F4jS)madd7LBzveUd#lZKxQ0b@@$k3a8|&r>i%HP6Ia-HDO>?A{pf!)fbbs
zf629^jjZN`;bXWh)YWqt+HikuH|~^k_W5}@yocfUzYcxo!(QMz8M5MU-hh8I?mJAa
zfhin1Ai=;i{d!sd=0gHCwb~_YvL?3$aw2PiYY#Jo-2uHW(--(=(s=eqft<FAbIEQ$
z09a2W*|zf=ejz_U9*ew2kL|oTH$wmBGsr2~c1{>}ugssiAL6|F-R6<&+l~l;aCsBF
z%ZX$ef4_75NuwQqzV8PmJN4n{T5u^L<WggeJLG%*q$SV-IFCK(i6_z!Kk5rgd!1g$
z@|h!2ljh{o6=S8hRwd45iUVC#0y(8*Mg3kjn^I}6r2_fGIpJ?SX7Y-BI<rGY>oZJ`
z$5LW4WhHacmuI!jIeTifXLoS)M44~uj+vQovw1^d;s+fc?P4`<VJc4e0@fUI)5?pn
z?DDA`Hv6{^N=Ba<UtiGVB<??ODvyCizq;8aT{}|!l-#Ax8ZRy-S)!Y<Cw$dlcju;~
zIv*MyO&r|lECH<H+8z0?={dz&_f8d(<c$mCd->pfgK2v(^!Mn!mZtz2j;D_IFW4JU
RzP=LSza-Bm>uCTI{sVD$(Oduk
literal 0
HcmV?d00001
diff --git a/test/jdk/java/awt/Graphics2D/ScaledThinLineTest.java b/test/jdk/java/awt/Graphics2D/ScaledThinLineTest.java
new file mode 100644
index 00000000000..fd4a5dd5e7c
--- /dev/null
+++ b/test/jdk/java/awt/Graphics2D/ScaledThinLineTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2001, 2024, 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 4210466 4417756
+ * @summary thin lines are not draw correctly under large scales
+ */
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Shape;
+import java.awt.image.BufferedImage;
+import java.awt.geom.Ellipse2D;
+
+public class ScaledThinLineTest {
+
+ public static void main(String[] args) {
+ ScaledThinLineTest c1 = new ScaledThinLineTest(200, 200);
+ ScaledThinLineTest c2 = new ScaledThinLineTest(1, 10000);
+ ScaledThinLineTest c3 = new ScaledThinLineTest(10000, 1);
+ ScaledThinLineTest c4 = new ScaledThinLineTest(0.01, 10000);
+ ScaledThinLineTest c5 = new ScaledThinLineTest(10000, 0.01);
+ compare(c1.bi, c2.bi);
+ compare(c2.bi, c3.bi);
+ compare(c3.bi, c4.bi);
+ compare(c4.bi, c5.bi);
+ }
+
+ private final Shape shape;
+ private final double scaleX,scaleY;
+ private BufferedImage bi = null;
+
+ public ScaledThinLineTest(double width, double height) {
+ shape = new Ellipse2D.Double(0.25*width, 0.25*height, width, height);
+ scaleX = 200/width;
+ scaleY = 200/height;
+ int iw = 300, ih = 300;
+ bi = new BufferedImage(iw, ih, BufferedImage.TYPE_INT_RGB);
+ Graphics2D g2 = bi.createGraphics();
+ g2.setColor(Color.white);
+ g2.fillRect(0, 0, iw, ih);
+ g2.setColor(Color.black);
+ g2.scale(scaleX,scaleY);
+ g2.setStroke(new BasicStroke(0));
+ g2.draw(shape);
+ }
+
+
+ static void compare(BufferedImage i1, BufferedImage i2) {
+ int w = i1.getWidth(), h = i1.getHeight();
+ for (int y = 0; y < h; y++) {
+ for (int x = 0; x < w; x++) {
+ int p1 = i1.getRGB(x, y);
+ int p2 = i2.getRGB(x, y);
+ if (p1 != p2) {
+ System.out.println("images differ at " + x + " " + y);
+ }
+ }
+ }
+ }
+}
diff --git a/test/jdk/java/awt/Graphics2D/TextPerf.java b/test/jdk/java/awt/Graphics2D/TextPerf.java
new file mode 100644
index 00000000000..d3e5cc2d4d0
--- /dev/null
+++ b/test/jdk/java/awt/Graphics2D/TextPerf.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 1999, 2024, 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 4190429
+ * @key headful
+ * @summary In this bug, text drawing performance should be reasonable.
+ * And should (per string) be consistent with the size of the
+ * rectangle in which the string is drawn, not the rectangle
+ * bounding the whole window.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Panel;
+import java.awt.RenderingHints;
+import java.awt.Toolkit;
+import java.awt.font.GlyphVector;
+import java.awt.geom.AffineTransform;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class TextPerf extends Canvas {
+
+ static volatile CountDownLatch paintLatch = new CountDownLatch(1);
+ static volatile long paintTime = 5000; // causes test fail if it is not updated.
+ static volatile Frame frame;
+
+ public static void main(String[] args) throws Exception {
+ EventQueue.invokeAndWait(TextPerf::createUI);
+ paintLatch.await(5, TimeUnit.SECONDS);
+ if (paintTime > 2000) {
+ throw new RuntimeException("Paint time is " + paintTime + "ms");
+ }
+ if (frame != null) {
+ EventQueue.invokeAndWait(frame::dispose);
+ }
+ }
+
+ static void createUI() {
+ frame = new Frame("TextPerf");
+ frame.setLayout(new BorderLayout());
+ TextPerf tp = new TextPerf();
+ frame.add(tp, BorderLayout.CENTER);
+ frame.pack();
+ frame.setVisible(true);
+ }
+
+ public Dimension getPreferredSize() {
+ Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+ return new Dimension(d.width - 50, d.height - 50);
+ }
+
+ static Font[] fonts = {
+ new Font(Font.SERIF, Font.PLAIN, 10),
+ new Font(Font.SANS_SERIF, Font.PLAIN, 10),
+ new Font(Font.MONOSPACED, Font.ITALIC, 10),
+ new Font(Font.SERIF, Font.PLAIN, 14),
+ new Font(Font.SERIF, Font.BOLD, 12),
+ };
+
+ public void paint(Graphics g1) {
+
+ Graphics2D g = (Graphics2D)g1;
+ String text = "Hello,_Wgjpqy!";
+ Toolkit.getDefaultToolkit().sync();
+ long startTime = System.currentTimeMillis();
+ FontMetrics[] cachedMetrics = new FontMetrics[fonts.length];
+ Dimension size = getSize();
+ int prim = 0;
+ int spaceWidth = 5;
+ Color cols[] = { Color.red, Color.blue, Color.yellow,
+ Color.green, Color.pink, Color.orange} ;
+
+ for (int y = 20; y < size.height; y += 20) {
+ int i = 0;
+ for (int x = 0; x < size.width; i++) {
+ Font font = fonts[i % fonts.length];
+ FontMetrics metrics = cachedMetrics[i % fonts.length];
+ if (metrics == null) {
+ metrics = g.getFontMetrics(font);
+ cachedMetrics[i % fonts.length] = metrics;
+ }
+
+ g.setFont(font);
+ g.setColor(cols[i % cols.length]);
+ switch (prim++) {
+ case 0: g.drawString(text, x, y);
+ break;
+ case 1: g.drawBytes(text.getBytes(), 0, text.length(), x, y);
+ break;
+ case 2: char[] chs= new char[text.length()];
+ text.getChars(0,text.length(), chs, 0);
+ g.drawChars(chs, 0, text.length(), x, y);
+ break;
+ case 3: GlyphVector gv = font.createGlyphVector(
+ g.getFontRenderContext(), text);
+ g.drawGlyphVector(gv, (float)x, (float)y);
+ default: prim = 0;
+ }
+
+ x += metrics.stringWidth(text) + spaceWidth;
+ }
+ }
+
+ // Draw some transformed text to verify correct bounds calculated
+ AffineTransform at = AffineTransform.getTranslateInstance(50, 50);
+ at.scale(7.0,7.0);
+ at.rotate(1.0);
+ g.transform(at);
+ g.setColor(Color.black);
+ Font font = new Font(Font.SERIF, Font.PLAIN, 20);
+ RenderingHints hints = new RenderingHints(null);
+ hints.put(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ g.setRenderingHints(hints);
+ g.setFont(font);
+ FontMetrics metrics = g.getFontMetrics(font);
+ g.drawString("Java", 5,5);
+
+ Toolkit.getDefaultToolkit().sync();
+ long endTime = System.currentTimeMillis();
+ paintTime = endTime - startTime;
+ String msg = "repainted in " + paintTime + " milliseconds";
+ System.out.println(msg);
+ System.out.flush();
+
+ paintLatch.countDown();
+ }
+}