X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-bitmap-loader.h;h=acdc94a01aaa421bf193097d09dd30ad14ecf64d;hp=141903bad82c965782e48e3ee8134bad8d9f8c1d;hb=7bc9bb47cb9c552982e9144b202861190eeadc96;hpb=d2cc1da3aea2842d9de3e2f5288d768be711fa5b

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 141903b..acdc94a 100644
--- 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.
  *
@@ -16,14 +16,14 @@
  * 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 <dali/public-api/images/pixel.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/devel-api/images/pixel-data.h>
 
 namespace Dali
 {
@@ -50,7 +50,7 @@ public:
   void Load();
   bool IsLoaded();
   std::string GetUrl() const;
-  PixelDataPtr GetPixelData() const;
+  PixelData GetPixelData() const;
 
   void WaitForLoading();
   static BitmapLoader GetLatestCreated(); // return the latest created BitmapLoader
@@ -63,4 +63,4 @@ public: // Not intended for application developers
 
 } // Dali
 
-#endif /* __DALI_TOOLKIT_BITMAP_LOADER_H__ */
+#endif // DALI_TOOLKIT_BITMAP_LOADER_H