# HG changeset patch # User Anton Epple # Date 1369295809 -7200 # Node ID 0ae830f00e0c982f0df22f4203a5f44230139117 # Parent 368626597f1a0ff87d3a0c55bcd1c6eb6f6e4d2e temporarily disabled ImageData before we found a nice solution. Maybe introduce PixelReader PixelWriter for GraphicsContext. diff -r 368626597f1a -r 0ae830f00e0c 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:47:20 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java Thu May 23 09:56:49 2013 +0200 @@ -268,25 +268,25 @@ graphicsEnvironmentImpl.strokeText(text, x, y, maxWidth); } - public Image createImageData(double x, double y){ - return graphicsEnvironmentImpl.createImageData(x, y); - } - - public Image createImageData(Image imageData){ - return graphicsEnvironmentImpl.createImageData(imageData); - } - - public Image getImageData(double x, double y, double width, double height){ - return graphicsEnvironmentImpl.getImageData(x, y, width, height); - } - - public void putImageData(Image imageData, double x, double y){ - graphicsEnvironmentImpl.putImageData(imageData, x, y); - } - - public void putImageData(Image imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){ - graphicsEnvironmentImpl.putImageData(imageData, x, y, dirtyx, dirtyy, dirtywidth, dirtyheight); - } +// public ImageData createImageData(double x, double y){ +// return graphicsEnvironmentImpl.createImageData(x, y); +// } +// +// public ImageData createImageData(Image imageData){ +// return graphicsEnvironmentImpl.createImageData(imageData); +// } +// +// public ImageData getImageData(double x, double y, double width, double height){ +// return graphicsEnvironmentImpl.getImageData(x, y, width, height); +// } +// +// public void putImageData(ImageData imageData, double x, double y){ +// graphicsEnvironmentImpl.putImageData(imageData, x, y); +// } +// +// public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){ +// graphicsEnvironmentImpl.putImageData(imageData, x, y, dirtyx, dirtyy, dirtywidth, dirtyheight); +// } public void setGlobalAlpha(double alpha){ graphicsEnvironmentImpl.setGlobalAlpha(alpha); @@ -317,7 +317,7 @@ } public Image getImageDataForPath(String path){ - return graphicsEnvironmentImpl.getImageDataForPath(path); + return graphicsEnvironmentImpl.getImageForPath(path); } public int getHeight(){ diff -r 368626597f1a -r 0ae830f00e0c javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsEnvironment.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsEnvironment.java Thu May 23 09:47:20 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsEnvironment.java Thu May 23 09:56:49 2013 +0200 @@ -152,15 +152,15 @@ public void strokeText(String text, double x, double y, double maxWidth); - public Image createImageData(double x, double y); - - public Image createImageData(Image imageData); - - public Image getImageData(double x, double y, double width, double height); - - public void putImageData(Image imageData, double x, double y); - - public void putImageData(Image imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight); +// public ImageData createImageData(double x, double y); +// +// public ImageData createImageData(Image 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 void setGlobalAlpha(double alpha); @@ -170,7 +170,7 @@ public String getGlobalCompositeOperation(); - public Image getImageDataForPath(String path); + public Image getImageForPath(String path); public int getHeight(); diff -r 368626597f1a -r 0ae830f00e0c javaquery/canvas/src/main/java/net/java/html/canvas/Image.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/Image.java Thu May 23 09:47:20 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/Image.java Thu May 23 09:56:49 2013 +0200 @@ -27,8 +27,5 @@ public double getWidth(); - public int getValueAt(double x, double y); - - public void setValueAt(double x, double y, int value); }