diff options
| -rw-r--r-- | src/extras/text/qtextureatlas.cpp | 2 | ||||
| -rw-r--r-- | src/render/texture/qtextureimagedata.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/extras/text/qtextureatlas.cpp b/src/extras/text/qtextureatlas.cpp index bc29537da..1f4b22d83 100644 --- a/src/extras/text/qtextureatlas.cpp +++ b/src/extras/text/qtextureatlas.cpp @@ -117,7 +117,7 @@ QByteArray QTextureAtlasData::createUpdatedImageData() } } - return QByteArray(reinterpret_cast<const char*>(m_image.constBits()), m_image.byteCount()); + return QByteArray(reinterpret_cast<const char*>(m_image.constBits()), m_image.sizeInBytes()); } QTextureAtlasPrivate::QTextureAtlasPrivate() diff --git a/src/render/texture/qtextureimagedata.cpp b/src/render/texture/qtextureimagedata.cpp index c9057608e..c31f272a8 100644 --- a/src/render/texture/qtextureimagedata.cpp +++ b/src/render/texture/qtextureimagedata.cpp @@ -370,7 +370,7 @@ void QTextureImageData::setImage(const QImage &image) Q_ASSERT_X(glImage.bytesPerLine() == (glImage.width() * glImage.depth() + 7) / 8, "QTextureImageData::setImage", "glImage is not packed"); // QTBUG-48330 d->m_blockSize = 4; - QByteArray imageBytes((const char*) glImage.constBits(), glImage.byteCount()); + QByteArray imageBytes((const char*) glImage.constBits(), glImage.sizeInBytes()); setData(imageBytes, d->m_blockSize, false); d->m_format = QOpenGLTexture::RGBA8_UNorm; d->m_pixelFormat = QOpenGLTexture::RGBA; |