1 files changed, 7 insertions, 12 deletions

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 7fcae12cbd..469ae8b97e 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -2582,15 +2582,14 @@ bool QImage::allGray() const
         break;
     }
 
-    const int buffer_size = 2048;
-    uint buffer[buffer_size];
+    uint buffer[BufferSize];
     const QPixelLayout *layout = &qPixelLayouts[d->format];
     FetchPixelsFunc fetch = qFetchPixels[layout->bpp];
     for (int j = 0; j < d->height; ++j) {
         const uchar *b = constScanLine(j);
         int x = 0;
         while (x < d->width) {
-            int l = qMin(d->width - x, buffer_size);
+            int l = qMin(d->width - x, BufferSize);
             const uint *ptr = fetch(buffer, b, x, l);
             ptr = layout->convertToARGB32PM(buffer, ptr, l, 0, 0);
             for (int i = 0; i < l; ++i) {
@@ -3218,14 +3217,13 @@ inline void rgbSwapped_generic(int width, int height, const QImage *src, QImage
     const uint alphaGreenMask = (((1 << layout->alphaWidth) - 1) << layout->alphaShift)
             | (((1 << layout->greenWidth) - 1) << layout->greenShift);
 
-    const int buffer_size = 2048;
-    uint buffer[buffer_size];
+    uint buffer[BufferSize];
     for (int i = 0; i < height; ++i) {
         uchar *q = dst->scanLine(i);
         const uchar *p = src->constScanLine(i);
         int x = 0;
         while (x < width) {
-            int l = qMin(width - x, buffer_size);
+            int l = qMin(width - x, BufferSize);
             const uint *ptr = fetch(buffer, p, x, l);
             for (int j = 0; j < l; ++j) {
                 uint red = (ptr[j] >> layout->redShift) & redBlueMask;
@@ -3457,8 +3455,7 @@ void QImage::rgbSwapped_inplace()
 
 bool QImage::load(const QString &fileName, const char* format)
 {
-    QImage image = QImageReader(fileName, format).read();
-    operator=(image);
+    *this = QImageReader(fileName, format).read();
     return !isNull();
 }
 
@@ -3471,8 +3468,7 @@ bool QImage::load(const QString &fileName, const char* format)
 
 bool QImage::load(QIODevice* device, const char* format)
 {
-    QImage image = QImageReader(device, format).read();
-    operator=(image);
+    *this = QImageReader(device, format).read();
     return !isNull();
 }
 
@@ -3492,8 +3488,7 @@ bool QImage::load(QIODevice* device, const char* format)
 
 bool QImage::loadFromData(const uchar *data, int len, const char *format)
 {
-    QImage image = fromData(data, len, format);
-    operator=(image);
+    *this = fromData(data, len, format);
     return !isNull();
 }