summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-02 23:24:55 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-02 23:24:55 (GMT)
commit170cf2d84158a071f8564c3fa65f6fd6afcada44 (patch)
treef566e3c68fea19f136a25bd89fbd3e7b62a8fb69
parent23d20f10cc89dedb21424924ef2654705267ba46 (diff)
downloadQt-170cf2d84158a071f8564c3fa65f6fd6afcada44.zip
Qt-170cf2d84158a071f8564c3fa65f6fd6afcada44.tar.gz
Qt-170cf2d84158a071f8564c3fa65f6fd6afcada44.tar.bz2
Fix crash.
-rw-r--r--doc/src/declarative/tutorial3.qdoc2
-rw-r--r--src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp10
2 files changed, 2 insertions, 10 deletions
diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc
index c13accf..290b535 100644
--- a/doc/src/declarative/tutorial3.qdoc
+++ b/doc/src/declarative/tutorial3.qdoc
@@ -6,7 +6,7 @@ In this chapter, we make this example a little bit more dynamic by introducing s
We want our text to move to the bottom of the screen, rotate and become red when clicked.
-\image declarative-tutorial3.gif
+\image declarative-tutorial3_animation.gif
Here is the QML code:
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
index f8403b7..b6823dd 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
@@ -145,16 +145,8 @@ RGBA32Buffer* ImageDecoderQt::frameBufferAtIndex(size_t index)
return &frame;
}
-void ImageDecoderQt::clearFrameBufferCache(size_t index)
+void ImageDecoderQt::clearFrameBufferCache(size_t /*index*/)
{
- // Currently QImageReader will be asked to read everything. This
- // might change when we read gif images on demand. For now we
- // can have a rather simple implementation.
- if (index > m_frameBufferCache.size())
- return;
-
- for (size_t i = 0; i < index; ++index)
- m_frameBufferCache[index].clear();
}
void ImageDecoderQt::internalDecodeSize()