diff options
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qimageiohandler.cpp | 2 | ||||
-rw-r--r-- | src/gui/image/qmovie.cpp | 14 | ||||
-rw-r--r-- | src/gui/image/qxbmhandler.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp index f770458127..055ace9985 100644 --- a/src/gui/image/qimageiohandler.cpp +++ b/src/gui/image/qimageiohandler.cpp @@ -433,7 +433,7 @@ bool QImageIOHandler::supportsOption(ImageOption option) const the sequence number of the current image in the animation. If this function is called before any image is read(), -1 is returned. The number of the first image in the sequence is 0. - + If the image format does not support animation, 0 is returned. \sa read() diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index e137af2231..ae526f5ba7 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -/*! +/*! \class QMovie \inmodule QtGui @@ -150,7 +150,7 @@ copy of the frame. */ -/*! +/*! \fn void QMovie::stateChanged(QMovie::MovieState state) This signal is emitted every time the state of the movie changes. The new @@ -203,23 +203,23 @@ public: inline QFrameInfo(bool endMark) : pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(endMark) { } - + inline QFrameInfo() : pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(false) { } - + inline QFrameInfo(const QPixmap &pixmap, int delay) : pixmap(pixmap), delay(delay), endMark(false) { } - + inline bool isValid() { return endMark || !(pixmap.isNull() && (delay == QMOVIE_INVALID_DELAY)); } - + inline bool isEndMarker() { return endMark; } - + static inline QFrameInfo endMarker() { return QFrameInfo(true); } }; diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp index 0e1ecfa299..498f6ce767 100644 --- a/src/gui/image/qxbmhandler.cpp +++ b/src/gui/image/qxbmhandler.cpp @@ -302,7 +302,7 @@ bool QXbmHandler::read(QImage *image) { if (state == Error) return false; - + if (state == Ready && !readHeader()) { state = Error; return false; |