Changeset 152086 in webkit

Timestamp:

Jun 27, 2013 3:10:08 AM (11 years ago)

Author:

Csaba Osztrogonác

Message:

Fix cast-align warnings in WebCore/platform/graphics/cairo
​https://bugs.webkit.org/show_bug.cgi?id=117990

Reviewed by Rob Buis.

• platform/graphics/cairo/BitmapImageCairo.cpp:

(WebCore::BitmapImage::checkForSolidColor):

• platform/graphics/cairo/ImageBufferCairo.cpp:

(WebCore::ImageBuffer::platformTransformColorSpace):
(WebCore::getImageData):
(WebCore::ImageBuffer::putByteArray):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/BitmapImageCairo.cpp (modified) (1 diff)
• platform/graphics/cairo/ImageBufferCairo.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-27  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Fix cast-align warnings in WebCore/platform/graphics/cairo
+        https://bugs.webkit.org/show_bug.cgi?id=117990
+
+        Reviewed by Rob Buis.
+
+        * platform/graphics/cairo/BitmapImageCairo.cpp:
+        (WebCore::BitmapImage::checkForSolidColor):
+        * platform/graphics/cairo/ImageBufferCairo.cpp:
+        (WebCore::ImageBuffer::platformTransformColorSpace):
+        (WebCore::getImageData):
+        (WebCore::ImageBuffer::putByteArray):
+
 2013-06-27  Szabolcs Dávid  <davidsz@inf.u-szeged.hu>
 

trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp

@@ -148 +148 @@
         return;
 
-    unsigned* pixelColor = reinterpret_cast<unsigned*>(cairo_image_surface_get_data(surface.get()));
+    unsigned* pixelColor = reinterpret_cast_ptr<unsigned*>(cairo_image_surface_get_data(surface.get()));
     m_solidColor = colorFromPremultipliedARGB(*pixelColor);
 

trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

@@ -167 +167 @@
     int stride = cairo_image_surface_get_stride(m_data.m_surface.get());
     for (int y = 0; y < m_size.height(); ++y) {
-        unsigned* row = reinterpret_cast<unsigned*>(dataSrc + stride * y);
+        unsigned* row = reinterpret_cast_ptr<unsigned*>(dataSrc + stride * y);
         for (int x = 0; x < m_size.width(); x++) {
             unsigned* pixel = row + x;
@@ -253 +253 @@
     unsigned char* destRows = dataDst + desty * destBytesPerRow + destx * 4;
     for (int y = 0; y < numRows; ++y) {
-        unsigned* row = reinterpret_cast<unsigned*>(dataSrc + stride * (y + originy));
+        unsigned* row = reinterpret_cast_ptr<unsigned*>(dataSrc + stride * (y + originy));
         for (int x = 0; x < numColumns; x++) {
             int basex = x * 4;
@@ -331 +331 @@
     unsigned char* srcRows = source->data() + originy * srcBytesPerRow + originx * 4;
     for (int y = 0; y < numRows; ++y) {
-        unsigned* row = reinterpret_cast<unsigned*>(dataDst + stride * (y + desty));
+        unsigned* row = reinterpret_cast_ptr<unsigned*>(dataDst + stride * (y + desty));
         for (int x = 0; x < numColumns; x++) {
             int basex = x * 4;