X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage-atlas-manager.cpp;h=a8de5a84e4ac940974393fe3ce9753c3b3a8d732;hb=1de9cb6e0d9afd29e17819a6ed4b13f010faf8c3;hp=1f634e1d201e5f369183d4f79af3e94a41a1a609;hpb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/image-atlas-manager.cpp b/dali-toolkit/internal/visuals/image-atlas-manager.cpp index 1f634e1..a8de5a8 100644 --- a/dali-toolkit/internal/visuals/image-atlas-manager.cpp +++ b/dali-toolkit/internal/visuals/image-atlas-manager.cpp @@ -21,6 +21,9 @@ // EXTERNAL HEADER #include +// INTERNAL HEADERS +#include + namespace Dali { namespace Toolkit @@ -44,7 +47,7 @@ ImageAtlasManager::~ImageAtlasManager() } TextureSet ImageAtlasManager::Add(Vector4& textureRect, - const std::string& url, + const VisualUrl& url, ImageDimensions& size, FittingMode::Type fittingMode, bool orientationCorrection, @@ -54,7 +57,7 @@ TextureSet ImageAtlasManager::Add(Vector4& textureRect, ImageDimensions zero; if(size == zero) { - dimensions = Dali::GetClosestImageSize(url); + dimensions = Dali::GetClosestImageSize(url.GetUrl()); } // big image, atlasing is not applied @@ -67,7 +70,7 @@ TextureSet ImageAtlasManager::Add(Vector4& textureRect, unsigned int i = 0; for(AtlasContainer::iterator iter = mAtlasList.begin(); iter != mAtlasList.end(); ++iter) { - if((*iter).Upload(textureRect, url, size, fittingMode, orientationCorrection, atlasUploadObserver)) + if(GetImplementation(*iter).Upload(textureRect, url, size, fittingMode, orientationCorrection, atlasUploadObserver)) { return mTextureSetList[i]; } @@ -75,7 +78,7 @@ TextureSet ImageAtlasManager::Add(Vector4& textureRect, } CreateNewAtlas(); - mAtlasList.back().Upload(textureRect, url, size, fittingMode, orientationCorrection, atlasUploadObserver); + GetImplementation(mAtlasList.back()).Upload(textureRect, url, size, fittingMode, orientationCorrection, atlasUploadObserver); return mTextureSetList.back(); }