Merge "Fix various Klocwork errors" into devel/master

[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 b07a17f..27c6af5 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
+++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
@@ -436,6 +436,7 @@ void ImageRenderer::InitializeRenderer( const std::string& imageUrl )
         else // big image, atlasing is not applied
         {
           mImpl->mRenderer = CreateRenderer();
+          SetTextureRectUniform(FULL_TEXTURE_RECT);
 
           ResourceImage image = Dali::ResourceImage::New( imageUrl );
           image.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded );
@@ -743,10 +744,10 @@ void ImageRenderer::OnImageLoaded( ResourceImage image )
 {
   if( image.GetLoadingState() == Dali::ResourceLoadingFailed )
   {
-    Image image = RendererFactory::GetBrokenRendererImage();
+    Image brokenImage = RendererFactory::GetBrokenRendererImage();
     if( mImpl->mRenderer )
     {
-      ApplyImageToSampler( image );
+      ApplyImageToSampler( brokenImage );
     }
   }
 }