diff -r db5c883ad1c5 -r 1902ade171ab svgtopt/nvgdecoder/src/TLVIconCreator.cpp
--- a/svgtopt/nvgdecoder/src/TLVIconCreator.cpp	Tue Aug 31 16:06:58 2010 +0300
+++ b/svgtopt/nvgdecoder/src/TLVIconCreator.cpp	Wed Sep 01 12:20:46 2010 +0100
@@ -71,45 +71,45 @@
         : 
         iNVGDataPtr((TUint8 *)&aWidth, 1)
     {
-    vgapi[EvgSeti]              = &CTLVIconCreator::DvgAddCommandL;        
-    vgapi[EvgSetf]              = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgSetParameteri]     = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgSetParameterf]     = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgSetParameterfv]    = &CTLVIconCreator::DvgSetParameterfvL;
-    vgapi[EvgSetColor]          = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgSetPaint]          = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgLoadMatrix]        = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgMultMatrix]        = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgLoadIdentity]      = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgScale]             = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgTranslate]         = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgAppendPathData]    = &CTLVIconCreator::DvgAppendPathDataL;
-    vgapi[EvgDrawPath]          = &CTLVIconCreator::DvgDrawPathL;
-    vgapi[EvgClearPath]         = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvguRect]             = &CTLVIconCreator::DvguRectL;
-    vgapi[EvguEllipse]          = &CTLVIconCreator::DvguEllipseL;
-    vgapi[EvguRoundRect]        = &CTLVIconCreator::DvguRoundRectL;
-    vgapi[EvguLine]             = &CTLVIconCreator::DvguLineL;
-    vgapi[EvgCreatePaint]       = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgSetiv]             = &CTLVIconCreator::DvgSetivL;                      
-    vgapi[EvgClear]             = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgSetfv]             = &CTLVIconCreator::DvgSetfvL;
-    vgapi[EvgRotate]            = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgCreatePath]        = &CTLVIconCreator::DvgCreatePathL;
-    vgapi[EvgCreateImage]       = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgGetPixels]         = &CTLVIconCreator::DvgGetPixelsL;
-    vgapi[EvgDrawImage]         = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgClearImage]        = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgImageSubData]      = &CTLVIconCreator::DvgImageSubDataL;
-    vgapi[EvgDestroyImage]      = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgDestroyPaint]      = &CTLVIconCreator::DvgDestroyPaintL;
-    vgapi[EvgDestroyPath]       = &CTLVIconCreator::DvgDestroyPathL;
+    vgapi[EvgSeti]              = &DvgAddCommandL;        
+    vgapi[EvgSetf]              = &DvgAddCommandL;
+    vgapi[EvgSetParameteri]     = &DvgAddCommandL;
+    vgapi[EvgSetParameterf]     = &DvgAddCommandL;
+    vgapi[EvgSetParameterfv]    = &DvgSetParameterfvL;
+    vgapi[EvgSetColor]          = &DvgAddCommandL;
+    vgapi[EvgSetPaint]          = &DvgAddCommandL;
+    vgapi[EvgLoadMatrix]        = &DvgAddCommandL;
+    vgapi[EvgMultMatrix]        = &DvgAddCommandL;
+    vgapi[EvgLoadIdentity]      = &DvgAddCommandL;
+    vgapi[EvgScale]             = &DvgAddCommandL;
+    vgapi[EvgTranslate]         = &DvgAddCommandL;
+    vgapi[EvgAppendPathData]    = &DvgAppendPathDataL;
+    vgapi[EvgDrawPath]          = &DvgDrawPathL;
+    vgapi[EvgClearPath]         = &DvgAddCommandL;
+    vgapi[EvguRect]             = &DvguRectL;
+    vgapi[EvguEllipse]          = &DvguEllipseL;
+    vgapi[EvguRoundRect]        = &DvguRoundRectL;
+    vgapi[EvguLine]             = &DvguLineL;
+    vgapi[EvgCreatePaint]       = &DvgAddCommandL;
+    vgapi[EvgSetiv]             = &DvgSetivL;                      
+    vgapi[EvgClear]             = &DvgAddCommandL;
+    vgapi[EvgSetfv]             = &DvgSetfvL;
+    vgapi[EvgRotate]            = &DvgAddCommandL;
+    vgapi[EvgCreatePath]        = &DvgCreatePathL;
+    vgapi[EvgCreateImage]       = &DvgAddCommandL;
+    vgapi[EvgGetPixels]         = &DvgGetPixelsL;
+    vgapi[EvgDrawImage]         = &DvgAddCommandL;
+    vgapi[EvgClearImage]        = &DvgAddCommandL;
+    vgapi[EvgImageSubData]      = &DvgImageSubDataL;
+    vgapi[EvgDestroyImage]      = &DvgAddCommandL;
+    vgapi[EvgDestroyPaint]      = &DvgDestroyPaintL;
+    vgapi[EvgDestroyPath]       = &DvgDestroyPathL;
     
-    vgapi[EvgPrepareToBindImage]= &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgBindImage]         = &CTLVIconCreator::DvgAddCommandL;
-    vgapi[EvgUnBindImage]       = &CTLVIconCreator::DvgAddCommandL;
+    vgapi[EvgPrepareToBindImage]= &DvgAddCommandL;
+    vgapi[EvgBindImage]         = &DvgAddCommandL;
+    vgapi[EvgUnBindImage]       = &DvgAddCommandL;
         
-    vgapi[EvgFlush]             = &CTLVIconCreator::DvgAddCommandL;
+    vgapi[EvgFlush]             = &DvgAddCommandL;
     
     iTargetWidth        = aWidth;
     iTargetHeight       = aHeight;