Merge pull request #8 from poizan42/wk_4.8.6

Don't act on format of image and then read alpha channel from noneScaled...
wkhtmltopdf · Sep 2, 2014 · c84e440 · c84e440
2 parents 82b568b + b18df9f
commit c84e440
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp
@@ -956,7 +956,7 @@ int QPdfEnginePrivate::addImage(const QImage &img, bool *bitmap, qint64 serial_n
         bool hasAlpha = false;
         bool hasMask = false;
 
-        if (format != QImage::Format_RGB32) {
+        if ((!uns && format == QImage::Format_ARGB32) || (uns && noneScaled->format() == QImage::Format_ARGB32)) {
             softMaskData.resize(w * h);
             uchar *sdata = (uchar *)softMaskData.data();
             for (int y = 0; y < h; ++y) {