Merge

Author: GoeLin

src/java.desktop/share/legal/harfbuzz.md

@@ -1,4 +1,4 @@
-## Harfbuzz 12.3.2
+## Harfbuzz v14.2.0
 
 ### Harfbuzz License
 
@@ -75,7 +75,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 The below applies to the following file(s):
 libharfbuzz/hb-unicode-emoji-table.hh
 
-© 2024 Unicode®, Inc.
+© 2025 Unicode®, Inc.
 
 Unicode and the Unicode Logo are registered trademarks of Unicode, Inc.
 in the U.S. and other countries.

src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh

@@ -525,7 +525,13 @@ struct ColorLine
 
   hb_paint_extend_t get_extend () const
   {
-    return (hb_paint_extend_t) (unsigned int) extend;
+    switch ((unsigned int) extend)
+    {
+      case Extend::EXTEND_REPEAT:  return HB_PAINT_EXTEND_REPEAT;
+      case Extend::EXTEND_REFLECT: return HB_PAINT_EXTEND_REFLECT;
+      case Extend::EXTEND_PAD:
+      default:                     return HB_PAINT_EXTEND_PAD;
+    }
   }
 
   HB_INTERNAL static hb_paint_extend_t static_get_extend (hb_color_line_t *color_line,
@@ -1520,9 +1526,9 @@ struct PaintComposite
   void paint_glyph (hb_paint_context_t *c) const
   {
     TRACE_PAINT (this);
-    c->funcs->push_group (c->data);
+    c->funcs->push_group_for (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER);
     c->recurse (this+backdrop);
-    c->funcs->push_group (c->data);
+    c->funcs->push_group_for (c->data, (hb_paint_composite_mode_t) (int) mode);
     c->recurse (this+src);
     c->funcs->pop_group (c->data, (hb_paint_composite_mode_t) (int) mode);
     c->funcs->pop_group (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER);
@@ -1814,10 +1820,7 @@ struct ClipList
   {
     auto *rec = clips.as_array ().bsearch (gid);
     if (rec)
-    {
-      rec->get_extents (extents, this, instancer);
-      return true;
-    }
+      return rec->get_extents (extents, this, instancer);
     return false;
   }
 

src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh

@@ -172,7 +172,7 @@ struct CPAL
 
   bool has_data () const { return numPalettes; }
 
-  unsigned int get_size () const
+  size_t get_size () const
   { return min_size + numPalettes * sizeof (colorRecordIndicesZ[0]); }
 
   unsigned int get_palette_count () const { return numPalettes; }

src/java.desktop/share/native/libharfbuzz/OT/Color/sbix/sbix.hh

@@ -79,7 +79,7 @@ struct SBIXGlyph
 
 struct SBIXStrike
 {
-  static unsigned int get_size (unsigned num_glyphs)
+  static size_t get_size (unsigned num_glyphs)
   { return min_size + num_glyphs * HBUINT32::static_size; }
 
   bool sanitize (hb_sanitize_context_t *c) const