Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / text-abstraction / text-abstraction-definitions.h

diff --git a/dali/devel-api/text-abstraction/text-abstraction-definitions.h b/dali/devel-api/text-abstraction/text-abstraction-definitions.h
old mode 100755 (executable)
new mode 100644 (file)
index c8c346a..9159653
--- a/dali/devel-api/text-abstraction/text-abstraction-definitions.h
+++ b/dali/devel-api/text-abstraction/text-abstraction-definitions.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TEXT_ABSTRACTION_DEFINITIONS_H__
-#define __DALI_TEXT_ABSTRACTION_DEFINITIONS_H__
+#ifndef DALI_TEXT_ABSTRACTION_DEFINITIONS_H
+#define DALI_TEXT_ABSTRACTION_DEFINITIONS_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -23,10 +23,8 @@
 
 namespace Dali
 {
-
 namespace TextAbstraction
 {
-
 typedef uint32_t FontId;             ///< The unique identifier for a font face (generated by FontClient)
 typedef uint32_t PointSize26Dot6;    ///< The point size in 26.6 fractional points
 typedef uint32_t FaceIndex;          ///< Used with fonts which allow several font faces
@@ -78,12 +76,12 @@ struct VectorBlob
 */
 enum class ColorBlendingMode
 {
-  NONE,     ///< No blend.
-  MULTIPLY  ///< The color is multiplied by another one.
+  NONE,    ///< No blend.
+  MULTIPLY ///< The color is multiplied by another one.
 };
 
 } // namespace TextAbstraction
 
 } // namespace Dali
 
-#endif // __DALI_TEXT_ABSTRACTION_DEFINITIONS_H__
+#endif // DALI_TEXT_ABSTRACTION_DEFINITIONS_H