X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fsvg%2Fsvg-renderer.cpp;h=f48a5ad8751bc929114ac2dcef9c69f1e894ab09;hb=87b87263ddda2188a86217cca356932e36e4cd94;hp=2642c743286dedddeba1e1d9dec753fd79ef8235;hpb=726e147d14bb18ef193b102a36d8068b62db89ed;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp index 2642c74..f48a5ad 100644 --- a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp @@ -30,19 +30,14 @@ #include "svg-rasterize-thread.h" #include #include +#include #include namespace { -const char * const RENDERER_TYPE("rendererType"); -const char * const RENDERER_TYPE_VALUE("svg"); -const char * const IMAGE_URL_NAME("imageUrl"); const char * const UNITS("px"); -const std::string TEXTURE_UNIFORM_NAME = "sTexture"; -const std::string ATLAS_RECT_UNIFORM_NAME = "uAtlasRect"; - const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); } @@ -101,7 +96,7 @@ void SvgRenderer::DoSetOnStage( Actor& actor ) Geometry geometry = mFactoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY ); if( !geometry ) { - geometry = mFactoryCache.CreateQuadGeometry(); + geometry = Geometry::QUAD(); mFactoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry ); } TextureSet textureSet = TextureSet::New(); @@ -147,7 +142,7 @@ void SvgRenderer::SetSize( const Vector2& size ) void SvgRenderer::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( RENDERER_TYPE, RENDERER_TYPE_VALUE ); + map.Insert( RENDERER_TYPE, IMAGE_RENDERER ); if( !mImageUrl.empty() ) { map.Insert( IMAGE_URL_NAME, mImageUrl );