Merge "Fix various Klocwork errors" into devel/master
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Wed, 11 Nov 2015 13:46:52 +0000 (05:46 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 11 Nov 2015 13:46:52 +0000 (05:46 -0800)
1  2 
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 );
      }
    }
  }