From 053aa15ded1e40feee9a1811a40ba1d4535f0d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Lehni?= <juerg@scratchdisk.com>
Date: Tue, 12 Feb 2013 14:40:55 -0800
Subject: [PATCH] Rename Raster's ImageData code from *Data to *ImageData, to
 avoid clash with future Item#data.

---
 src/item/Raster.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/item/Raster.js b/src/item/Raster.js
index 815e78d5..b24d2c12 100644
--- a/src/item/Raster.js
+++ b/src/item/Raster.js
@@ -417,13 +417,13 @@ var Raster = this.Raster = PlacedItem.extend(/** @lends Raster# */{
 		ctx.putImageData(imageData, _point.x, _point.y);
 	},
 
-	// DOCS: document Raster#createData
+	// DOCS: document Raster#createImageData
 	/**
 	 * {@grouptitle Image Data}
 	 * @param {Size} size
 	 * @return {ImageData}
 	 */
-	createData: function(size) {
+	createImageData: function(size) {
 		size = Size.read(arguments);
 		return this.getContext().createImageData(size.width, size.height);
 	},
@@ -434,7 +434,7 @@ var Raster = this.Raster = PlacedItem.extend(/** @lends Raster# */{
 	 * @param {Rectangle} rect
 	 * @return {ImageData}
 	 */
-	getData: function(rect) {
+	getImageData: function(rect) {
 		rect = Rectangle.read(arguments);
 		if (rect.isEmpty())
 			rect = new Rectangle(this.getSize());
@@ -442,13 +442,13 @@ var Raster = this.Raster = PlacedItem.extend(/** @lends Raster# */{
 				rect.width, rect.height);
 	},
 
-	// DOCS: document Raster#setData
+	// DOCS: document Raster#setImageData
 	/**
 	 * @param {ImageData} data
 	 * @param {Point} point
 	 * @return {ImageData}
 	 */
-	setData: function(data, point) {
+	setImageData: function(data, point) {
 		point = Point.read(arguments, 1);
 		this.getContext(true).putImageData(data, point.x, point.y);
 	},