-#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.
#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
{
/**
* @brief This assignment operator is required for (smart) pointer semantics.
*
- * @param [in] rhs A reference to the copied handle
+ * @param [in] handle A reference to the copied handle
* @return A reference to this
*/
ImageAtlas& operator=( const ImageAtlas& handle );
* @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.
} // namespace Dali
-#endif /* __DALI_TOOLKIT_IMAGE_ATLAS_H__ */
+#endif // DALI_TOOLKIT_IMAGE_ATLAS_H