diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 98968a2b7..4759a1752 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -4636,7 +4636,7 @@ bool QImage::load(QIODevice* device, const char* format) } /*! - \fn bool QImage::loadFromData(const uchar *data, int len, const char *format) + \fn bool QImage::loadFromData(const char *data, int len, const char *format) Loads an image from the first \a len bytes of the given binary \a data. Returns true if the image was successfully loaded; otherwise @@ -4649,7 +4649,7 @@ bool QImage::load(QIODevice* device, const char* format) \sa {QImage#Reading and Writing Image Files}{Reading and Writing Image Files} */ -bool QImage::loadFromData(const uchar *data, int len, const char *format) +bool QImage::loadFromData(const char *data, int len, const char *format) { QImage image = fromData(data, len, format); if (!image.isNull()) { @@ -4668,7 +4668,7 @@ bool QImage::loadFromData(const uchar *data, int len, const char *format) */ /*! - \fn QImage QImage::fromData(const uchar *data, int size, const char *format) + \fn QImage QImage::fromData(const char *data, int size, const char *format) Constructs a QImage from the first \a size bytes of the given binary \a data. The loader attempts to read the image using the @@ -4687,9 +4687,9 @@ bool QImage::loadFromData(const uchar *data, int len, const char *format) \sa load(), save(), {QImage#Reading and Writing Image Files}{Reading and Writing Image Files} */ -QImage QImage::fromData(const uchar *data, int size, const char *format) +QImage QImage::fromData(const char *data, int size, const char *format) { - QByteArray a = QByteArray::fromRawData(reinterpret_cast(data), size); + QByteArray a = QByteArray::fromRawData(data, size); QBuffer b; b.setData(a); b.open(QIODevice::ReadOnly); diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index de08cb762..0b5f03ce8 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -235,16 +235,16 @@ public: bool load(QIODevice *device, const char* format); bool load(const QString &fileName, const char* format=0); - bool loadFromData(const uchar *buf, int len, const char *format = 0); + bool loadFromData(const char *buf, int len, const char *format = 0); inline bool loadFromData(const QByteArray &data, const char* aformat=0) - { return loadFromData(reinterpret_cast(data.constData()), data.size(), aformat); } + { return loadFromData(data.constData(), data.size(), aformat); } bool save(const QString &fileName, const char* format=0, int quality=-1) const; bool save(QIODevice *device, const char* format=0, int quality=-1) const; - static QImage fromData(const uchar *data, int size, const char *format = 0); + static QImage fromData(const char *data, int size, const char *format = 0); inline static QImage fromData(const QByteArray &data, const char *format = 0) - { return fromData(reinterpret_cast(data.constData()), data.size(), format); } + { return fromData(data.constData(), data.size(), format); } qint64 cacheKey() const;