From: Seungho, Baek Date: Tue, 17 Sep 2019 04:30:13 +0000 (+0900) Subject: Revert "[Tizen] Use original PixelBufferLoadedSignalType signal parameter." X-Git-Tag: submit/tizen/20190917.064531~7 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a97632fe7f09b7e323191f1234f9c595e370ad42;ds=sidebyside Revert "[Tizen] Use original PixelBufferLoadedSignalType signal parameter." This reverts commit d48fd64faf9107d244b657518d642a6241579eb2. --- diff --git a/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h b/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h index 681c00b..fb2ade1 100644 --- a/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h +++ b/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h @@ -28,7 +28,7 @@ namespace Toolkit namespace DevelAsyncImageLoader { -typedef Signal< void ( uint32_t, Devel::PixelBuffer ) > PixelBufferLoadedSignalType; +typedef Signal< void ( uint32_t, Devel::PixelBuffer, bool ) > PixelBufferLoadedSignalType; /** * @brief Whether to multiply alpha into color channels on load diff --git a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp index de0ee3f..dd98ae3 100644 --- a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp +++ b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp @@ -107,7 +107,7 @@ void AsyncImageLoader::ProcessLoadedImage() { if( mPixelBufferLoadedSignal.GetConnectionCount() > 0 ) { - mPixelBufferLoadedSignal.Emit( next->id, next->pixelBuffer ); + mPixelBufferLoadedSignal.Emit( next->id, next->pixelBuffer, next->isMaskTask ); } else if( mLoadedSignal.GetConnectionCount() > 0 ) { diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.cpp b/dali-toolkit/internal/visuals/texture-manager-impl.cpp index 64a1977..e55fd90 100644 --- a/dali-toolkit/internal/visuals/texture-manager-impl.cpp +++ b/dali-toolkit/internal/visuals/texture-manager-impl.cpp @@ -750,7 +750,7 @@ void TextureManager::ObserveTexture( TextureInfo& textureInfo, } void TextureManager::AsyncLoadComplete( AsyncLoadingInfoContainerType& loadingContainer, uint32_t id, - Devel::PixelBuffer pixelBuffer ) + Devel::PixelBuffer pixelBuffer, bool isMaskTask ) { DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "TextureManager::AsyncLoadComplete( id:%d )\n", id ); @@ -771,7 +771,7 @@ void TextureManager::AsyncLoadComplete( AsyncLoadingInfoContainerType& loadingCo if( textureInfo.loadState != CANCELLED ) { - if( textureInfo.maskApplied ) + if( isMaskTask ) { textureInfo.loadState = MASK_APPLIED; } @@ -890,7 +890,6 @@ void TextureManager::ApplyMask( TextureInfo& textureInfo, TextureId maskTextureI textureInfo.url.GetUrl().c_str(), textureInfo.loadSynchronously?"T":"F" ); textureInfo.loadState = MASK_APPLYING; - textureInfo.maskApplied = true; auto& loadersContainer = textureInfo.url.IsLocalResource() ? mAsyncLocalLoaders : mAsyncRemoteLoaders; auto loadingHelperIt = loadersContainer.GetNext(); DALI_ASSERT_ALWAYS(loadingHelperIt != loadersContainer.End()); @@ -1183,9 +1182,10 @@ TextureManager::AsyncLoadingHelper::AsyncLoadingHelper( } void TextureManager::AsyncLoadingHelper::AsyncLoadComplete(uint32_t id, - Devel::PixelBuffer pixelBuffer ) + Devel::PixelBuffer pixelBuffer, + bool isMaskTask) { - mTextureManager.AsyncLoadComplete( mLoadingInfoContainer, id, pixelBuffer ); + mTextureManager.AsyncLoadComplete(mLoadingInfoContainer, id, pixelBuffer, isMaskTask); } void TextureManager::SetBrokenImageUrl(const std::string& brokenImageUrl) diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.h b/dali-toolkit/internal/visuals/texture-manager-impl.h index 4f35040..d2c55fd 100755 --- a/dali-toolkit/internal/visuals/texture-manager-impl.h +++ b/dali-toolkit/internal/visuals/texture-manager-impl.h @@ -464,8 +464,7 @@ private: cropToMask( cropToMask ), orientationCorrection( true ), preMultiplyOnLoad( preMultiplyOnLoad ), - preMultiplied( false ), - maskApplied( false ) + preMultiplied( false ) { } @@ -498,7 +497,6 @@ private: bool orientationCorrection:1; ///< true if the image should be rotated to match exif orientation data bool preMultiplyOnLoad:1; ///< true if the image's color should be multiplied by it's alpha bool preMultiplied:1; ///< true if the image's color was multiplied by it's alpha - bool maskApplied:1; ///< true if the image's mask is applied }; /** @@ -589,8 +587,9 @@ private: * @param[in] container The Async loading container * @param[in] id This is the async image loaders Id * @param[in] pixelBuffer The loaded image data + * @param[in] isMaskTask whether this task is for mask or not */ - void AsyncLoadComplete( AsyncLoadingInfoContainerType& container, uint32_t id, Devel::PixelBuffer pixelBuffer ); + void AsyncLoadComplete( AsyncLoadingInfoContainerType& container, uint32_t id, Devel::PixelBuffer pixelBuffer, bool isMaskTask ); /** * @brief Performs Post-Load steps including atlasing. @@ -749,16 +748,17 @@ private: /** * @brief Main constructor that used by all other constructors */ - AsyncLoadingHelper( Toolkit::AsyncImageLoader loader, - TextureManager& textureManager, - AsyncLoadingInfoContainerType&& loadingInfoContainer ); + AsyncLoadingHelper(Toolkit::AsyncImageLoader loader, + TextureManager& textureManager, + AsyncLoadingInfoContainerType&& loadingInfoContainer); /** * @brief Callback to be called when texture loading is complete, it passes the pixel buffer on to texture manager. * @param[in] id Loader id * @param[in] pixelBuffer Image data + * @param[in] isMaskTask whether this task is for mask or not */ - void AsyncLoadComplete( uint32_t id, Devel::PixelBuffer pixelBuffer ); + void AsyncLoadComplete(uint32_t id, Devel::PixelBuffer pixelBuffer, bool isMaskTask); private: Toolkit::AsyncImageLoader mLoader;