Changes: Added test cases to ft_mscalableimage and deprecated an obsolete method from MScalableImage.

RevBy: Armin Berres, Stanislav Ionascu

3 files changed, 5 insertions, 6 deletions

diff --git a/src/corelib/painting/mscalableimage.cpp b/src/corelib/painting/mscalableimage.cpp
index 95a48b99..64f3501e 100644
--- a/src/corelib/painting/mscalableimage.cpp
+++ b/src/corelib/painting/mscalableimage.cpp
@@ -31,7 +31,7 @@
 
 MScalableImagePrivate::MScalableImagePrivate()
     : m_imageType(MScalable9), m_image(NULL),
-      m_useGLRenderer(false), q_ptr(NULL)
+      q_ptr(NULL)
 {
 }
 
@@ -294,8 +294,7 @@ void MScalableImage::draw(const QRect &rect, QPainter *painter) const
 
 void MScalableImage::enableOptimizedRendering(bool enable)
 {
-    Q_D(MScalableImage);
-    d->m_useGLRenderer = enable;
+    Q_UNUSED(enable);
 }
 
 void MScalableImage::draw(const QRect &rect, const QPoint& pixmapOffset, const QPixmap* pixmap, QPainter *painter) const
@@ -317,6 +316,7 @@ void MScalableImage::draw(const QRect &rect, const QPoint& pixmapOffset, const Q
 
     // post process the resulting image (add mask)
     QImage fillImage = pixmap->toImage();
+    fillImage = fillImage.convertToFormat(QImage::Format_ARGB32);
     int sourceWidth = fillImage.width();
     int sourceHeight = fillImage.height();
 
@@ -327,7 +327,7 @@ void MScalableImage::draw(const QRect &rect, const QPoint& pixmapOffset, const Q
         // target scanline
         uint* target = (uint *) image.scanLine(y);
         // source scanline (tiled)
-        const uint* source = (const uint *) fillImage.scanLine(pixmapOffset.y() + (y % sourceHeight));
+        const uint* source = (const uint *) fillImage.scanLine((pixmapOffset.y() + y) % sourceHeight);
         for (int x = 0; x < width; ++x) {
             // tile the x coordinate
             uint color = *(source + ((pixmapOffset.x() + x) % sourceWidth));
diff --git a/src/corelib/painting/mscalableimage.h b/src/corelib/painting/mscalableimage.h
index 0d27b7bf..81e863d4 100644
--- a/src/corelib/painting/mscalableimage.h
+++ b/src/corelib/painting/mscalableimage.h
@@ -142,6 +142,7 @@ public:
 
       \note This method is only for benchmarking purposes and may be removed
             in the future.
+      \deprecated            
      */
     void enableOptimizedRendering(bool enable);
 
diff --git a/src/corelib/painting/mscalableimage_p.h b/src/corelib/painting/mscalableimage_p.h
index 14b0787a..12a56399 100644
--- a/src/corelib/painting/mscalableimage_p.h
+++ b/src/corelib/painting/mscalableimage_p.h
@@ -53,8 +53,6 @@ public:
 
     const QPixmap *m_image;
 
-    bool m_useGLRenderer;
-
     QMargins m_preferredMargins;
 
     QString pixmapId;