Merge "AsyncTaskManager overhead reduce" into devel/master

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

diff --git a/dali/devel-api/text-abstraction/bitmap-font.h b/dali/devel-api/text-abstraction/bitmap-font.h
old mode 100755 (executable)
new mode 100644 (file)
index a3c3272..f07a03b
--- a/dali/devel-api/text-abstraction/bitmap-font.h
+++ b/dali/devel-api/text-abstraction/bitmap-font.h
@@ -2,7 +2,7 @@
 #define DALI_TEXT_ABSTRACTION_BITMAP_FONT_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.
@@ -27,14 +27,10 @@
 // INTERNAL INCLUDES
 #include <dali/devel-api/text-abstraction/text-abstraction-definitions.h>
 
-
-
 namespace Dali
 {
-
 namespace TextAbstraction
 {
-
 /**
  * @brief Struct that stores the needed info to create a bitmap glyph.
  *
@@ -59,17 +55,17 @@ struct DALI_ADAPTOR_API BitmapGlyph
    * @param[in] ascender The ascender of the glyph.
    * @param[in] descender The descender of the glyph.
    */
-  BitmapGlyph( const std::string& url, GlyphIndex utf32, float ascender, float descender );
+  BitmapGlyph(const std::string& url, GlyphIndex utf32, float ascender, float descender);
 
   /**
    * @brief Default destructor.
    */
   ~BitmapGlyph();
 
-  std::string url;  ///< The url of the glyph's bitmap.
-  GlyphIndex utf32; ///< The id of the glyph encoded in utf32.
-  float ascender;   ///< The ascender in pixels. The distance from the base line to the top of the glyph.
-  float descender;  ///< The descender in pixels. The distance from the base line to the bottom of the glyph.
+  std::string url;       ///< The url of the glyph's bitmap.
+  GlyphIndex  utf32;     ///< The id of the glyph encoded in utf32.
+  float       ascender;  ///< The ascender in pixels. The distance from the base line to the top of the glyph.
+  float       descender; ///< The descender in pixels. The distance from the base line to the bottom of the glyph.
 };
 
 /**
@@ -91,13 +87,13 @@ struct DALI_ADAPTOR_API BitmapFont
    */
   ~BitmapFont();
 
-  std::vector<BitmapGlyph> glyphs; ///< The glyphs of the font.
-  std::string name;                ///< The name of the font.
-  float ascender;                  ///< The ascender in pixels. Maximum ascender of all the glyphs.
-  float descender;                 ///< The descender in pixels. Minimum descender of all the glyphs.
-  float underlinePosition;         ///< The position in pixels of the underline from the base line.
-  float underlineThickness;        ///< The thickness in pixels of the underline.
-  bool isColorFont:1;              ///< Whether the glyphs of this font have their own colors.
+  std::vector<BitmapGlyph> glyphs;             ///< The glyphs of the font.
+  std::string              name;               ///< The name of the font.
+  float                    ascender;           ///< The ascender in pixels. Maximum ascender of all the glyphs.
+  float                    descender;          ///< The descender in pixels. Minimum descender of all the glyphs.
+  float                    underlinePosition;  ///< The position in pixels of the underline from the base line.
+  float                    underlineThickness; ///< The thickness in pixels of the underline.
+  bool                     isColorFont : 1;    ///< Whether the glyphs of this font have their own colors.
 };
 
 } // namespace TextAbstraction