X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fanimation%2Falpha-function.h;h=7444ec7441918fa2e5c0938c8cb28820f0db55f1;hb=4d75040ab200bd306ec5a48f2a617480062eef4c;hp=97ec864825acbc736c649bc1d0a9eea0cd49d559;hpb=4805f154c85adcf71716d9aa6746b6ba1b44a19e;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/animation/alpha-function.h b/dali/public-api/animation/alpha-function.h
old mode 100644
new mode 100755
index 97ec864..7444ec7
--- a/dali/public-api/animation/alpha-function.h
+++ b/dali/public-api/animation/alpha-function.h
@@ -2,7 +2,7 @@
 #define __DALI_ALPHA_FUNCTION_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,12 +42,12 @@ typedef float (*AlphaFunctionPrototype)(float progress); ///< Prototype of an al
    * the animation before computing the final animation value.
    * @SINCE_1_0.0
    */
-class DALI_IMPORT_API AlphaFunction
+class DALI_CORE_API AlphaFunction
 {
 public:
 
   /**
-   * @brief Built-in alpha functions
+   * @brief Enumeration for built-in alpha functions.
    * @SINCE_1_0.0
    */
   enum BuiltinFunction
@@ -75,7 +75,7 @@ public:
   };
 
   /**
-   * @brief All possible functioning modes for the alpha function
+   * @brief Enumeration for all possible functioning modes for the alpha function.
    * @SINCE_1_0.0
    */
   enum Mode
@@ -87,7 +87,7 @@ public:
 
   /**
    * @brief Default constructor.
-   * Creates an alpha function object with the default built-in alpha function
+   * Creates an alpha function object with the default built-in alpha function.
    * @SINCE_1_0.0
    * @return The alpha function
    */
@@ -96,7 +96,7 @@ public:
   /**
    * @brief Constructor.
    * Creates an alpha function object with the built-in alpha function passed as a parameter
-   * to the constructor
+   * to the constructor.
    * @SINCE_1_0.0
    * @param[in] function One of the built-in alpha functions
    * @return The alpha function
@@ -105,8 +105,8 @@ public:
 
   /**
    * @brief Constructor.
-   * Creates an alpha function object using a pointer to an alpha function passed as a paramter
-   * to the constructor
+   * Creates an alpha function object using a pointer to an alpha function passed as a parameter
+   * to the constructor.
    * @SINCE_1_0.0
    * @param[in] function A pointer to an alpha function
    * @return The alpha function
@@ -128,22 +128,22 @@ public:
   AlphaFunction( const Dali::Vector2& controlPoint0, const Dali::Vector2& controlPoint1 );
 
   /**
-   * @brief Return the control points of the alpha function
+   * @brief Returns the control points of the alpha function.
    * @SINCE_1_0.0
-   * @return Vector4 containing the two control points of the curve.
+   * @return Vector4 containing the two control points of the curve
    * (xy for the first point and zw for the second)
    */
   Vector4 GetBezierControlPoints() const;
 
   /**
-   * @brief Returns the pointer to the custom function
+   * @brief Returns the pointer to the custom function.
    * @SINCE_1_0.0
-   * @return A pointer to a custom alpha function or 0 if not defined
+   * @return A pointer to a custom alpha function, or @c 0 if not defined
    */
   AlphaFunctionPrototype GetCustomFunction() const;
 
   /**
-   * @brief Returns the built-in function used by the alpha function
+   * @brief Returns the built-in function used by the alpha function.
    * @SINCE_1_0.0
    * @return One of the built-in alpha functions. In case no built-in function
    * has been specified, it will return AlphaFunction::DEFAULT
@@ -161,8 +161,8 @@ private:
 
   Vector4                 mBezierControlPoints;   //< Control points for the bezier alpha function
   AlphaFunctionPrototype  mCustom;                //< Pointer to an alpha function
-  BuiltinFunction         mBuiltin : Log<COUNT>::value+1; //< Enum indicating the built-in alpha function
-  Mode                    mMode    : 2;                   //< Enum indicating the functioning mode of the AlphaFunction
+  BuiltinFunction         mBuiltin : Log<COUNT>::value+2; //< Enum indicating the built-in alpha function
+  Mode                    mMode    : 3;                   //< Enum indicating the functioning mode of the AlphaFunction
 };
 
 /**