1 files changed, 8 insertions, 10 deletions
diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
index 1b4d3e63dd..16ad0a3edc 100644
--- a/src/gui/image/qimage_conversions.cpp
+++ b/src/gui/image/qimage_conversions.cpp
@@ -145,8 +145,7 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
     // Cannot be used with indexed formats.
     Q_ASSERT(dest->format > QImage::Format_Indexed8);
     Q_ASSERT(src->format > QImage::Format_Indexed8);
-    const int buffer_size = 2048;
-    uint buf[buffer_size];
+    uint buf[BufferSize];
     uint *buffer = buf;
     const QPixelLayout *srcLayout = &qPixelLayouts[src->format];
     const QPixelLayout *destLayout = &qPixelLayouts[dest->format];
@@ -157,7 +156,7 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
     const StorePixelsFunc store = qStorePixels[destLayout->bpp];
     ConvertFunc convertToARGB32PM = srcLayout->convertToARGB32PM;
     ConvertFunc convertFromARGB32PM = destLayout->convertFromARGB32PM;
-    if (srcLayout->alphaWidth == 0 && destLayout->convertFromRGB32) {
+    if (!srcLayout->hasAlphaChannel && destLayout->convertFromRGB32) {
         // If the source doesn't have an alpha channel, we can use the faster convertFromRGB32 method.
         convertFromARGB32PM = destLayout->convertFromRGB32;
     } else {
@@ -174,7 +173,7 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
         }
     }
     if ((src->format == QImage::Format_ARGB32 || src->format == QImage::Format_RGBA8888) &&
-            destLayout->alphaWidth == 0 && destLayout->convertFromRGB32) {
+            !destLayout->hasAlphaChannel && destLayout->convertFromRGB32) {
         // Avoid unnecessary premultiply and unpremultiply when converting from unpremultiplied src format.
         convertToARGB32PM = qPixelLayouts[src->format + 1].convertToARGB32PM;
         if (dest->format == QImage::Format_RGB32)
@@ -196,7 +195,7 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
             if (destLayout->bpp == QPixelLayout::BPP32)
                 buffer = reinterpret_cast<uint *>(destData) + x;
             else
-                l = qMin(l, buffer_size);
+                l = qMin(l, BufferSize);
             const uint *ptr = fetch(buffer, srcData, x, l);
             ptr = convertToARGB32PM(buffer, ptr, l, 0, ditherPtr);
             ptr = convertFromARGB32PM(buffer, ptr, l, 0, ditherPtr);
@@ -217,8 +216,7 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im
     if (data->depth != qt_depthForFormat(dst_format))
         return false;
 
-    const int buffer_size = 2048;
-    uint buffer[buffer_size];
+    uint buffer[BufferSize];
     const QPixelLayout *srcLayout = &qPixelLayouts[data->format];
     const QPixelLayout *destLayout = &qPixelLayouts[dst_format];
     uchar *srcData = data->data;
@@ -227,7 +225,7 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im
     const StorePixelsFunc store = qStorePixels[destLayout->bpp];
     ConvertFunc convertToARGB32PM = srcLayout->convertToARGB32PM;
     ConvertFunc convertFromARGB32PM = destLayout->convertFromARGB32PM;
-    if (srcLayout->alphaWidth == 0 && destLayout->convertFromRGB32) {
+    if (!srcLayout->hasAlphaChannel && destLayout->convertFromRGB32) {
         // If the source doesn't have an alpha channel, we can use the faster convertFromRGB32 method.
         convertFromARGB32PM = destLayout->convertFromRGB32;
     } else {
@@ -243,7 +241,7 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im
         }
     }
     if ((data->format == QImage::Format_ARGB32 || data->format == QImage::Format_RGBA8888) &&
-            destLayout->alphaWidth == 0 && destLayout->convertFromRGB32) {
+            !destLayout->hasAlphaChannel && destLayout->convertFromRGB32) {
         // Avoid unnecessary premultiply and unpremultiply when converting from unpremultiplied src format.
         convertToARGB32PM = qPixelLayouts[data->format + 1].convertToARGB32PM;
         if (dst_format == QImage::Format_RGB32)
@@ -261,7 +259,7 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im
         int x = 0;
         while (x < data->width) {
             dither.x = x;
-            int l = qMin(data->width - x, buffer_size);
+            int l = qMin(data->width - x, BufferSize);
             const uint *ptr = fetch(buffer, srcData, x, l);
             ptr = convertToARGB32PM(buffer, ptr, l, 0, ditherPtr);
             ptr = convertFromARGB32PM(buffer, ptr, l, 0, ditherPtr);