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
Change conflict of some visual's Impl namespace
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-vector-image
/
animated-vector-image-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
index
a7d1f76
..
f4e3059
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
+++ b/
dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
@@
-99,7
+99,7
@@
AnimatedVectorImageVisual::AnimatedVectorImageVisual(VisualFactoryCache& factory
mRedrawInScalingDown(true)
{
// the rasterized image is with pre-multiplied alpha format
- mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
+ mImpl->mFlags |=
Visual::Base::
Impl::IS_PREMULTIPLIED_ALPHA;
if(!mVectorAnimationTask->Load(mUrl.GetUrl()))
{