Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change some QImage methods to take char* to avoid reinterpret_cast

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-07-15 16:04:36 +00:00
parent 720e8703a3
commit 81c6f05fe4
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/image/qimage.cpp
View file

@ -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<const char *>(data), size);
QByteArray a = QByteArray::fromRawData(data, size);
QBuffer b;
b.setData(a);
b.open(QIODevice::ReadOnly);

8
src/gui/image/qimage.h
View file

@ -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<const uchar *>(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<const uchar *>(data.constData()), data.size(), format); }
{ return fromData(data.constData(), data.size(), format); }
qint64 cacheKey() const;