image work

BobHanson · BobHanson · commit 47ac3121e3aa · 2020-05-16T01:58:38.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/image/LookupOp.java b/sources/net.sf.j2s.java.core/src/java/awt/image/LookupOp.java
@@ -188,9 +188,7 @@ public final BufferedImage filter(BufferedImage src, BufferedImage dst) {
 //        if (ImagingLib.filter(this, src, dst) == null) {
             // Do it the slow way
         
-        // added 2002.02.24 PhET AbstractMediaButtons
-        	src.秘ensureHavePixels(false);
-        	
+        // added 2002.02.24 PhET AbstractMediaButtons        	
             WritableRaster srcRaster = src.getRaster();
             WritableRaster dstRaster = dst.getRaster();
 
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JViewport.java b/sources/net.sf.j2s.java.core/src/javax/swing/JViewport.java
@@ -612,7 +612,7 @@ private void paintViaBackingStore(Graphics g) {
         Graphics bsg = getBackingStoreGraphics(g);
         try {
             super.paint(bsg);
-            ((JSGraphics2D)(Object)g).drawImageFromRaster(backingStoreImage, 0, 0, this);
+            ((JSGraphics2D)(Object)g).drawImageFromPixelsOrRaster(backingStoreImage, 0, 0, this);
         } finally {
             bsg.dispose();
         }

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ private void paintViaBackingStore(Graphics g) {`
`612`	`612`	`Graphics bsg = getBackingStoreGraphics(g);`
`613`	`613`	`try {`
`614`	`614`	`super.paint(bsg);`
`615`		`- ((JSGraphics2D)(Object)g).drawImageFromRaster(backingStoreImage, 0, 0, this);`
	`615`	`+ ((JSGraphics2D)(Object)g).drawImageFromPixelsOrRaster(backingStoreImage, 0, 0, this);`
`616`	`616`	`} finally {`
`617`	`617`	`bsg.dispose();`
`618`	`618`	`}`