Fixed ImageRenderer::DoSetOffStage inccorrectly calling ControlRenderer::SetOffStage.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / renderers / image / image-renderer.cpp

diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
index cfe4e21..05d0c8e 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
+++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
@@ -36,7 +36,6 @@ namespace Internal
 namespace
 {
 
-
 const char * const IMAGE_URL_NAME("image-url");
 const char * const IMAGE_FITTING_MODE("image-fitting-mode");
 const char * const IMAGE_SAMPLING_MODE("image-sampling-mode");
@@ -91,24 +90,7 @@ ImageRenderer::~ImageRenderer()
 
 void ImageRenderer::Initialize( RendererFactoryCache& factoryCache, const Property::Map& propertyMap )
 {
-  mImpl->mGeometry = factoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY );
-  if( !(mImpl->mGeometry) )
-  {
-    mImpl->mGeometry =  factoryCache.CreateQuadGeometry();
-    factoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, mImpl->mGeometry );
-  }
-
-  mImpl->mShader = factoryCache.GetShader( RendererFactoryCache::IMAGE_SHADER );
-  if( !mImpl->mShader )
-  {
-    mImpl->mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
-    factoryCache.SaveShader( RendererFactoryCache::IMAGE_SHADER, mImpl->mShader );
-  }
-
-  mDesiredSize = ImageDimensions();
-  mFittingMode = FittingMode::DEFAULT;
-  mSamplingMode = SamplingMode::DEFAULT;
-  mImageUrl.clear();
+  Initialize(factoryCache);
 
   Property::Value* imageURLValue = propertyMap.Find( IMAGE_URL_NAME );
   if( imageURLValue )
@@ -247,8 +229,28 @@ void ImageRenderer::DoSetOffStage( Actor& actor )
   {
     mImage.Reset();
   }
+}
+
+void ImageRenderer::Initialize( RendererFactoryCache& factoryCache )
+{
+  mImpl->mGeometry = factoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY );
+  if( !(mImpl->mGeometry) )
+  {
+    mImpl->mGeometry =  factoryCache.CreateQuadGeometry();
+    factoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, mImpl->mGeometry );
+  }
 
-  ControlRenderer::SetOffStage( actor );
+  mImpl->mShader = factoryCache.GetShader( RendererFactoryCache::IMAGE_SHADER );
+  if( !mImpl->mShader )
+  {
+    mImpl->mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
+    factoryCache.SaveShader( RendererFactoryCache::IMAGE_SHADER, mImpl->mShader );
+  }
+
+  mDesiredSize = ImageDimensions();
+  mFittingMode = FittingMode::DEFAULT;
+  mSamplingMode = SamplingMode::DEFAULT;
+  mImageUrl.clear();
 }
 
 void ImageRenderer::SetImage( const std::string& imageUrl )
@@ -294,6 +296,11 @@ void ImageRenderer::SetImage( Image image )
   }
 }
 
+Image ImageRenderer::GetImage() const
+{
+  return mImage;
+}
+
 void ImageRenderer::ApplyImageToSampler()
 {
   if( mImage )