* scaled_bitmap.cpp: better fix than [16273] ...

diff --git a/modules/gui/skins2/src/scaled_bitmap.cpp b/modules/gui/skins2/src/scaled_bitmap.cpp
index 402a4b015501e6472825725765b66bcca71a129d..576c96f12c2ca1598dc4c965e7273635dbc3ee11 100644 (file)
--- a/modules/gui/skins2/src/scaled_bitmap.cpp
+++ b/modules/gui/skins2/src/scaled_bitmap.cpp
@@ -81,9 +81,11 @@ ScaledBitmap::ScaledBitmap( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
             uint32_t yOffset = ((y * srcHeight) / height) * srcWidth;
             pSrcData = ((uint32_t*)rBitmap.getData()) + yOffset;
 
-            *(pDestData++) = *(pSrcData++);
-            // Don't start with x=0 to avoid an infinite loop if width==1
-            for( int x = 1; x < width; x++ )
+            if (width == 1)
+            {
+                *(pDestData++) = *pSrcData;
+            }
+            else for( int x = 0; x < width; x++ )
             {
                 *(pDestData++) = *(pSrcData++);