AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when rendering to grayscale8 images

Browse Source 
An entry was missing in one of the tables. This patch adds it back in
and adds the enum comments used to keep track of whether they all are
there and correctly set.

Change-Id: Ic6a55a8f81f9c42a3174a2a75c80c3a354f173b7
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Allan Sandfeld Jensen 2016-09-01 14:00:58 +02:00 committed by Allan Sandfeld Jensen
parent c8cb188dd4
commit 24bd7fd651
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5384,17 +5384,17 @@ static const ProcessSpans processTextureSpans[NBlendTypes][QImage::NImageFormats
blend_src_generic, // ARGB32 blend_src_generic, // ARGB32
blend_transformed_argb, // ARGB32_Premultiplied blend_transformed_argb, // ARGB32_Premultiplied
blend_transformed_rgb565, blend_transformed_rgb565,
blend_src_generic, blend_src_generic, // ARGB8565_Premultiplied
blend_src_generic, blend_src_generic, // RGB666
blend_src_generic, blend_src_generic, // ARGB6666_Premultiplied
blend_src_generic, blend_src_generic, // RGB555
blend_src_generic, blend_src_generic, // ARGB8555_Premultiplied
blend_src_generic, blend_src_generic, // RGB888
blend_src_generic, blend_src_generic, // RGB444
blend_src_generic, blend_src_generic, // ARGB4444_Premultiplied
blend_src_generic, blend_src_generic, // RGBX8888
blend_src_generic, blend_src_generic, // RGBA8888
blend_src_generic, blend_src_generic, // RGBA8888_Premultiplied
blend_src_generic_rgb64, blend_src_generic_rgb64,
blend_src_generic_rgb64, blend_src_generic_rgb64,
blend_src_generic_rgb64, blend_src_generic_rgb64,
@ -5412,16 +5412,17 @@ static const ProcessSpans processTextureSpans[NBlendTypes][QImage::NImageFormats
blend_src_generic, // ARGB32 blend_src_generic, // ARGB32
blend_transformed_tiled_argb, // ARGB32_Premultiplied blend_transformed_tiled_argb, // ARGB32_Premultiplied
blend_transformed_tiled_rgb565, blend_transformed_tiled_rgb565,
blend_src_generic, blend_src_generic, // ARGB8565_Premultiplied
blend_src_generic, blend_src_generic, // RGB666
blend_src_generic, blend_src_generic, // ARGB6666_Premultiplied
blend_src_generic, blend_src_generic, // RGB555
blend_src_generic, blend_src_generic, // ARGB8555_Premultiplied
blend_src_generic, blend_src_generic, // RGB888
blend_src_generic, blend_src_generic, // RGB444
blend_src_generic, blend_src_generic, // ARGB4444_Premultiplied
blend_src_generic, blend_src_generic, // RGBX8888
blend_src_generic, blend_src_generic, // RGBA8888
blend_src_generic, // RGBA8888_Premultiplied
blend_src_generic_rgb64, blend_src_generic_rgb64,
blend_src_generic_rgb64, blend_src_generic_rgb64,
blend_src_generic_rgb64, blend_src_generic_rgb64,
@ -5439,17 +5440,17 @@ static const ProcessSpans processTextureSpans[NBlendTypes][QImage::NImageFormats
blend_src_generic, // ARGB32 blend_src_generic, // ARGB32
blend_src_generic, // ARGB32_Premultiplied blend_src_generic, // ARGB32_Premultiplied
blend_transformed_bilinear_rgb565, blend_transformed_bilinear_rgb565,
blend_src_generic, blend_src_generic, // ARGB8565_Premultiplied
blend_src_generic, blend_src_generic, // RGB666
blend_src_generic, blend_src_generic, // ARGB6666_Premultiplied
blend_src_generic, blend_src_generic, // RGB555
blend_src_generic, blend_src_generic, // ARGB8555_Premultiplied
blend_src_generic, blend_src_generic, // RGB888
blend_src_generic, blend_src_generic, // RGB444
blend_src_generic, blend_src_generic, // ARGB4444_Premultiplied
blend_src_generic, blend_src_generic, // RGBX8888
blend_src_generic, blend_src_generic, // RGBA8888
blend_src_generic, blend_src_generic, // RGBA8888_Premultiplied
blend_src_generic_rgb64, blend_src_generic_rgb64,
blend_src_generic_rgb64, blend_src_generic_rgb64,
blend_src_generic_rgb64, blend_src_generic_rgb64,