From 9702d63025ad15fce17316818cd0bb183f86f443 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Thu, 27 Feb 2020 15:27:57 +0900 Subject: [PATCH] Disable premultiplied alpha when the Image is used Change-Id: I499a860235c6efc741453701fe0daefb500441eb --- automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp | 2 +- dali-toolkit/internal/visuals/image/image-visual.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 21c00de..bd74fdb 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -354,7 +354,7 @@ int UtcDaliImageViewSetGetProperty03(void) Property::Value value = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); bool enable; DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( enable ); + DALI_TEST_CHECK( !enable ); // pre-multiplied alpha blending imageView.SetProperty( Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA, true ); diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index e79edd7..c553ced 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -203,7 +203,8 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFac mLoading( false ), mOrientationCorrection( true ) { - EnablePreMultipliedAlpha( mFactoryCache.GetPreMultiplyOnLoad() ); + // PreMultiplied alpha should be disabled when the Image is used. + EnablePreMultipliedAlpha( false ); } ImageVisual::~ImageVisual() -- 2.7.4