Commit 2eeb97b5 authored by zecke@webkit.org's avatar zecke@webkit.org

Build fix for Qt. After recent ImageDeocder.h changes.

I want the original change to be backed out as the whole
Skia merging is going in the wrong direction. The discussion
will happen in the bugtracker.

https://bugs.webkit.org/show_bug.cgi?id=25709.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44648 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e792de3d
2009-06-12 Holger Hans Peter Freyther <zecke@selfish.org>
Build fix for Qt. After recent ImageDeocder.h changes. I want
the original change to be backed out as the whole Skia merging
is going in the wrong direction. The discussion will happen in
the bugtracker.
https://bugs.webkit.org/show_bug.cgi?id=25709.
* platform/image-decoders/ImageDecoder.h:
2009-06-12 Jan Michael Alonzo <jmalonzo@webkit.org>
Gtk build fix: include cstdio so we can use sscanf
......@@ -30,11 +30,14 @@
#include "ImageSource.h"
#include "PlatformString.h"
#include "SharedBuffer.h"
#include <cairo.h>
#include <wtf/Assertions.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
#if PLATFORM(CAIRO)
#include <cairo.h>
#endif
namespace WebCore {
// The RGBA32Buffer object represents the decoded image data in RGBA32 format. This buffer is what all
......@@ -126,6 +129,7 @@ namespace WebCore {
return true;
}
#if PLATFORM(CAIRO)
// To be used by ImageSource::createFrameAtIndex(). Returns a pointer
// to the underlying native image data. This pointer will be owned by
// the BitmapImage and freed in FrameData::clear().
......@@ -136,6 +140,7 @@ namespace WebCore {
m_bytes.data())), CAIRO_FORMAT_ARGB32, width(), height(),
width() * sizeof(PixelData));
}
#endif
bool hasAlpha() const { return m_hasAlpha; }
const IntRect& rect() const { return m_rect; }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment