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
Add Text input style changed signal.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-bitmap-loader.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.h
index
6b2c94a
..
acdc94a
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.h
@@
-1,5
+1,5
@@
-#ifndef
__DALI_TOOLKIT_BITMAP_LOADER_H__
-#define
__DALI_TOOLKIT_BITMAP_LOADER_H__
+#ifndef
DALI_TOOLKIT_BITMAP_LOADER_H
+#define
DALI_TOOLKIT_BITMAP_LOADER_H
/*
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
/*
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
@@
-16,14
+16,14
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#define
__DALI_BITMAP_LOADER_H__
+#define
DALI_BITMAP_LOADER_H
#include <string>
#include <dali/public-api/common/dali-common.h>
#include <string>
#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/images/pixel.h>
#include <dali/public-api/images/image-operations.h>
#include <dali/public-api/images/image-operations.h>
+#include <dali/public-api/images/pixel.h>
+#include <dali/public-api/images/pixel-data.h>
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/object/base-handle.h>
-#include <dali/devel-api/images/pixel-data.h>
namespace Dali
{
namespace Dali
{
@@
-63,4
+63,4
@@
public: // Not intended for application developers
} // Dali
} // Dali
-#endif /
* __DALI_TOOLKIT_BITMAP_LOADER_H__ */
+#endif /
/ DALI_TOOLKIT_BITMAP_LOADER_H