# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272378849 -10800 # Node ID b52e29b428068de1abc648088d770a52fc922bec # Parent d240fe32a15ca73dd62ef28778ddea785d6235c4 Revision: 201016 Kit: 201017 diff -r d240fe32a15c -r b52e29b42806 svgtopt/SVG/SVGEngine/inc/SVGContentHandler.h --- a/svgtopt/SVG/SVGEngine/inc/SVGContentHandler.h Wed Apr 14 16:53:18 2010 +0300 +++ b/svgtopt/SVG/SVGEngine/inc/SVGContentHandler.h Tue Apr 27 17:34:09 2010 +0300 @@ -28,8 +28,8 @@ #include "SVGAttributeVerifier.h" #include "SVGErrorImpl.h" -#include "MXMLAttributes.h" -#include "MXMLContentHandler.h" +#include "mxmlattributes.h" +#include "mxmlcontenthandler.h" #include "SVGSchemaData.h" #include "SVGDocumentImpl.h" diff -r d240fe32a15c -r b52e29b42806 svgtopt/SVG/SVGEngine/src/SVGContentHandler.cpp --- a/svgtopt/SVG/SVGEngine/src/SVGContentHandler.cpp Wed Apr 14 16:53:18 2010 +0300 +++ b/svgtopt/SVG/SVGEngine/src/SVGContentHandler.cpp Tue Apr 27 17:34:09 2010 +0300 @@ -26,7 +26,7 @@ #include "SVGUseElementImpl.h" #include "SVGAnimationElementImpl.h" -#include "RXMLReader.h" +#include "rxmlreader.h" #include "SVGPaintCssValueImpl.h" #include "SVGPathElementImpl.h" diff -r d240fe32a15c -r b52e29b42806 svgtopt/SVGTPlugin/inc/Svgtplugin.h --- a/svgtopt/SVGTPlugin/inc/Svgtplugin.h Wed Apr 14 16:53:18 2010 +0300 +++ b/svgtopt/SVGTPlugin/inc/Svgtplugin.h Tue Apr 27 17:34:09 2010 +0300 @@ -33,9 +33,9 @@ #include "SVGListener.h" #include -#include +#include -#include +#include #include "MRepositoryVolumeObserver.h" diff -r d240fe32a15c -r b52e29b42806 svgtopt/SVGTPlugin/src/RepositoryVolumeListener.cpp --- a/svgtopt/SVGTPlugin/src/RepositoryVolumeListener.cpp Wed Apr 14 16:53:18 2010 +0300 +++ b/svgtopt/SVGTPlugin/src/RepositoryVolumeListener.cpp Tue Apr 27 17:34:09 2010 +0300 @@ -23,7 +23,7 @@ #include "RepositoryVolumeListener.h" //#include //include this file when KSDUidMediaVolumeControl and KMediaVolume will be needed //#include "epocdebug.h" -#include +#include #include "MRepositoryVolumeObserver.h" CRepositoryVolumeListener* CRepositoryVolumeListener::NewL(MRepositoryVolumeObserver* aObserver) diff -r d240fe32a15c -r b52e29b42806 svgtopt/SVGTPlugin/src/Svgtpluginmain.cpp --- a/svgtopt/SVGTPlugin/src/Svgtpluginmain.cpp Wed Apr 14 16:53:18 2010 +0300 +++ b/svgtopt/SVGTPlugin/src/Svgtpluginmain.cpp Tue Apr 27 17:34:09 2010 +0300 @@ -20,7 +20,7 @@ #include -#include +#include /***************************************************/ /**********ECOM STYLE SVGT PLUGIN ENTRY POINTS******/ /***************************************************/ diff -r d240fe32a15c -r b52e29b42806 svgtopt/SVGTPlugin/src/VolumeKeyListener.cpp --- a/svgtopt/SVGTPlugin/src/VolumeKeyListener.cpp Wed Apr 14 16:53:18 2010 +0300 +++ b/svgtopt/SVGTPlugin/src/VolumeKeyListener.cpp Tue Apr 27 17:34:09 2010 +0300 @@ -19,7 +19,7 @@ #include #include -#include +#include #include "VolumeKeyListener.h" #include "MRepositoryVolumeObserver.h" diff -r d240fe32a15c -r b52e29b42806 svgtopt/gfx2d/src/GfxGc/Gfx2dGcOpenVG.cpp --- a/svgtopt/gfx2d/src/GfxGc/Gfx2dGcOpenVG.cpp Wed Apr 14 16:53:18 2010 +0300 +++ b/svgtopt/gfx2d/src/GfxGc/Gfx2dGcOpenVG.cpp Tue Apr 27 17:34:09 2010 +0300 @@ -2467,7 +2467,8 @@ buffer = new (ELeave) TUint32[ iColorBufferSize.iWidth * iColorBufferSize.iHeight ] ; iVgSurface->PrepareToBindClientBuffer(); - VGImage vgImage = CreateVGImage( buffer, iColorBufferSize, EColor16MU, ETrue ); + //VGImage vgImage = CreateVGImage( buffer, iColorBufferSize, EColor16MU, ETrue ); + VGImage vgImage = iVgRenderer->vgCreateImage( VG_sRGBA_8888_PRE,iColorBufferSize.iWidth, iColorBufferSize.iHeight, VG_IMAGE_QUALITY_FASTER ); //Clear VGImage VGfloat color[4] = { 1.0f, 1.0f, 1.0f, 0.0f }; iVgRenderer->vgSetfv(VG_CLEAR_COLOR, 4, color);