diff options
Diffstat (limited to 'WebCore/platform/graphics/qt/ImageBufferQt.cpp')
| -rw-r--r-- | WebCore/platform/graphics/qt/ImageBufferQt.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/WebCore/platform/graphics/qt/ImageBufferQt.cpp index 11ca377..ee01222 100644 --- a/WebCore/platform/graphics/qt/ImageBufferQt.cpp +++ b/WebCore/platform/graphics/qt/ImageBufferQt.cpp @@ -216,11 +216,11 @@ PassRefPtr<ImageData> getImageData(const IntRect& rect, const ImageBufferData& i const uchar* bits = image.bits(); #endif - quint32* destRows = reinterpret_cast<quint32*>(&data[desty * rect.width() + destx]); + quint32* destRows = reinterpret_cast_ptr<quint32*>(&data[desty * rect.width() + destx]); if (multiplied == Unmultiplied) { for (int y = 0; y < numRows; ++y) { - const quint32* scanLine = reinterpret_cast<const quint32*>(bits + (y + originy) * bytesPerLine); + const quint32* scanLine = reinterpret_cast_ptr<const quint32*>(bits + (y + originy) * bytesPerLine); for (int x = 0; x < numColumns; x++) { QRgb pixel = scanLine[x + originx]; int alpha = qAlpha(pixel); @@ -242,7 +242,7 @@ PassRefPtr<ImageData> getImageData(const IntRect& rect, const ImageBufferData& i } } else { for (int y = 0; y < numRows; ++y) { - const quint32* scanLine = reinterpret_cast<const quint32*>(bits + (y + originy) * bytesPerLine); + const quint32* scanLine = reinterpret_cast_ptr<const quint32*>(bits + (y + originy) * bytesPerLine); for (int x = 0; x < numColumns; x++) { QRgb pixel = scanLine[x + originx]; // Convert RGB to BGR. @@ -318,11 +318,11 @@ void putImageData(ImageData*& source, const IntRect& sourceRect, const IntPoint& uchar* bits = image.bits(); const int bytesPerLine = image.bytesPerLine(); - const quint32* srcScanLine = reinterpret_cast<const quint32*>(source->data()->data()->data() + originy * srcBytesPerRow + originx * 4); + const quint32* srcScanLine = reinterpret_cast_ptr<const quint32*>(source->data()->data()->data() + originy * srcBytesPerRow + originx * 4); if (multiplied == Unmultiplied) { for (int y = 0; y < numRows; ++y) { - quint32* destScanLine = reinterpret_cast<quint32*>(bits + y * bytesPerLine); + quint32* destScanLine = reinterpret_cast_ptr<quint32*>(bits + y * bytesPerLine); for (int x = 0; x < numColumns; x++) { // Premultiply and convert BGR to RGB. quint32 pixel = srcScanLine[x]; @@ -332,7 +332,7 @@ void putImageData(ImageData*& source, const IntRect& sourceRect, const IntPoint& } } else { for (int y = 0; y < numRows; ++y) { - quint32* destScanLine = reinterpret_cast<quint32*>(bits + y * bytesPerLine); + quint32* destScanLine = reinterpret_cast_ptr<quint32*>(bits + y * bytesPerLine); for (int x = 0; x < numColumns; x++) { // Convert BGR to RGB. quint32 pixel = srcScanLine[x]; |