diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-02-07 14:35:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-10 16:22:52 +0100 |
| commit | 2a3f6359537f0c975d9bb90bba208236bcecca8b (patch) | |
| tree | a74d287e46ed4d7b8eef89984570a2170084f200 | |
| parent | fbc554b42c6a1d0c06d39a54b991513d7ce2db12 (diff) | |
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>
| -rw-r--r-- | src/gui/image/qimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 70fe7b783f..0b2211defc 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -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, |