X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fnpatch-data.cpp;h=e8a60424b64aa5bb6f7fd2994ca96ba7f761c4bd;hb=f9b3bd2fc9a97770affb1c5de7cd6a15995d90e6;hp=45cb99f5a4fa418d2bb5c7ad147dde423fec7da1;hpb=b8da2e53925b9abb9fa362560069e8ca4aa62f81;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/npatch-data.cpp b/dali-toolkit/internal/visuals/npatch-data.cpp index 45cb99f..e8a6042 100644 --- a/dali-toolkit/internal/visuals/npatch-data.cpp +++ b/dali-toolkit/internal/visuals/npatch-data.cpp @@ -85,12 +85,12 @@ uint32_t NPatchData::GetObserverCount() const return mObserverList.Count(); } -void NPatchData::SetUrl(const std::string url) +void NPatchData::SetUrl(const VisualUrl& url) { mUrl = url; } -std::string NPatchData::GetUrl() const +VisualUrl NPatchData::GetUrl() const { return mUrl; } @@ -224,11 +224,11 @@ void NPatchData::SetLoadedNPatchData(Devel::PixelBuffer& pixelBuffer, bool preMu mLoadingState = LoadingState::LOAD_COMPLETE; } -void NPatchData::LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied) +void NPatchData::LoadComplete(bool loadSuccess, TextureInformation textureInformation) { if(loadSuccess) { - SetLoadedNPatchData(pixelBuffer, preMultiplied); + SetLoadedNPatchData(textureInformation.pixelBuffer, textureInformation.preMultiplied); } else { @@ -238,7 +238,7 @@ void NPatchData::LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, for(uint32_t index = 0; index < mObserverList.Count(); ++index) { TextureUploadObserver* observer = mObserverList[index]; - observer->UploadComplete(loadSuccess, TextureManager::INVALID_TEXTURE_ID, mTextureSet, false, Vector4(), preMultiplied); + observer->LoadComplete(loadSuccess, TextureUploadObserver::TextureInformation(TextureUploadObserver::ReturnType::TEXTURE, TextureManager::INVALID_TEXTURE_ID, mTextureSet, false, Vector4(), textureInformation.preMultiplied)); } }