1.1 --- a/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java	Mon May 27 14:13:01 2013 +0200
     1.2 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java	Sat Sep 07 18:25:09 2013 +0200
     1.3 @@ -90,7 +90,13 @@
     1.4  
     1.5      public Object drawImage(Image image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height, Object nativeImage);
     1.6  
     1.7 -
     1.8 +   
     1.9 +    public int getWidth(Image image, Object nativeImage);
    1.10 +    
    1.11 +    public int getHeight(Image image, Object nativeImage);
    1.12 +    
    1.13 +    
    1.14 +    
    1.15      /**
    1.16       * When implementing you can return an Object of your choice to enable
    1.17       * caching. Returning null means no caching. When caching is enabled, and
    1.18 @@ -196,4 +202,6 @@
    1.19      public void setHeight(int height);
    1.20  
    1.21      public void setWidth(int width);
    1.22 +
    1.23 +    public Object mergeImages(Image a, Image b, Object cachedA, Object cachedB);
    1.24  }