Merge "Added 2.3.0 support in the doxy file" into devel/master

diff --git a/dali-toolkit/devel-api/text/bitmap-font.cpp b/dali-toolkit/devel-api/text/bitmap-font.cpp
index c42eed8..5b1adaf 100644 (file)
--- a/dali-toolkit/devel-api/text/bitmap-font.cpp
+++ b/dali-toolkit/devel-api/text/bitmap-font.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 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.
@@ -45,9 +45,12 @@ Glyph::Glyph(const std::string& url, const std::string utf8Character, float asce
   ascender{ascender},
   descender{descender}
 {
-  DALI_ASSERT_DEBUG(utf8Character.size() <= 4u);
+  DALI_ASSERT_DEBUG(utf8Character.size() <= 6u);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
   std::copy(utf8Character.begin(), utf8Character.end(), utf8);
+#pragma GCC diagnostic pop
 }
 
 Glyph::~Glyph()

diff --git a/dali-toolkit/devel-api/text/bitmap-font.h b/dali-toolkit/devel-api/text/bitmap-font.h
index dbd0c02..ca22694 100644 (file)
--- a/dali-toolkit/devel-api/text/bitmap-font.h
+++ b/dali-toolkit/devel-api/text/bitmap-font.h
@@ -67,7 +67,7 @@ struct DALI_TOOLKIT_API Glyph
   ~Glyph();
 
   std::string url;       ///< The url of the glyph.
-  uint8_t     utf8[4];   ///< the glyph encoded in utf8
+  uint8_t     utf8[6];   ///< the glyph encoded in utf8
   float       ascender;  ///< The ascender. The distance from the base line to the top of the glyph.
   float       descender; ///< The descender. The distance from the base line to the bottom of the glyph.
 };

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index e7a90a1..52e9764 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -597,7 +597,11 @@ void Control::OnPropertySet(Property::Index index, const Property::Value& proper
     }
     case Actor::Property::VISIBLE:
     {
-      GetAccessibleObject()->EmitVisible(Self().GetProperty<bool>(Actor::Property::VISIBLE));
+      auto* accessible = GetAccessibleObject();
+      if(DALI_LIKELY(accessible))
+      {
+        accessible->EmitVisible(Self().GetProperty<bool>(Actor::Property::VISIBLE));
+      }
       break;
     }
     case DevelActor::Property::USER_INTERACTION_ENABLED: