diff -r 69c81bdaf193 -r 5bf850c5b7f1 javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java Fri May 24 12:29:58 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java Mon May 27 08:30:18 2013 +0200 @@ -18,6 +18,8 @@ package net.java.html.canvas.spi; import net.java.html.canvas.Dimension; +import net.java.html.canvas.Image; +import net.java.html.canvas.ImageData; import net.java.html.canvas.Style; /** @@ -82,12 +84,12 @@ public void scale(double x, double y); -//// public void drawImage(ImageData image, double x, double y); -//// -//// public void drawImage(ImageData image, 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); -// + public Object drawImage(Image image, double x, double y, Object nativeImage); + + public Object drawImage(Image image, double x, double y, double width, double height, Object nativeImage); + + public Object drawImage(Image image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height, Object nativeImage); + /** * When implementing you can return an Object of your choice to enable @@ -122,7 +124,7 @@ public void setShadowOffsetX(double x); public void setShadowOffsetY(double y); - + public String getShadowColor(); public double getShadowBlur(); @@ -169,15 +171,16 @@ public void strokeText(String text, double x, double y, double maxWidth); -//// public ImageData createImageData(double x, double y); -//// -//// public ImageData createImageData(ImageData imageData); -//// -//// public ImageData getImageData(double x, double y, double width, double height); -//// -//// public void putImageData(ImageData imageData, double x, double y); -//// -//// public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight); + public ImageData createPixelMap(double x, double y); + + public ImageData createPixelMap(ImageData imageData); + + public ImageData getPixelMap(double x, double y, double width, double height); + + public void putPixelMap(ImageData imageData, double x, double y); + + public void putPixelMap(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight); + public void setGlobalAlpha(double alpha); public double getGlobalAlpha(); @@ -186,7 +189,8 @@ public String getGlobalCompositeOperation(); -//// public ImageData getImageForPath(String path); + public Image getImageForPath(String path); + public int getHeight(); public int getWidth();