diff -r 0ae830f00e0c -r 591d06d8e06f javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java Thu May 23 09:56:49 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java Thu May 23 15:36:42 2013 +0200 @@ -17,6 +17,7 @@ */ package net.java.html.canvas; +import net.java.html.canvas.spi.GraphicsEnvironment; import java.awt.Dimension; /** @@ -132,15 +133,15 @@ graphicsEnvironmentImpl.scale(x, y); } - public void drawImage(Image image, double x, double y){ + public void drawImage(ImageData image, double x, double y){ graphicsEnvironmentImpl.drawImage(image, x, y); } - public void drawImage(Image image, double x, double y, double width, double height){ + public void drawImage(ImageData image, double x, double y, double width, double height){ graphicsEnvironmentImpl.drawImage(image, x, y, width, height); } - public void drawImage(Image image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height){ + public void drawImage(ImageData image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height){ graphicsEnvironmentImpl.drawImage(image, sx, sy, sWidth, sHeight, x, y, width, height); } @@ -272,7 +273,7 @@ // return graphicsEnvironmentImpl.createImageData(x, y); // } // -// public ImageData createImageData(Image imageData){ +// public ImageData createImageData(ImageData imageData){ // return graphicsEnvironmentImpl.createImageData(imageData); // } // @@ -308,7 +309,7 @@ return new LinearGradient(x0, y0, x1, y1); } - public Pattern createPattern(Image image, String repeat){ + public Pattern createPattern(ImageData image, String repeat){ return new Pattern(image, repeat); } @@ -316,9 +317,9 @@ return new RadialGradient(x0, y0, r0, x1, y1, r1); } - public Image getImageDataForPath(String path){ - return graphicsEnvironmentImpl.getImageForPath(path); - } +// public ImageData getImageDataForPath(String path){ +// return graphicsEnvironmentImpl.getImageForPath(path); +// } public int getHeight(){ return graphicsEnvironmentImpl.getHeight();