diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-07 14:45:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-07 15:19:01 +0000 |
| commit | 6a02958f2155dc923bdefeb971d5df1b5030acc2 (patch) | |
| tree | 1228df50383b4a9208e2af583bb98ea7b1c93be0 /src | |
| parent | 525f8516c2580018f910cfb99ab5e0e36bd55ab1 (diff) | |
Fix narrowing warning on MSVC
Task-number: QTBUG-64307
Change-Id: I26032b71dc8fe316dddb8ce2adf6fd0a75ecf226
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qdrawhelper_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index 2db139d794..1dea386da4 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -1170,13 +1170,13 @@ const uint qt_bayer_matrix[16][16] = { inline uint comp_func_Plus_one_pixel_const_alpha(uint d, const uint s, const uint const_alpha, const uint one_minus_const_alpha) { - const uint result = (AMIX(AMASK) | MIX(RMASK) | MIX(GMASK) | MIX(BMASK)); + const uint result = uint(AMIX(AMASK) | MIX(RMASK) | MIX(GMASK) | MIX(BMASK)); return INTERPOLATE_PIXEL_255(result, const_alpha, d, one_minus_const_alpha); } inline uint comp_func_Plus_one_pixel(uint d, const uint s) { - const uint result = (AMIX(AMASK) | MIX(RMASK) | MIX(GMASK) | MIX(BMASK)); + const uint result = uint(AMIX(AMASK) | MIX(RMASK) | MIX(GMASK) | MIX(BMASK)); return result; } |