[Libreoffice-commits] core.git: download.lst external/harfbuzz vcl/source

[Taichi Haradaguchi (via logerrit)]

 download.lst                            |    4 ++--
 external/harfbuzz/README                |    2 +-
 vcl/source/font/LogicalFontInstance.cxx |    4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit b80e0165affb81bcc6bf343b54c17b9a9b4c0d0e
Author:     Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Mar 11 12:42:40 2023 +0900
Commit:     خالد حسني <kha...@aliftype.com>
CommitDate: Thu Mar 23 11:55:58 2023 +0000

    Upgrade Harfbuzz to 7.1.0
    
    * Fixes CVE-2023-25193.
    * if Harfbuzz >= 7.0.0, uses hb_font_draw_glyph()
      instead of hb_font_get_glyph_shape().
    * Update URL in README.
    
    Change-Id: Id234c2b459c40ddac340731b44889b104e03a1e8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148743
    Tested-by: Jenkins
    Reviewed-by: خالد حسني <kha...@aliftype.com>

diff --git a/download.lst b/download.lst
index 4f2a9169d40f..86759b35fa9b 100644
--- a/download.lst
+++ b/download.lst
@@ -217,8 +217,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4
-HARFBUZZ_TARBALL := harfbuzz-6.0.0.tar.xz
+HARFBUZZ_SHA256SUM := 
f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b
+HARFBUZZ_TARBALL := harfbuzz-7.1.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/harfbuzz/README b/external/harfbuzz/README
index d2af8b559ad1..149da5566ab9 100644
--- a/external/harfbuzz/README
+++ b/external/harfbuzz/README
@@ -1 +1 @@
-HarfBuzz is an OpenType text shaping engine. From [http://harfbuzz.org/].
+HarfBuzz is an OpenType text shaping engine. From 
[https://harfbuzz.github.io/].
diff --git a/vcl/source/font/LogicalFontInstance.cxx 
b/vcl/source/font/LogicalFontInstance.cxx
index 385fe5ccd624..ee9c01b3881f 100644
--- a/vcl/source/font/LogicalFontInstance.cxx
+++ b/vcl/source/font/LogicalFontInstance.cxx
@@ -306,7 +306,11 @@ basegfx::B2DPolyPolygon 
LogicalFontInstance::GetGlyphOutlineUntransformed(sal_Gl
     }
 
     basegfx::B2DPolyPolygon aPolyPoly;
+#if HB_VERSION_ATLEAST(7, 0, 0)
+    hb_font_draw_glyph(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, 
&aPolyPoly);
+#else
     hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, 
&aPolyPoly);
+#endif
     return aPolyPoly;
 }