mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 03:31:05 +00:00
harfbuzz.wrap: Fix wrap type, and remove unnecessary patch
Forgot to change the wrap type in e0014ef4fe
which broke the
subproject. Wasn't noticed by CI because the subproject cache wasn't
regenerated.
The accompanied patch was included in 2.8.2, so it is not needed. It
was originally needed with 2.8.1
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2812>
This commit is contained in:
parent
d3dfdeaf47
commit
db28c81ee3
2 changed files with 1 additions and 44 deletions
|
@ -1,6 +1,5 @@
|
||||||
[wrap-git]
|
[wrap-file]
|
||||||
directory = harfbuzz-2.8.2
|
directory = harfbuzz-2.8.2
|
||||||
source_url = https://github.com/harfbuzz/harfbuzz/releases/download/2.8.2/harfbuzz-2.8.2.tar.xz
|
source_url = https://github.com/harfbuzz/harfbuzz/releases/download/2.8.2/harfbuzz-2.8.2.tar.xz
|
||||||
source_filename = harfbuzz-2.8.2.tar.xz
|
source_filename = harfbuzz-2.8.2.tar.xz
|
||||||
source_hash = d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
|
source_hash = d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
|
||||||
diff_files = harfbuzz-2.8.2/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch
|
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
From 243d056ff1c2af583ceb67e5dfbfaac51dc96e63 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andi-Bogdan Postelnicu <abpostelnicu@me.com>
|
|
||||||
Date: Wed, 2 Jun 2021 14:08:11 +0300
|
|
||||||
Subject: [PATCH] Removed unused variable `supp_size` from
|
|
||||||
plan_subset_encoding(...).
|
|
||||||
|
|
||||||
---
|
|
||||||
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.32.1 (Apple Git-133)
|
|
||||||
|
|
Loading…
Reference in a new issue