projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ImageView issue
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
npatch
/
npatch-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
index
6ae1d8e
..
e1b162c
100755
(executable)
--- a/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
+++ b/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
@@
-291,7
+291,7
@@
void NPatchVisual::LoadImages()
{
if( NPatchLoader::UNINITIALIZED_ID == mId && mImageUrl.IsLocalResource() )
{
{
if( NPatchLoader::UNINITIALIZED_ID == mId && mImageUrl.IsLocalResource() )
{
- bool preMultiplyOnLoad =
mFactoryCache.GetPreMultiplyOnLoa
d() && !mImpl->mCustomShader ? true : false;
+ bool preMultiplyOnLoad =
IsPreMultipliedAlphaEnable
d() && !mImpl->mCustomShader ? true : false;
mId = mLoader.Load( mImageUrl.GetUrl(), mBorder, preMultiplyOnLoad );
mId = mLoader.Load( mImageUrl.GetUrl(), mBorder, preMultiplyOnLoad );
@@
-434,6
+434,7
@@
NPatchVisual::NPatchVisual( VisualFactoryCache& factoryCache )
mBorder(),
mAuxiliaryImageAlpha( 0.0f )
{
mBorder(),
mAuxiliaryImageAlpha( 0.0f )
{
+ EnablePreMultipliedAlpha( mFactoryCache.GetPreMultiplyOnLoad() );
}
NPatchVisual::~NPatchVisual()
}
NPatchVisual::~NPatchVisual()