From 9c4df4389f9d998ce8b59b1665a018b69a2eb865 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 18:46:10 +0000 Subject: Merge webkit.org at r54127 : GIFImageDecoder now requires ImageDecoder. ImageDecoder requires numerous additional include paths. Change-Id: I047d36db7b5f28e7602f55eeeedc04beb713c079 --- WebCore/platform/image-decoders/ImageDecoder.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'WebCore/platform/image-decoders') diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp index 62f6bec..ed13048 100644 --- a/WebCore/platform/image-decoders/ImageDecoder.cpp +++ b/WebCore/platform/image-decoders/ImageDecoder.cpp @@ -52,6 +52,10 @@ static unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const return bytesExtracted; } +#if !OS(ANDROID) +// This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and +// JPEGDecoder, which aren't used on Android, and which don't all compile. +// TODO: Find a better fix. ImageDecoder* ImageDecoder::create(const SharedBuffer& data) { // We need at least 4 bytes to figure out what kind of image we're dealing with. @@ -93,6 +97,7 @@ ImageDecoder* ImageDecoder::create(const SharedBuffer& data) // Give up. We don't know what the heck this is. return 0; } +#endif // !OS(ANDROID) #if !PLATFORM(SKIA) -- cgit v1.1