Merge pull request #2289 from laanwj/201301_qimage_bits

Use QImage.bits instead of QImage.constBits to ease backporting
This commit is contained in:
Wladimir J. van der Laan 2013-02-10 09:27:31 -08:00
commit 6749082294

View File

@ -113,7 +113,7 @@ FreedesktopImage::FreedesktopImage(const QImage &img):
{ {
// Convert 00xAARRGGBB to RGBA bytewise (endian-independent) format // Convert 00xAARRGGBB to RGBA bytewise (endian-independent) format
QImage tmp = img.convertToFormat(QImage::Format_ARGB32); QImage tmp = img.convertToFormat(QImage::Format_ARGB32);
const uint32_t *data = reinterpret_cast<const uint32_t*>(tmp.constBits()); const uint32_t *data = reinterpret_cast<const uint32_t*>(tmp.bits());
unsigned int num_pixels = width * height; unsigned int num_pixels = width * height;
image.resize(num_pixels * BYTES_PER_PIXEL); image.resize(num_pixels * BYTES_PER_PIXEL);