X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Ftext%2Fbitmap-font.cpp;h=5b1adaf6bf415bf71849fe88e101d312d2e570ac;hb=HEAD;hp=6c22e44b2bd2b182a2edc1a2b542ac542fc15910;hpb=10bc364fd6c2989274886822794fa8bf87046037;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/text/bitmap-font.cpp b/dali-toolkit/devel-api/text/bitmap-font.cpp
old mode 100755
new mode 100644
index 6c22e44..5b1adaf
--- a/dali-toolkit/devel-api/text/bitmap-font.cpp
+++ b/dali-toolkit/devel-api/text/bitmap-font.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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,60 +27,65 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace DevelText
 {
-
 Glyph::Glyph()
 : url{},
   utf8{},
-  ascender{ 0.f },
-  descender{ 0.f }
-{}
+  ascender{0.f},
+  descender{0.f}
+{
+}
 
-Glyph::Glyph( const std::string& url, const std::string utf8Character, float ascender, float descender )
-: url{ url },
+Glyph::Glyph(const std::string& url, const std::string utf8Character, float ascender, float descender)
+: url{url},
   utf8{},
-  ascender{ ascender },
-  descender{ descender }
+  ascender{ascender},
+  descender{descender}
 {
-  DALI_ASSERT_DEBUG( utf8Character.size() <= 4u );
+  DALI_ASSERT_DEBUG(utf8Character.size() <= 6u);
 
-  std::copy( utf8Character.begin(), utf8Character.end(), utf8 );
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+  std::copy(utf8Character.begin(), utf8Character.end(), utf8);
+#pragma GCC diagnostic pop
 }
 
 Glyph::~Glyph()
-{}
+{
+}
 
 BitmapFontDescription::BitmapFontDescription()
 : glyphs{},
   name{},
-  underlinePosition{ 0.f },
-  underlineThickness{ 1.f }
-{}
+  underlinePosition{0.f},
+  underlineThickness{1.f},
+  isColorFont{false}
+{
+}
 
 BitmapFontDescription::~BitmapFontDescription()
-{}
+{
+}
 
-void CreateBitmapFont( const BitmapFontDescription& description, TextAbstraction::BitmapFont& bitmapFont )
+void CreateBitmapFont(const BitmapFontDescription& description, TextAbstraction::BitmapFont& bitmapFont)
 {
-  bitmapFont.glyphs.reserve( description.glyphs.size() );
-  bitmapFont.name = description.name;
-  bitmapFont.underlinePosition = description.underlinePosition;
+  bitmapFont.glyphs.reserve(description.glyphs.size());
+  bitmapFont.name               = description.name;
+  bitmapFont.underlinePosition  = description.underlinePosition;
   bitmapFont.underlineThickness = description.underlineThickness;
-  bitmapFont.isColorFont = description.isColorFont;
+  bitmapFont.isColorFont        = description.isColorFont;
 
-  for( const auto& glyph : description.glyphs )
+  for(const auto& glyph : description.glyphs)
   {
     uint32_t c = 0u;
-    Text::Utf8ToUtf32( glyph.utf8, Text::GetUtf8Length( glyph.utf8[0u] ), &c );
+    Text::Utf8ToUtf32(glyph.utf8, Text::GetUtf8Length(glyph.utf8[0u]), &c);
 
-    TextAbstraction::BitmapGlyph bitmapGlyph( glyph.url, c, glyph.ascender, glyph.descender );
+    TextAbstraction::BitmapGlyph bitmapGlyph(glyph.url, c, glyph.ascender, glyph.descender);
 
-    bitmapFont.glyphs.push_back( std::move( bitmapGlyph ) );
+    bitmapFont.glyphs.push_back(std::move(bitmapGlyph));
   }
 }