1.1 --- a/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java	Thu May 23 15:36:42 2013 +0200
     1.2 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java	Fri May 24 07:36:58 2013 +0200
     1.3 @@ -17,8 +17,7 @@
     1.4   */
     1.5  package net.java.html.canvas.spi;
     1.6  
     1.7 -import java.awt.Dimension;
     1.8 -import net.java.html.canvas.ImageData;
     1.9 +import net.java.html.canvas.Dimension;
    1.10  import net.java.html.canvas.Style;
    1.11  
    1.12  /**
    1.13 @@ -82,12 +81,12 @@
    1.14  
    1.15      public void scale(double x, double y);
    1.16  
    1.17 -    public void drawImage(ImageData image, double x, double y);
    1.18 -
    1.19 -    public void drawImage(ImageData image, double x, double y, double width, double height);
    1.20 -
    1.21 -    public void drawImage(ImageData image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height);
    1.22 -
    1.23 +////    public void drawImage(ImageData image, double x, double y);
    1.24 +////
    1.25 +////    public void drawImage(ImageData image, double x, double y, double width, double height);
    1.26 +////
    1.27 +////    public void drawImage(ImageData image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height);
    1.28 +//
    1.29      public void setFillStyle(String style);
    1.30  
    1.31      public String getFillStyle();
    1.32 @@ -154,15 +153,15 @@
    1.33  
    1.34      public void strokeText(String text, double x, double y, double maxWidth);
    1.35  
    1.36 -//    public ImageData createImageData(double x, double y);
    1.37 -//
    1.38 -//    public ImageData createImageData(ImageData imageData);
    1.39 -//
    1.40 -//    public ImageData getImageData(double x, double y, double width, double height);
    1.41 -//
    1.42 -//    public void putImageData(ImageData imageData, double x, double y);
    1.43 -//
    1.44 -//    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight);
    1.45 +////    public ImageData createImageData(double x, double y);
    1.46 +////
    1.47 +////    public ImageData createImageData(ImageData imageData);
    1.48 +////
    1.49 +////    public ImageData getImageData(double x, double y, double width, double height);
    1.50 +////
    1.51 +////    public void putImageData(ImageData imageData, double x, double y);
    1.52 +////
    1.53 +////    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight);
    1.54  
    1.55      public void setGlobalAlpha(double alpha);
    1.56  
    1.57 @@ -172,7 +171,7 @@
    1.58  
    1.59      public String getGlobalCompositeOperation();
    1.60  
    1.61 -//    public ImageData getImageForPath(String path);
    1.62 +////    public ImageData getImageForPath(String path);
    1.63  
    1.64      public int getHeight();
    1.65