projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "atspi: remove undefined method" into devel/master
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
canvas-renderer
/
ubuntu
/
shape-impl-ubuntu.cpp
diff --git
a/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp
b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp
index
79a4871
..
6eae2d4
100644
(file)
--- a/
dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp
+++ b/
dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp
@@
-68,7
+68,6
@@
void ShapeUbuntu::Initialize()
Drawable::Create();
Drawable::SetObject(static_cast<void*>(mTvgShape));
-
#endif
}
@@
-255,7
+254,7
@@
Vector4 ShapeUbuntu::GetFillColor() const
}
return Vector4(r / 255.f, g / 255.f, b / 255.f, a / 255.f);
#else
- return Vector4
(0, 0, 0, 0)
;
+ return Vector4
::ZERO
;
#endif
}