From e14391e94c850b8bd03680c23b38978db68687a8 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 4 Nov 2010 12:00:17 -0700 Subject: Merge Webkit at r70949: Initial merge by git. Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e --- WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp') diff --git a/WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp b/WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp index 7f00db2..47302f7 100644 --- a/WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp +++ b/WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp @@ -36,7 +36,7 @@ NativeImagePtr RGBA32Buffer::asNewNativeImage() const int bytesPerRow = width() * sizeof(PixelData); OwnPtr bitmap(new BBitmap(BRect(0, 0, width() - 1, height() - 1), 0, B_RGBA32, bytesPerRow)); - const uint8* source = reinterpret_cast(m_bytes.data()); + const uint8* source = reinterpret_cast(m_bytes); uint8* destination = reinterpret_cast(bitmap->Bits()); int h = height(); int w = width(); -- cgit v1.1