From 9423be1f190bd7cdeb04add39f4ec621a33a3041 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 11 Jul 2017 10:54:18 +0200 Subject: Fix deprecation warnings Switch to QImage::sizeInBytes for huge QImage support. Change-Id: I0145f204dd2db6670e199c320fff9064b4a97ef4 Reviewed-by: Friedemann Kleint --- src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp') 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++; } -- cgit v1.2.3