Fix assert when converting RGBx8888 to ARGB32_PM

RGBx8888 to ARGB32_PM is incorrectly using the RGBA8888 to ARGB32_PM
which asserts the input format is RGBA8888. Since the routine also
performs an unnecessy premul, we should be using a the generic rgba2argb
routine.

Change-Id: I7b67328f804f5f2a9664a35c04836679e8c8b8e5
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
bb10
Allan Sandfeld Jensen 2014-02-07 14:35:04 +01:00 committed by The Qt Project
parent fbc554b42c
commit 2a3f635953
1 changed files with 1 additions and 1 deletions

View File

@ -3663,7 +3663,7 @@ static Image_Converter converter_map[QImage::NImageFormats][QImage::NImageFormat
0,
convert_RGBA_to_RGB,
convert_RGBA_to_ARGB,
convert_RGBA_to_ARGB_PM,
convert_RGBA_to_ARGB,
0,
0,
0,