Merge "Fix for the cursor position with the arabic script." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / renderers / gradient / gradient.h

diff --git a/dali-toolkit/internal/controls/renderers/gradient/gradient.h b/dali-toolkit/internal/controls/renderers/gradient/gradient.h
index 36e6ee4..f08af99 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/gradient/gradient.h
+++ b/dali-toolkit/internal/controls/renderers/gradient/gradient.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_GRADIENT_H__
-#define __DALI_TOOLKIT_INTERNAL_GRADIENT_H__
+#ifndef DALI_TOOLKIT_INTERNAL_GRADIENT_H
+#define DALI_TOOLKIT_INTERNAL_GRADIENT_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -19,10 +19,11 @@
  */
 
 //EXTERNAL INCLUDES
-#include <dali/public-api/math/matrix3.h>
-#include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/images/buffer-image.h>
+#include <dali/public-api/math/matrix3.h>
+#include <dali/public-api/object/ref-object.h>
+#include <dali/public-api/rendering/texture.h>
 
 namespace Dali
 {
@@ -130,9 +131,9 @@ public:
 
   /**
    * Generate the lookup texture with the gradient stops.
-   * @return the lookup texture which transit smoothly between stops.
+   * @return The lookup texture which transit smoothly between stops.
    */
-  BufferImage GenerateLookupTexture();
+  Dali::Texture GenerateLookupTexture();
 
 private:
 
@@ -176,4 +177,4 @@ protected:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_GRADIENT_RENDERER_H__ */
+#endif // DALI_TOOLKIT_INTERNAL_GRADIENT_RENDERER_H