Purge underscored header file barriers

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / image-loader / image-atlas-impl.h

diff --git a/dali-toolkit/internal/image-loader/image-atlas-impl.h b/dali-toolkit/internal/image-loader/image-atlas-impl.h
index 4f735ef..94601a2 100644 (file)
--- a/dali-toolkit/internal/image-loader/image-atlas-impl.h
+++ b/dali-toolkit/internal/image-loader/image-atlas-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H__
-#define __DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H__
+#ifndef DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H
+#define DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -22,7 +22,6 @@
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/signals/connection-tracker.h>
 #include <dali/devel-api/common/owner-container.h>
-#include <dali/devel-api/images/atlas.h>
 #include <dali/devel-api/common/owner-container.h>
 
 // INTERNAL INCLUDES
@@ -47,6 +46,11 @@ public:
   typedef Toolkit::ImageAtlas::SizeType SizeType;
 
   /**
+   * @copydoc ImageAtlas::PackToAtlas( const std::vector<PixelData>&, Dali::Vector<Vector4>& )
+   */
+  static Texture PackToAtlas( const std::vector<PixelData>& pixelData, Dali::Vector<Vector4>& textureRects  );
+
+  /**
    * Constructor
    * @param [in] width          The atlas width in pixels.
    * @param [in] height         The atlas height in pixels.
@@ -188,4 +192,4 @@ inline Internal::ImageAtlas& GetImplementation( Toolkit::ImageAtlas& imageAtlas
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H__ */
+#endif // DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H