Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits: 3d38357a by Martin Storsjö at 2021-07-08T11:29:29+00:00 contrib: harfbuzz: Reapply fix for building with Clang 13 The previous fix was dropped in 233747ab4c59338b48a986f174a0555b7923cd57 when updating harfbuzz. The previous (local) patch for fixing the matter didn't fit without conflicts - instead of updating that patch, backport the upstream fix (removing the unused variable - our previous fix was to remove -Werror for -Wunused). - - - - - 2 changed files: - + contrib/src/harfbuzz/0003-Removed-unused-variable-supp_size-from-plan_subset_e.patch - contrib/src/harfbuzz/rules.mak Changes: ===================================== contrib/src/harfbuzz/0003-Removed-unused-variable-supp_size-from-plan_subset_e.patch ===================================== @@ -0,0 +1,43 @@ +From 17941ecf29c23f996dcbffd06525f3e0e5ac0412 Mon Sep 17 00:00:00 2001 +From: Andi-Bogdan Postelnicu <[email protected]> +Date: Wed, 2 Jun 2021 14:08:11 +0300 +Subject: [PATCH 3/3] Removed unused variable `supp_size` from + plan_subset_encoding(...). + +(cherry picked from commit 243d056ff1c2af583ceb67e5dfbfaac51dc96e63) +--- + src/hb-subset-cff1.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc +index df322f845..35dae7b1f 100644 +--- a/src/hb-subset-cff1.cc ++++ b/src/hb-subset-cff1.cc +@@ -402,7 +402,7 @@ struct cff_subset_plan { + void plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan) + { + const Encoding *encoding = acc.encoding; +- unsigned int size0, size1, supp_size; ++ unsigned int size0, size1; + hb_codepoint_t code, last_code = CFF_UNDEF_CODE; + hb_vector_t<hb_codepoint_t> supp_codes; + +@@ -412,7 +412,6 @@ struct cff_subset_plan { + return; + } + +- supp_size = 0; + supp_codes.init (); + + subset_enc_num_codes = plan->num_output_glyphs () - 1; +@@ -448,7 +447,6 @@ struct cff_subset_plan { + code_pair_t pair = { supp_codes[i], sid }; + subset_enc_supp_codes.push (pair); + } +- supp_size += SuppEncoding::static_size * supp_codes.length; + } + } + supp_codes.fini (); +-- +2.25.1 + ===================================== contrib/src/harfbuzz/rules.mak ===================================== @@ -16,6 +16,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.xz .sum-harfbuzz $(UNPACK) $(APPLY) $(SRC)/harfbuzz/0001-fix-OSAtomic-calls-for-AArch64.patch $(APPLY) $(SRC)/harfbuzz/0002-Update-the-bundled-ax_pthread.m4.patch + $(APPLY) $(SRC)/harfbuzz/0003-Removed-unused-variable-supp_size-from-plan_subset_e.patch $(MOVE) DEPS_harfbuzz = freetype2 $(DEPS_freetype2) View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3d38357a4bc65bb7b234866af4a93dda51b8d7e2 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3d38357a4bc65bb7b234866af4a93dda51b8d7e2 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
