diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-11 10:54:18 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-11 18:59:07 +0000 |
| commit | 9423be1f190bd7cdeb04add39f4ec621a33a3041 (patch) | |
| tree | 79ef14150609300a4453b6a8cacf608d6cb3ea39 | |
| parent | ecac1aeb29f37a080d4f2d3614bfc5fcc5b70689 (diff) | |
Fix deprecation warnings
Switch to QImage::sizeInBytes for huge QImage support.
Change-Id: I0145f204dd2db6670e199c320fff9064b4a97ef4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/gui/image/qimage.h | 2 | ||||
| -rw-r--r-- | src/gui/image/qimage_darwin.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 7ad44cc33e..eccff480bb 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -471,7 +471,7 @@ inline void QImage::setNumColors(int n) inline int QImage::numBytes() const { - return byteCount(); + return int(sizeInBytes()); } #endif diff --git a/src/gui/image/qimage_darwin.mm b/src/gui/image/qimage_darwin.mm index 3764bef06b..a5c391ad21 100644 --- a/src/gui/image/qimage_darwin.mm +++ b/src/gui/image/qimage_darwin.mm @@ -130,7 +130,7 @@ CGImageRef QImage::toCGImage() const auto deleter = [](void *image, const void *, size_t) { delete static_cast<QImage *>(image); }; QCFType<CGDataProviderRef> dataProvider = - CGDataProviderCreateWithData(new QImage(*this), bits(), byteCount(), deleter); + CGDataProviderCreateWithData(new QImage(*this), bits(), sizeInBytes(), deleter); QCFType<CGColorSpaceRef> colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); diff --git a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp index 08752da648..e59ad57c27 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp @@ -539,7 +539,7 @@ void QX11PlatformPixmap::fromImage(const QImage &img, Qt::ImageConversionFlags f Visual *visual = (Visual *)xinfo.visual(); XImage *xi = 0; bool trucol = (visual->c_class >= TrueColor); - int nbytes = image.byteCount(); + size_t nbytes = image.sizeInBytes(); uchar *newbits= 0; #if QT_CONFIG(xrender) @@ -1125,7 +1125,7 @@ void QX11PlatformPixmap::fromImage(const QImage &img, Qt::ImageConversionFlags f } p = newbits; - for (int i = 0; i < nbytes; i++) { // translate pixels + for (size_t i = 0; i < nbytes; i++) { // translate pixels *p = pix[*p]; p++; } diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 09263550b2..0e65f6a23d 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -2541,8 +2541,8 @@ void tst_QImage::inplaceRgbSwapped() QImage dataSwapped; { QVERIFY(!orig.isNull()); - volatileData = new uchar[orig.byteCount()]; - memcpy(volatileData, orig.constBits(), orig.byteCount()); + volatileData = new uchar[orig.sizeInBytes()]; + memcpy(volatileData, orig.constBits(), orig.sizeInBytes()); QImage dataImage; if (rw) @@ -2653,8 +2653,8 @@ void tst_QImage::inplaceMirrored() QImage dataSwapped; { QVERIFY(!orig.isNull()); - volatileData = new uchar[orig.byteCount()]; - memcpy(volatileData, orig.constBits(), orig.byteCount()); + volatileData = new uchar[orig.sizeInBytes()]; + memcpy(volatileData, orig.constBits(), orig.sizeInBytes()); QImage dataImage; if (rw) |