1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QImage::sizeInBytes() instead of deprecated QImage::byteCount()

Browse Source 
Change-Id: If3f21fc43d0118c1819d354c8ef43f1b79617c7b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2017-10-04 10:39:36 +02:00 committed by Johan Helsing
parent 6c1c47611f
commit 4e0e6db654
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylandcursor.cpp
View File

@ -119,7 +119,7 @@ QSharedPointer<QWaylandBuffer> QWaylandCursor::cursorBitmapImage(const QCursor *
const QImage &img = cursor->pixmap().toImage(); const QImage &img = cursor->pixmap().toImage();
QSharedPointer<QWaylandShmBuffer> buffer(new QWaylandShmBuffer(mDisplay, img.size(), img.format())); QSharedPointer<QWaylandShmBuffer> buffer(new QWaylandShmBuffer(mDisplay, img.size(), img.format()));
memcpy(buffer->image()->bits(), img.bits(), img.byteCount()); memcpy(buffer->image()->bits(), img.bits(), img.sizeInBytes());
return buffer; return buffer;
} }

8
src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
View File

@ -125,7 +125,7 @@ QWaylandShmBuffer::~QWaylandShmBuffer(void)
{ {
delete mMarginsImage; delete mMarginsImage;
if (mImage.constBits()) if (mImage.constBits())
munmap((void *) mImage.constBits(), mImage.byteCount()); munmap((void *) mImage.constBits(), mImage.sizeInBytes());
if (mShmPool) if (mShmPool)
wl_shm_pool_destroy(mShmPool); wl_shm_pool_destroy(mShmPool);
} }
@ -287,10 +287,10 @@ void QWaylandShmBackingStore::resize(const QSize &size)
buffer = getBuffer(sizeWithMargins); buffer = getBuffer(sizeWithMargins);
} }
int oldSize = mBackBuffer ? mBackBuffer->image()->byteCount() : 0; qssize_t oldSize = mBackBuffer ? mBackBuffer->image()->sizeInBytes() : 0;
// mBackBuffer may have been deleted here but if so it means its size was different so we wouldn't copy it anyway // mBackBuffer may have been deleted here but if so it means its size was different so we wouldn't copy it anyway
if (mBackBuffer != buffer && oldSize == buffer->image()->byteCount()) { if (mBackBuffer != buffer && oldSize == buffer->image()->sizeInBytes()) {
memcpy(buffer->image()->bits(), mBackBuffer->image()->constBits(), buffer->image()->byteCount()); memcpy(buffer->image()->bits(), mBackBuffer->image()->constBits(), buffer->image()->sizeInBytes());
} }
mBackBuffer = buffer; mBackBuffer = buffer;
// ensure the new buffer is at the beginning of the list so next time getBuffer() will pick // ensure the new buffer is at the beginning of the list so next time getBuffer() will pick