1 files changed, 44 insertions, 0 deletions

diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h
index f5fea2ed00..e3a6c53833 100644
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <QtGui/private/qtguiglobal_p.h>
+#include <QtCore/private/qnumeric_p.h>
 
 #include <QMap>
 #include <QVector>
@@ -104,8 +105,40 @@ struct Q_GUI_EXPORT QImageData {        // internal image data
     bool doImageIO(const QImage *image, QImageWriter* io, int quality) const;
 
     QPaintEngine *paintEngine;
+
+    struct ImageSizeParameters {
+        qsizetype bytesPerLine;
+        qsizetype totalSize;
+    };
+    static ImageSizeParameters calculateImageParameters(qsizetype width, qsizetype height, qsizetype depth);
 };
 
+inline QImageData::ImageSizeParameters
+QImageData::calculateImageParameters(qsizetype width, qsizetype height, qsizetype depth)
+{
+    ImageSizeParameters invalid = { -1, -1 };
+    if (height <= 0)
+        return invalid;
+
+    // calculate the size, taking care of overflows
+    qsizetype bytes_per_line;
+    if (mul_overflow(width, depth, &bytes_per_line))
+        return invalid;
+    if (add_overflow(bytes_per_line, qsizetype(31), &bytes_per_line))
+        return invalid;
+    // bytes per scanline (must be multiple of 4)
+    bytes_per_line = (bytes_per_line >> 5) << 2;    // can't overflow
+
+    qsizetype total_size;
+    if (mul_overflow(height, bytes_per_line, &total_size))
+        return invalid;
+    qsizetype dummy;
+    if (mul_overflow(height, qsizetype(sizeof(uchar *)), &dummy))
+        return invalid;                                 // why is this here?
+
+    return { bytes_per_line, total_size };
+}
+
 typedef void (*Image_Converter)(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags);
 typedef bool (*InPlace_Image_Converter)(QImageData *data, Qt::ImageConversionFlags);
 
@@ -113,6 +146,7 @@ extern Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImag
 extern InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QImage::NImageFormats];
 
 void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags);
+void convert_generic_to_rgb64(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags);
 bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::ImageConversionFlags);
 
 void dither_to_Mono(QImageData *dst, const QImageData *src, Qt::ImageConversionFlags flags, bool fromalpha);
@@ -164,6 +198,11 @@ inline int qt_depthForFormat(QImage::Format format)
     case QImage::Format_RGB888:
         depth = 24;
         break;
+    case QImage::Format_RGBX64:
+    case QImage::Format_RGBA64:
+    case QImage::Format_RGBA64_Premultiplied:
+        depth = 64;
+        break;
     }
     return depth;
 }
@@ -190,6 +229,9 @@ inline QImage::Format qt_opaqueVersion(QImage::Format format)
         return QImage::Format_BGR30;
     case QImage::Format_A2RGB30_Premultiplied:
         return QImage::Format_RGB30;
+    case QImage::Format_RGBA64:
+    case QImage::Format_RGBA64_Premultiplied:
+        return QImage::Format_RGBX64;
     case QImage::Format_ARGB32_Premultiplied:
     case QImage::Format_ARGB32:
     default:
@@ -214,6 +256,8 @@ inline QImage::Format qt_alphaVersion(QImage::Format format)
         return QImage::Format_A2BGR30_Premultiplied;
     case QImage::Format_RGB30:
         return QImage::Format_A2RGB30_Premultiplied;
+    case QImage::Format_RGBX64:
+        return QImage::Format_RGBA64_Premultiplied;
     default:
         break;
     }