# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1263841411 -7200
# Node ID bfff372fb1f4c20c7f7a4b998f3d539bceb5eb81
# Parent  d46562c3d99ddb7cfabfb1d8c0dcd873543ec80e
Revision: 201001
Kit: 201003

diff -r d46562c3d99d -r bfff372fb1f4 svgtopt/nvgdecoder/src/TLVRenderer.cpp
--- a/svgtopt/nvgdecoder/src/TLVRenderer.cpp	Thu Jan 07 16:19:02 2010 +0200
+++ b/svgtopt/nvgdecoder/src/TLVRenderer.cpp	Mon Jan 18 21:03:31 2010 +0200
@@ -765,10 +765,10 @@
 
     if (!iScaled)
         {
-        VGfloat scaleX = iTargetWidth  / width;
-        VGfloat scaleY = iTargetHeight / height;
+        VGfloat scaleX = ((VGfloat)iTargetWidth)  / width;
+        VGfloat scaleY = ((VGfloat)iTargetHeight) / height;
         vgLoadMatrix(iUserMatrix);
-        vgTranslate(iTargetWidth / 2, iTargetHeight / 2);
+        vgTranslate(((VGfloat)iTargetWidth) / 2, ((VGfloat)iTargetHeight) / 2);
         vgScale(scaleX, scaleY);
         vgTranslate(- width / 2, - height / 2);
 
diff -r d46562c3d99d -r bfff372fb1f4 svgtopt/nvgdecoder/src/nvg.cpp
--- a/svgtopt/nvgdecoder/src/nvg.cpp	Thu Jan 07 16:19:02 2010 +0200
+++ b/svgtopt/nvgdecoder/src/nvg.cpp	Mon Jan 18 21:03:31 2010 +0200
@@ -843,11 +843,14 @@
                     {
                     idoFill = VG_TRUE;
                     }
-                TUint16 offset = aOffsetVector->DerefInt16L(lOffsetIx * sizeof(TUint16));
-
-                TDereferencer section = GetCommandSectionL(offset, aIconData, aNVGVersion);
-
-                DrawPathL(&section);
+                
+                if (idoStroke != VG_FALSE || idoFill != VG_FALSE)
+                    {
+                    TUint16 offset        = aOffsetVector->DerefInt16L(lOffsetIx * sizeof(TUint16));    
+                    TDereferencer section = GetCommandSectionL(offset, aIconData, aNVGVersion);
+    
+                    DrawPathL(&section);
+                    }
                 
                 break;
                 }