diff options
Diffstat (limited to 'WebCore/platform/image-decoders')
| -rw-r--r-- | WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp | 39 | ||||
| -rw-r--r-- | WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp | 2 |
2 files changed, 37 insertions, 4 deletions
diff --git a/WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp b/WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp index dc120e3..7f00db2 100644 --- a/WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp +++ b/WebCore/platform/image-decoders/haiku/ImageDecoderHaiku.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. + * Copyright (C) 2010 Stephan Aßmus, <superstippi@gmx.de> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,9 +33,41 @@ namespace WebCore { NativeImagePtr RGBA32Buffer::asNewNativeImage() const { - BBitmap* bmp = new BBitmap(BRect(0, 0, width(), height()), B_RGB32); - bmp->SetBits(m_bytes.data(), m_size.width() * m_size.height(), 0, B_RGB32); - return bmp; + int bytesPerRow = width() * sizeof(PixelData); + OwnPtr<BBitmap> bitmap(new BBitmap(BRect(0, 0, width() - 1, height() - 1), 0, B_RGBA32, bytesPerRow)); + + const uint8* source = reinterpret_cast<const uint8*>(m_bytes.data()); + uint8* destination = reinterpret_cast<uint8*>(bitmap->Bits()); + int h = height(); + int w = width(); + for (int y = 0; y < h; y++) { +#if 0 +// FIXME: Enable this conversion once Haiku has B_RGBA32P[remultiplied]... + memcpy(dst, source, bytesPerRow); +#else + const uint8* sourceHandle = source; + uint8* destinationHandle = destination; + for (int x = 0; x < w; x++) { + if (sourceHandle[3] == 255 || !sourceHandle[3]) { + destinationHandle[0] = sourceHandle[0]; + destinationHandle[1] = sourceHandle[1]; + destinationHandle[2] = sourceHandle[2]; + destinationHandle[3] = sourceHandle[3]; + } else { + destinationHandle[0] = static_cast<uint16>(sourceHandle[0]) * 255 / sourceHandle[3]; + destinationHandle[1] = static_cast<uint16>(sourceHandle[1]) * 255 / sourceHandle[3]; + destinationHandle[2] = static_cast<uint16>(sourceHandle[2]) * 255 / sourceHandle[3]; + destinationHandle[3] = sourceHandle[3]; + } + destinationHandle += 4; + sourceHandle += 4; + } +#endif + destination += bytesPerRow; + source += bytesPerRow; + } + + return bitmap.release(); } } // namespace WebCore diff --git a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp index 2a2636a..aaa9047 100644 --- a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp +++ b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp @@ -41,7 +41,7 @@ #include "JPEGImageDecoder.h" #include <stdio.h> // Needed by jpeglib.h for FILE. -#if OS(WINCE) +#if OS(WINCE) || PLATFORM(BREWMP_SIMULATOR) // Remove warning: 'FAR' macro redefinition #undef FAR |