1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdrawhelper.cpp: Fix constexpr build with MSVC 2015 Update 1

Browse Source 
error C2397: conversion from 'uint' to 'uchar' requires a narrowing conversion

Change-Id: Ic1b9e0a78b2faa5a0ae4e6de33ab2ee4b654af5f
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Thiago Macieira 2015-11-16 14:06:42 -08:00
parent f29b6943f0
commit 1378e7af1d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/painting/qdrawhelper.cpp
View File

@ -379,9 +379,9 @@ static const uint *QT_FASTCALL convertARGBPMFromARGB32PM(uint *buffer, const uin
template<QImage::Format Format> Q_DECL_CONSTEXPR static inline QPixelLayout pixelLayoutRGB() template<QImage::Format Format> Q_DECL_CONSTEXPR static inline QPixelLayout pixelLayoutRGB()
{ {
return QPixelLayout{ return QPixelLayout{
redWidth<Format>(), redShift<Format>(), uchar(redWidth<Format>()), uchar(redShift<Format>()),
greenWidth<Format>(), greenShift<Format>(), uchar(greenWidth<Format>()), uchar(greenShift<Format>()),
blueWidth<Format>(), blueShift<Format>(), uchar(blueWidth<Format>()), uchar(blueShift<Format>()),
0, 0, 0, 0,
false, bitsPerPixel<Format>(), false, bitsPerPixel<Format>(),
convertToRGB32<Format>, convertToRGB32<Format>,
@ -394,10 +394,10 @@ template<QImage::Format Format> Q_DECL_CONSTEXPR static inline QPixelLayout pixe
template<QImage::Format Format> Q_DECL_CONSTEXPR static inline QPixelLayout pixelLayoutARGBPM() template<QImage::Format Format> Q_DECL_CONSTEXPR static inline QPixelLayout pixelLayoutARGBPM()
{ {
return QPixelLayout{ return QPixelLayout{
redWidth<Format>(), redShift<Format>(), uchar(redWidth<Format>()), uchar(redShift<Format>()),
greenWidth<Format>(), greenShift<Format>(), uchar(greenWidth<Format>()), uchar(greenShift<Format>()),
blueWidth<Format>(), blueShift<Format>(), uchar(blueWidth<Format>()), uchar(blueShift<Format>()),
alphaWidth<Format>(), alphaShift<Format>(), uchar(alphaWidth<Format>()), uchar(alphaShift<Format>()),
true, bitsPerPixel<Format>(), true, bitsPerPixel<Format>(),
convertARGBPMToARGB32PM<Format>, convertARGBPMToARGB32PM<Format>,
convertARGBPMFromARGB32PM<Format>, convertARGBPMFromARGB32PM<Format>,