Merge "Changed styles to use case-insensitive matching" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / image-atlas / image-atlas.h

diff --git a/dali-toolkit/devel-api/image-atlas/image-atlas.h b/dali-toolkit/devel-api/image-atlas/image-atlas.h
index 395615d..2bc97ae 100644 (file)
--- a/dali-toolkit/devel-api/image-atlas/image-atlas.h
+++ b/dali-toolkit/devel-api/image-atlas/image-atlas.h
@@ -1,7 +1,7 @@
-#ifndef __DALI_TOOLKIT_IMAGE_ATLAS_H__
-#define __DALI_TOOLKIT_IMAGE_ATLAS_H__
+#ifndef DALI_TOOLKIT_IMAGE_ATLAS_H
+#define DALI_TOOLKIT_IMAGE_ATLAS_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.
@@ -24,7 +24,7 @@
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/images/image-operations.h>
 #include <dali/public-api/images/pixel.h>
-#include <dali/devel-api/images/pixel-data.h>
+#include <dali/public-api/images/pixel-data.h>
 
 namespace Dali
 {
@@ -133,7 +133,7 @@ public:
    * @param [out] textureRect The texture area of the resource image in the atlas.
    * @param [in] pixelData The pixel data.
    */
-  bool Upload( Vector4& textureRect, PixelDataPtr pixelData );
+  bool Upload( Vector4& textureRect, PixelData pixelData );
 
   /**
    * @brief Remove the image at the given rectangle.
@@ -153,4 +153,4 @@ public: // Not intended for developer use
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_IMAGE_ATLAS_H__ */
+#endif // DALI_TOOLKIT_IMAGE_ATLAS_H