X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fimage%2Fimage-renderer.cpp;h=3f27923a295c17216a1cc21a0a05a295fbf5afb7;hp=434eecf000fd238b85dafa23c94df244bfa4c27c;hb=05d9f7a25bd9f4320a0e1fece8ec0ede819afe7d;hpb=49f9e8d43442bd3539a6a358b9147b95748f8140 diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp index 434eecf..3f27923 100644 --- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -465,7 +466,7 @@ TextureSet ImageRenderer::CreateTextureSet( Vector4& textureRect, const std::str { // use broken image textureSet = TextureSet::New(); - textureSet.SetImage( 0u, RendererFactory::GetBrokenRendererImage() ); + TextureSetImage( textureSet, 0u, RendererFactory::GetBrokenRendererImage() ); } else { @@ -475,7 +476,7 @@ TextureSet ImageRenderer::CreateTextureSet( Vector4& textureRect, const std::str Atlas image = Atlas::New( mPixels.GetWidth(), mPixels.GetHeight(), mPixels.GetPixelFormat() ); image.Upload( mPixels, 0, 0 ); textureSet = TextureSet::New(); - textureSet.SetImage( 0u, image ); + TextureSetImage( textureSet, 0u, image ); } } } @@ -487,7 +488,7 @@ TextureSet ImageRenderer::CreateTextureSet( Vector4& textureRect, const std::str ResourceImage resourceImage = Dali::ResourceImage::New( url, mDesiredSize, mFittingMode, mSamplingMode ); resourceImage.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); textureSet = TextureSet::New(); - textureSet.SetImage( 0u, resourceImage ); + TextureSetImage( textureSet, 0u, resourceImage ); } } @@ -826,7 +827,7 @@ void ImageRenderer::ApplyImageToSampler( const Image& image ) textureSet = TextureSet::New(); mImpl->mRenderer.SetTextures( textureSet ); } - textureSet.SetImage( 0u, image ); + TextureSetImage( textureSet, 0u, image ); } }