Merge branch 'release/2.x' into dev

Author: halx99

3rdparty/README.md

@@ -189,7 +189,7 @@
 
 ## OpenSSL
 - [![Upstream](https://img.shields.io/github/v/tag/openssl/openssl?label=Upstream)](https://github.com/openssl/openssl)
-- Version: 3.0.17
+- Version: 3.0.18
 - License: Apache-2.0
 
 ## png
@@ -211,7 +211,7 @@
 
 ## rapidjson
 - [![Upstream](https://img.shields.io/github/v/tag/Tencent/rapidjson?label=Upstream)](https://github.com/Tencent/rapidjson)
-- Version: 1.1.0-815e6e7 (until Sep 24, 2024)
+- Version: 1.1.0-24b5e7a (until Feb 5, 2025)
 - License: MIT
 
 ## recast

3rdparty/rapidjson/encodings.h

@@ -177,10 +177,10 @@ struct UTF8 {
 
     template <typename InputStream, typename OutputStream>
     static bool Validate(InputStream& is, OutputStream& os) {
-#define RAPIDJSON_COPY() os.Put(c = is.Take())
+#define RAPIDJSON_COPY() if (c != '\0') os.Put(c = is.Take())
 #define RAPIDJSON_TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
 #define RAPIDJSON_TAIL() RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x70)
-        Ch c;
+        Ch c = static_cast<Ch>(-1);
         RAPIDJSON_COPY();
         if (!(c & 0x80))
             return true;

3rdparty/rapidjson/internal/strtod.h

@@ -134,7 +134,7 @@ inline bool StrtodDiyFp(const Ch* decimals, int dLen, int dExp, double* result)
     int i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
     for (; i < dLen; i++) {
         if (significand  >  RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) ||
-            (significand == RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > Ch('5')))
+            (significand == RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] >= Ch('5')))
             break;
         significand = significand * 10u + static_cast<unsigned>(decimals[i] - Ch('0'));
     }

3rdparty/rapidjson/pointer.h

@@ -28,6 +28,12 @@ RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
 #endif
 
+#if defined(RAPIDJSON_CPLUSPLUS) && RAPIDJSON_CPLUSPLUS >= 201703L
+#define RAPIDJSON_IF_CONSTEXPR if constexpr
+#else
+#define RAPIDJSON_IF_CONSTEXPR if
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
 static const SizeType kPointerInvalidIndex = ~SizeType(0);  //!< Represents an invalid index in GenericPointer::Token
@@ -291,7 +297,7 @@ class GenericPointer {
         SizeType length = static_cast<SizeType>(end - buffer);
         buffer[length] = '\0';
 
-        if (sizeof(Ch) == 1) {
+        RAPIDJSON_IF_CONSTEXPR (sizeof(Ch) == 1) {
             Token token = { reinterpret_cast<Ch*>(buffer), length, index };
             return Append(token, allocator);
         }

3rdparty/rapidjson/schema.h

@@ -1645,8 +1645,7 @@ class Schema {
         double qRounded = std::floor(q + 0.5);
         double scaledEpsilon = (q + qRounded) * std::numeric_limits<double>::epsilon();
         double difference = std::abs(qRounded - q);
-        bool isMultiple = (difference <= scaledEpsilon)
-                                        || (difference < std::numeric_limits<double>::min());
+        bool isMultiple = difference <= scaledEpsilon || difference < (std::numeric_limits<double>::min)();
         if (!isMultiple) {
             context.error_handler.NotMultipleOf(d, multipleOf_);
             RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorMultipleOf);
@@ -1762,7 +1761,7 @@ struct TokenHelper {
 template <typename Stack>
 struct TokenHelper<Stack, char> {
     RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
-        if (sizeof(SizeType) == 4) {
+        RAPIDJSON_IF_CONSTEXPR (sizeof(SizeType) == 4) {
             char *buffer = documentStack.template Push<char>(1 + 10); // '/' + uint
             *buffer++ = '/';
             const char* end = internal::u32toa(index, buffer);

CHANGELOG.md

@@ -1,3 +1,36 @@
+# axmol-2.9.1 Nov.2 2025
+
+## Significant changes relative to 2.9.0:
+
+- Improve SDF text outline rendering by @halx99 in [#2843](https://github.com/axmolengine/axmol/pull/2843)
+
+## Bug fixes
+
+- Fix SDF text rendering issue when both outline and shadow are enabled by @halx99, see issue: [#2844](https://github.com/axmolengine/axmol/issues/2844)
+- Fix memory leak in extension::GUI ScrollView by @j-jorge in [#2821](https://github.com/axmolengine/axmol/pull/2821)
+- Fix FairyGUI Ellipse/Circle "Line Size" issue by @aismann in [#2825](https://github.com/axmolengine/axmol/pull/2825)
+- Fix: `ui::Text` `Overflow::SHRINK` does not restore the original font size when text is shortened by @tkzcfc in [#2831](https://github.com/axmolengine/axmol/pull/2831)
+- Fix: `FastTMXLayer::reset` draw counts when layer becomes empty by @lucycycy in [#2839](https://github.com/axmolengine/axmol/pull/2839)
+
+## Improvements
+
+- Improve AutoPolygon::findFirstNoneTransparentPixel() by @aismann in [#2810](https://github.com/axmolengine/axmol/pull/2810)
+- Add new test scroll view v2 by @NgVThangBz in [#2820](https://github.com/axmolengine/axmol/pull/2820)
+- Add PVRv3 ASTC support and improve PVR format detection by @lucycycy in [#2832](https://github.com/axmolengine/axmol/pull/2832)
+- Sync pixel format enums in Constants.lua by @halx99
+- Improve distance field outline shader by @halx99
+
+## SDK & Tools updates
+
+- gradle: 9.1.0 => 9.2.0
+- webview2: 1.0.3485.44 => 1.0.3537.50
+
+## 3rdparty updates
+
+- oboe: 1.9.3 => 1.10.0
+- openssl: 3.0.17 => 3.0.18
+- rapidjson: 1.1.0-815e6e7 => 1.1.0-24b5e7a
+
 # axmol-2.9.0 Oct.5 2025
 
 ## Significant changes relative to 2.8.x:

manifest.json

@@ -1,6 +1,6 @@
 {
   "versions": {
-    "1kdist": "v107",
+    "1kdist": "v108",
     "oboe": "1.10.0",
     "kcp": "v1.7-f4f3a89",
     "opus": "v1.5.2",