Commit ea7ce88e authored by pkasting@chromium.org's avatar pkasting@chromium.org

2009-06-13 Peter Kasting <pkasting@google.com>

        GTK bustage fix.  "inline" is handled differently by different compilers.

        * platform/image-decoders/ImageDecoder.h:
        (WebCore::RGBA32Buffer::getAddr):
        * platform/image-decoders/cairo/ImageDecoderCairo.cpp:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44653 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e0a21476
2009-06-13 Peter Kasting <pkasting@google.com>
GTK bustage fix. "inline" is handled differently by different compilers.
* platform/image-decoders/ImageDecoder.h:
(WebCore::RGBA32Buffer::getAddr):
* platform/image-decoders/cairo/ImageDecoderCairo.cpp:
2009-06-13 Peter Kasting <pkasting@google.com> 2009-06-13 Peter Kasting <pkasting@google.com>
Reviewed by Eric Seidel. Reviewed by Eric Seidel.
...@@ -120,10 +120,15 @@ namespace WebCore { ...@@ -120,10 +120,15 @@ namespace WebCore {
private: private:
RGBA32Buffer& operator=(const RGBA32Buffer& other); RGBA32Buffer& operator=(const RGBA32Buffer& other);
inline int width() const; int width() const;
inline int height() const; int height() const;
inline PixelData* getAddr(int x, int y); inline PixelData* getAddr(int x, int y)
{
#if PLATFORM(CAIRO)
return m_bytes.data() + (y * width()) + x;
#endif
}
inline void setRGBA(PixelData* dest, unsigned r, unsigned g, unsigned b, unsigned a) inline void setRGBA(PixelData* dest, unsigned r, unsigned g, unsigned b, unsigned a)
{ {
......
...@@ -115,9 +115,4 @@ int RGBA32Buffer::height() const { ...@@ -115,9 +115,4 @@ int RGBA32Buffer::height() const {
return m_size.height(); return m_size.height();
} }
RGBA32Buffer::PixelData* RGBA32Buffer::getAddr(int x, int y)
{
return m_bytes.data() + (y * width()) + x;
}
} // namespace WebCore } // namespace WebCore
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