X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage-atlas-manager.cpp;h=fe01571da7421e1de521d51abe274d4c8cad7e47;hp=66897e4940fabb0be93a74583823d5f2965ec977;hb=refs%2Fchanges%2F62%2F88562%2F16;hpb=7d13f3aa3f4ccf7c9c1c72ef182fd311663c6cd6 diff --git a/dali-toolkit/internal/visuals/image-atlas-manager.cpp b/dali-toolkit/internal/visuals/image-atlas-manager.cpp index 66897e4..fe01571 100644 --- a/dali-toolkit/internal/visuals/image-atlas-manager.cpp +++ b/dali-toolkit/internal/visuals/image-atlas-manager.cpp @@ -51,7 +51,8 @@ TextureSet ImageAtlasManager::Add( Vector4& textureRect, const std::string& url, ImageDimensions size, FittingMode::Type fittingMode, - bool orientationCorrection ) + bool orientationCorrection, + AtlasUploadObserver* atlasUploadObserver ) { ImageDimensions dimensions = size; ImageDimensions zero; @@ -71,7 +72,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 ) ) + if( (*iter).Upload( textureRect, url, size, fittingMode, orientationCorrection, atlasUploadObserver ) ) { return mTextureSetList[i]; } @@ -79,12 +80,12 @@ TextureSet ImageAtlasManager::Add( Vector4& textureRect, } CreateNewAtlas(); - mAtlasList.back().Upload( textureRect, url, size, fittingMode, orientationCorrection ); + mAtlasList.back().Upload( textureRect, url, size, fittingMode, orientationCorrection, atlasUploadObserver ); return mTextureSetList.back(); } TextureSet ImageAtlasManager::Add( Vector4& textureRect, - PixelData pixelData ) + PixelData pixelData ) { // big buffer, atlasing is not applied