Merge "Change BuildRequires of dali2-toolkit to Requires" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / rendering / vector-based / glyphy-shader / glyphy-shader.h

diff --git a/dali-toolkit/internal/text/rendering/vector-based/glyphy-shader/glyphy-shader.h b/dali-toolkit/internal/text/rendering/vector-based/glyphy-shader/glyphy-shader.h
index b3bbcf7..4a16cd2 100644 (file)
--- a/dali-toolkit/internal/text/rendering/vector-based/glyphy-shader/glyphy-shader.h
+++ b/dali-toolkit/internal/text/rendering/vector-based/glyphy-shader/glyphy-shader.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TEXT_GLYPHY_SHADER_H__
-#define __DALI_TOOLKIT_TEXT_GLYPHY_SHADER_H__
+#ifndef DALI_TOOLKIT_TEXT_GLYPHY_SHADER_H
+#define DALI_TOOLKIT_TEXT_GLYPHY_SHADER_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -20,17 +20,14 @@
 
 // INTERNEL INCLUDES
 #include <dali/public-api/math/vector4.h>
-#include <dali/devel-api/rendering/shader.h>
+#include <dali/public-api/rendering/shader.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Text
 {
-
 /**
  * @brief A Shader based on GLyphy authored by Behdad Esfahbod & Maysum Panju.
  *
@@ -39,13 +36,12 @@ namespace Text
 class GlyphyShader : public Shader
 {
 public:
-
   /**
    * @brief Create the blob atlas.
    *
    * @param[in] atlasInfo The metrics of the texture atlas storing vector data.
    */
-  static GlyphyShader New( const Vector4& atlasInfo );
+  static GlyphyShader New(const Vector4& atlasInfo);
 
   /**
    * @brief Create an uninitialized GlyphyShader handle.
@@ -60,9 +56,7 @@ public:
   ~GlyphyShader();
 
 private: // Not intended for application developer
-
-  GlyphyShader( Shader handle );
-
+  GlyphyShader(Shader handle);
 };
 
 } // namespace Text
@@ -71,4 +65,4 @@ private: // Not intended for application developer
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TEXT_GLYPHY_SHADER_H__
+#endif // DALI_TOOLKIT_TEXT_GLYPHY_SHADER_H