From 2a115d7dd1cdbf9f5a8311ecde2ba4c0ceec66a4 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Sun, 17 Jan 2021 16:15:37 +0700 Subject: [PATCH] final fixes --- JavaApp/src/main/java/jdpi/awt/Graphics.java | 4 ---- JavaApp/src/main/java/jdpi/awt/image/BufferedImage.java | 8 ++++++-- .../main/java/jdpi/awt/image/ImageObserverWrapper.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/JavaApp/src/main/java/jdpi/awt/Graphics.java b/JavaApp/src/main/java/jdpi/awt/Graphics.java index 0f58e1bf..07113193 100644 --- a/JavaApp/src/main/java/jdpi/awt/Graphics.java +++ b/JavaApp/src/main/java/jdpi/awt/Graphics.java @@ -4,10 +4,6 @@ import jdpi.awt.image.*; public class Graphics { protected java.awt.Graphics2D g2d; - - public Graphics(java.awt.Graphics g2d) { - this((java.awt.Graphics2D) g2d); - } public Graphics(java.awt.Graphics2D g2d) { this.g2d = g2d; diff --git a/JavaApp/src/main/java/jdpi/awt/image/BufferedImage.java b/JavaApp/src/main/java/jdpi/awt/image/BufferedImage.java index 355829cb..c84f706a 100644 --- a/JavaApp/src/main/java/jdpi/awt/image/BufferedImage.java +++ b/JavaApp/src/main/java/jdpi/awt/image/BufferedImage.java @@ -6,11 +6,15 @@ import jdpi.awt.Image; public class BufferedImage extends Image { private java.awt.image.BufferedImage mImg; public BufferedImage(int width, int height, int imageType) { - mImg = new java.awt.image.BufferedImage(width, height, imageType); + this(new java.awt.image.BufferedImage(width, height, imageType)); + } + + public BufferedImage(java.awt.image.BufferedImage img) { + mImg = img; } public Graphics getGraphics() { - return new Graphics2D(mImg.getGraphics()); + return new Graphics2D((java.awt.Graphics2D) mImg.getGraphics()); } public Graphics2D createGraphics() { diff --git a/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java b/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java index 3374a85f..4c34229d 100644 --- a/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java +++ b/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java @@ -6,8 +6,8 @@ public void ImageObserverWrapper { public java.awt.image.ImageObserver wrap(final ImageObserver observer) { return new java.awt.image.ImageObserver() { public boolean imageUpdate(java.awt.Image img, int infoflags, int x, int y, int width, int height) { - if (img instanceof BufferedImage) { - observer.imageUpdate((BufferedImage) imf, infoflags, x, y, width, height); + if (img instanceof java.awt.image.BufferedImage) { + observer.imageUpdate(new BufferedImage((java.awt.image.BufferedImage) img), infoflags, x, y, width, height); } } };