Mofidy codes for Dali Windows backend

[platform/core/uifw/dali-core.git] / dali / public-api / animation / alpha-function.cpp

diff --git a/dali/public-api/animation/alpha-function.cpp b/dali/public-api/animation/alpha-function.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 7ce7db5..21133dc
--- a/dali/public-api/animation/alpha-function.cpp
+++ b/dali/public-api/animation/alpha-function.cpp
@@ -23,6 +23,14 @@
 namespace Dali
 {
 
+namespace
+{
+constexpr unsigned int BitMaskOfN( unsigned int bits )
+{
+  return ( 1 << bits ) - 1;
+}
+} // unnamed namespace
+
 AlphaFunction::AlphaFunction()
 :mBezierControlPoints(Vector4::ZERO),
  mCustom(0),
@@ -65,12 +73,12 @@ AlphaFunctionPrototype AlphaFunction::GetCustomFunction() const
 
 AlphaFunction::BuiltinFunction AlphaFunction::GetBuiltinFunction() const
 {
-  return mBuiltin;
+  return static_cast<AlphaFunction::BuiltinFunction>( mBuiltin & BitMaskOfN( Log<COUNT>::value + 1 ) );
 }
 
 AlphaFunction::Mode AlphaFunction::GetMode() const
 {
-  return mMode;
+  return static_cast<AlphaFunction::Mode>( mMode & BitMaskOfN( 2 ) );
 }
 
 } // namespace Dali