diff -r db5c883ad1c5 -r 1902ade171ab svgtopt/nvgdecoder/src/TLVRenderer.cpp
--- a/svgtopt/nvgdecoder/src/TLVRenderer.cpp	Tue Aug 31 16:06:58 2010 +0300
+++ b/svgtopt/nvgdecoder/src/TLVRenderer.cpp	Wed Sep 01 12:20:46 2010 +0100
@@ -51,43 +51,43 @@
 
 void CTLVRenderer::ConstructL(const TDesC8& aBuf)
     {
-    vgapi[EvgSeti]              = &CTLVRenderer::DvgSetiL;
-    vgapi[EvgSetf]              = &CTLVRenderer::DvgSetfL;
-    vgapi[EvgSetParameteri]     = &CTLVRenderer::DvgSetParameteriL;
-    vgapi[EvgSetParameterf]     = &CTLVRenderer::DvgSetParameterfL;
-    vgapi[EvgSetParameterfv]    = &CTLVRenderer::DvgSetParameterfvL;
-    vgapi[EvgSetColor]          = &CTLVRenderer::DvgSetColorL;
-    vgapi[EvgSetPaint]          = &CTLVRenderer::DvgSetPaintL;
-    vgapi[EvgLoadMatrix]        = &CTLVRenderer::DvgLoadMatrixL;
-    vgapi[EvgMultMatrix]        = &CTLVRenderer::DvgMultMatrixL;
-    vgapi[EvgLoadIdentity]      = &CTLVRenderer::DvgLoadIdentityL;
-    vgapi[EvgScale]             = &CTLVRenderer::DvgScaleL;
-    vgapi[EvgTranslate]         = &CTLVRenderer::DvgTranslateL;
-    vgapi[EvgAppendPathData]    = &CTLVRenderer::DvgAppendPathDataL;
-    vgapi[EvgDrawPath]          = &CTLVRenderer::DvgDrawPathL;
-    vgapi[EvgClearPath]         = &CTLVRenderer::DvgClearPathL;
-    vgapi[EvguRect]             = &CTLVRenderer::DvguRectL;
-    vgapi[EvguEllipse]          = &CTLVRenderer::DvguEllipseL;
-    vgapi[EvguRoundRect]        = &CTLVRenderer::DvguRoundRectL;
-    vgapi[EvguLine]             = &CTLVRenderer::DvguLineL;
-    vgapi[EvgCreatePaint]       = &CTLVRenderer::DvgCreatePaintL;
-    vgapi[EvgSetiv]             = &CTLVRenderer::DvgSetivL;
-    vgapi[EvgClear]             = &CTLVRenderer::DvgClearL;
-    vgapi[EvgSetfv]             = &CTLVRenderer::DvgSetfvL;
-    vgapi[EvgRotate]            = &CTLVRenderer::DvgRotateL;
-    vgapi[EvgCreatePath]        = &CTLVRenderer::DvgCreatePathL;
-    vgapi[EvgCreateImage]       = &CTLVRenderer::DvgCreateImageL;
-    vgapi[EvgGetPixels]         = &CTLVRenderer::DvgGetPixelsL;
-    vgapi[EvgDrawImage]         = &CTLVRenderer::DvgDrawImageL;
-    vgapi[EvgClearImage]        = &CTLVRenderer::DvgClearImageL;
-    vgapi[EvgImageSubData]      = &CTLVRenderer::DvgImageSubDataL;
-    vgapi[EvgDestroyImage]      = &CTLVRenderer::DvgDestroyImageL;
-    vgapi[EvgDestroyPaint]      = &CTLVRenderer::DvgDestroyPaintL;
-    vgapi[EvgDestroyPath]       = &CTLVRenderer::DvgDestroyPathL;
-    vgapi[EvgPrepareToBindImage]= &CTLVRenderer::DvgPrepareToBindImageL;
-    vgapi[EvgBindImage]         = &CTLVRenderer::DvgBindImageL;
-    vgapi[EvgUnBindImage]       = &CTLVRenderer::DvgUnBindImageL;
-    vgapi[EvgFlush]             = &CTLVRenderer::DvgFlushL;
+    vgapi[EvgSeti]              = &DvgSetiL;
+    vgapi[EvgSetf]              = &DvgSetfL;
+    vgapi[EvgSetParameteri]     = &DvgSetParameteriL;
+    vgapi[EvgSetParameterf]     = &DvgSetParameterfL;
+    vgapi[EvgSetParameterfv]    = &DvgSetParameterfvL;
+    vgapi[EvgSetColor]          = &DvgSetColorL;
+    vgapi[EvgSetPaint]          = &DvgSetPaintL;
+    vgapi[EvgLoadMatrix]        = &DvgLoadMatrixL;
+    vgapi[EvgMultMatrix]        = &DvgMultMatrixL;
+    vgapi[EvgLoadIdentity]      = &DvgLoadIdentityL;
+    vgapi[EvgScale]             = &DvgScaleL;
+    vgapi[EvgTranslate]         = &DvgTranslateL;
+    vgapi[EvgAppendPathData]    = &DvgAppendPathDataL;
+    vgapi[EvgDrawPath]          = &DvgDrawPathL;
+    vgapi[EvgClearPath]         = &DvgClearPathL;
+    vgapi[EvguRect]             = &DvguRectL;
+    vgapi[EvguEllipse]          = &DvguEllipseL;
+    vgapi[EvguRoundRect]        = &DvguRoundRectL;
+    vgapi[EvguLine]             = &DvguLineL;
+    vgapi[EvgCreatePaint]       = &DvgCreatePaintL;
+    vgapi[EvgSetiv]             = &DvgSetivL;
+    vgapi[EvgClear]             = &DvgClearL;
+    vgapi[EvgSetfv]             = &DvgSetfvL;
+    vgapi[EvgRotate]            = &DvgRotateL;
+    vgapi[EvgCreatePath]        = &DvgCreatePathL;
+    vgapi[EvgCreateImage]       = &DvgCreateImageL;
+    vgapi[EvgGetPixels]         = &DvgGetPixelsL;
+    vgapi[EvgDrawImage]         = &DvgDrawImageL;
+    vgapi[EvgClearImage]        = &DvgClearImageL;
+    vgapi[EvgImageSubData]      = &DvgImageSubDataL;
+    vgapi[EvgDestroyImage]      = &DvgDestroyImageL;
+    vgapi[EvgDestroyPaint]      = &DvgDestroyPaintL;
+    vgapi[EvgDestroyPath]       = &DvgDestroyPathL;
+    vgapi[EvgPrepareToBindImage]= &DvgPrepareToBindImageL;
+    vgapi[EvgBindImage]         = &DvgBindImageL;
+    vgapi[EvgUnBindImage]       = &DvgUnBindImageL;
+    vgapi[EvgFlush]             = &DvgFlushL;
 
     vgGetMatrix(iUserMatrix);