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

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

diff --git a/dali/devel-api/text-abstraction/font-metrics.h b/dali/devel-api/text-abstraction/font-metrics.h
old mode 100755 (executable)
new mode 100644 (file)
index f314735..0c446c6
--- a/dali/devel-api/text-abstraction/font-metrics.h
+++ b/dali/devel-api/text-abstraction/font-metrics.h
@@ -2,7 +2,7 @@
 #define DALI_TEXT_ABSTRACTION_FONT_METRICS_H
 
 /*
- * Copyright (c) 2019 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
 {
-
 /**
  * The metrics for a Font expressed in pixels.
  */
@@ -40,21 +38,21 @@ struct DALI_ADAPTOR_API FontMetrics
   /**
    * @brief Create the font metrics in pixels.
    */
-  FontMetrics( float ascenderPixels,
-               float descenderPixels,
-               float heightPixels,
-               float underlinePositionPixels,
-               float underlineThicknessPixels );
-
-  float ascender;             ///< The ascender in pixels.
-  float descender;            ///< The descender in pixels.
-  float height;               ///< The height in pixels.
-  float underlinePosition;    ///< The underline position in pixels.
-  float underlineThickness;   ///< The vertical height of the underline in pixels.
+  FontMetrics(float ascenderPixels,
+              float descenderPixels,
+              float heightPixels,
+              float underlinePositionPixels,
+              float underlineThicknessPixels);
+
+  float ascender;           ///< The ascender in pixels.
+  float descender;          ///< The descender in pixels.
+  float height;             ///< The height in pixels.
+  float underlinePosition;  ///< The underline position in pixels.
+  float underlineThickness; ///< The vertical height of the underline in pixels.
 };
 
-} // Dali
+} // namespace TextAbstraction
 
-} // TextAbstraction
+} // namespace Dali
 
 #endif //DALI_TEXT_ABSTRACTION_FONT_METRICS_H