From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Wed, 11 Nov 2015 13:46:52 +0000 (-0800)
Subject: Merge "Fix various Klocwork errors" into devel/master
X-Git-Tag: dali_1.1.10~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=af4073fd7a4f946e26110ecd608ef8e748c078aa;hp=-c

Merge "Fix various Klocwork errors" into devel/master
---

af4073fd7a4f946e26110ecd608ef8e748c078aa
diff --combined dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
index a9af3ec,ca833f0..27c6af5
--- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
+++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
@@@ -436,7 -436,6 +436,7 @@@ void ImageRenderer::InitializeRenderer
          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 );
@@@ -744,10 -743,10 +744,10 @@@ void ImageRenderer::OnImageLoaded( Reso
  {
    if( image.GetLoadingState() == Dali::ResourceLoadingFailed )
    {
-     Image image = RendererFactory::GetBrokenRendererImage();
+     Image brokenImage = RendererFactory::GetBrokenRendererImage();
      if( mImpl->mRenderer )
      {
-       ApplyImageToSampler( image );
+       ApplyImageToSampler( brokenImage );
      }
    }
  }