1.1 --- a/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java	Fri May 24 12:29:58 2013 +0200
     1.2 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java	Mon May 27 08:30:18 2013 +0200
     1.3 @@ -18,6 +18,8 @@
     1.4  package net.java.html.canvas.spi;
     1.5  
     1.6  import net.java.html.canvas.Dimension;
     1.7 +import net.java.html.canvas.Image;
     1.8 +import net.java.html.canvas.ImageData;
     1.9  import net.java.html.canvas.Style;
    1.10  
    1.11  /**
    1.12 @@ -82,12 +84,12 @@
    1.13  
    1.14      public void scale(double x, double y);
    1.15  
    1.16 -////    public void drawImage(ImageData image, double x, double y);
    1.17 -////
    1.18 -////    public void drawImage(ImageData image, double x, double y, double width, double height);
    1.19 -////
    1.20 -////    public void drawImage(ImageData image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height);
    1.21 -//
    1.22 +    public Object drawImage(Image image,  double x, double y, Object nativeImage);
    1.23 +
    1.24 +    public Object drawImage(Image image, double x, double y, double width, double height, Object nativeImage);
    1.25 +
    1.26 +    public Object drawImage(Image image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height, Object nativeImage);
    1.27 +
    1.28  
    1.29      /**
    1.30       * When implementing you can return an Object of your choice to enable
    1.31 @@ -122,7 +124,7 @@
    1.32      public void setShadowOffsetX(double x);
    1.33  
    1.34      public void setShadowOffsetY(double y);
    1.35 -
    1.36 +    
    1.37      public String getShadowColor();
    1.38  
    1.39      public double getShadowBlur();
    1.40 @@ -169,15 +171,16 @@
    1.41  
    1.42      public void strokeText(String text, double x, double y, double maxWidth);
    1.43  
    1.44 -////    public ImageData createImageData(double x, double y);
    1.45 -////
    1.46 -////    public ImageData createImageData(ImageData imageData);
    1.47 -////
    1.48 -////    public ImageData getImageData(double x, double y, double width, double height);
    1.49 -////
    1.50 -////    public void putImageData(ImageData imageData, double x, double y);
    1.51 -////
    1.52 -////    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight);
    1.53 +    public ImageData createPixelMap(double x, double y);
    1.54 +
    1.55 +    public ImageData createPixelMap(ImageData imageData);
    1.56 +
    1.57 +    public ImageData getPixelMap(double x, double y, double width, double height);
    1.58 +
    1.59 +    public void putPixelMap(ImageData imageData, double x, double y);
    1.60 +
    1.61 +    public void putPixelMap(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight);
    1.62 +    
    1.63      public void setGlobalAlpha(double alpha);
    1.64  
    1.65      public double getGlobalAlpha();
    1.66 @@ -186,7 +189,8 @@
    1.67  
    1.68      public String getGlobalCompositeOperation();
    1.69  
    1.70 -////    public ImageData getImageForPath(String path);
    1.71 +    public Image getImageForPath(String path);
    1.72 +    
    1.73      public int getHeight();
    1.74  
    1.75      public int getWidth();