From e153fd97f87e5bf5e9ff3a4c91091ade50aa607d Mon Sep 17 00:00:00 2001 From: Tj Holowaychuk Date: Mon, 15 Nov 2010 13:41:02 -0800 Subject: [PATCH] Fixed getImageData() --- src/PixelArray.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/PixelArray.cc b/src/PixelArray.cc index 1200431..0c98bae 100644 --- a/src/PixelArray.cc +++ b/src/PixelArray.cc @@ -85,11 +85,12 @@ PixelArray::PixelArray(Canvas *canvas, int sx, int sy, int width, int height): // Alloc space for our new data uint8_t *dst = alloc(); uint8_t *src = canvas->data(); - int s = stride(); + int srcStride = canvas->stride() + , dstStride = stride(); // Normalize data (argb -> rgba) for (int y = 0; y < height; ++y) { - uint32_t *row = (uint32_t *)(src + s * y); + uint32_t *row = (uint32_t *)(src + srcStride * y); for (int x = 0; x < width; ++x) { int bx = x * 4; uint32_t *pixel = row + x; @@ -106,7 +107,7 @@ PixelArray::PixelArray(Canvas *canvas, int sx, int sy, int width, int height): dst[bx + 1] = g * 255 / a; dst[bx + 2] = b * 255 / a; } - dst += s; + dst += dstStride; } }