X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=76d0ba7395a31808e8e5db6342e9c7212a927e91;hp=71fc2baa3a7727d9bbc35a4001e516bdb9ee6b36;hb=63f9b5207c2794cdc460d587723be89585872a51;hpb=754246a1c8812496ac70cdef21c122069ad21640 diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 71fc2ba..76d0ba7 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -226,17 +226,12 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) NinePatchImage npatchImage = NinePatchImage::DownCast( image ); if( npatchImage ) { - NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( npatchImage ); - + NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ), npatchImage ); return Toolkit::Visual::Base( visualPtr ); } else { - ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ) ); - Actor actor; - visualPtr->SetImage( actor, image ); - + ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), image ); return Toolkit::Visual::Base( visualPtr ); } } @@ -257,23 +252,17 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image UrlType::Type type = ResolveUrlType( url ); if( UrlType::N_PATCH == type ) { - NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( url ); - + NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ), url ); return Toolkit::Visual::Base( visualPtr ); } else if( UrlType::SVG == type ) { - SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( url, size ); + SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ), url, size ); return Toolkit::Visual::Base( visualPtr ); } else // Regular image { - ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() )); - Actor actor; - visualPtr->SetImage( actor, url, size ); - + ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), url, size ); return Toolkit::Visual::Base( visualPtr ); } }