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
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) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
*
* 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
*/
//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/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
{
namespace Dali
{
@@
-130,9
+131,9
@@
public:
/**
* Generate the lookup texture with the gradient stops.
/**
* Generate the lookup texture with the gradient stops.
- * @return
t
he lookup texture which transit smoothly between stops.
+ * @return
T
he lookup texture which transit smoothly between stops.
*/
*/
-
BufferImag
e GenerateLookupTexture();
+
Dali::Textur
e GenerateLookupTexture();
private:
private:
@@
-176,4
+177,4
@@
protected:
} // namespace Dali
} // namespace Dali
-#endif /
* __DALI_TOOLKIT_INTERNAL_GRADIENT_RENDERER_H__ */
+#endif /
/ DALI_TOOLKIT_INTERNAL_GRADIENT_RENDERER_H