diff options
author | Mark H Weaver <mhw@netris.org> | 2017-05-27 03:39:12 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2017-05-27 03:39:12 -0400 |
commit | 54d9479d8adf86e486d02267427829f43e7042b6 (patch) | |
tree | f4f1d7a9e0856bee3dadd1f7e2999159302275cb /gnu/packages/patches/graphite2-non-linear-classes-even-number.patch | |
parent | 52cabc6f87eb1ceebd953b423e458e3c48f847ca (diff) | |
parent | d771ba62f8b23cf71ad82b3423da36416e8a1e8d (diff) | |
download | guix-patches-54d9479d8adf86e486d02267427829f43e7042b6.tar guix-patches-54d9479d8adf86e486d02267427829f43e7042b6.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/graphite2-non-linear-classes-even-number.patch')
-rw-r--r-- | gnu/packages/patches/graphite2-non-linear-classes-even-number.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/gnu/packages/patches/graphite2-non-linear-classes-even-number.patch b/gnu/packages/patches/graphite2-non-linear-classes-even-number.patch deleted file mode 100644 index 2bb1c9f94e..0000000000 --- a/gnu/packages/patches/graphite2-non-linear-classes-even-number.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0646e4ee471183994f78a759269f0505617711f3 Mon Sep 17 00:00:00 2001 -From: Martin Hosken <martin_hosken@sil.org> -Date: Tue, 18 Apr 2017 13:17:14 +0100 -Subject: [PATCH] Ensure non linear classes have even number of elements - ---- - src/Silf.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Silf.cpp b/src/Silf.cpp -index d661992..9f2f954 100644 ---- a/src/Silf.cpp -+++ b/src/Silf.cpp -@@ -293,7 +293,8 @@ size_t Silf::readClassMap(const byte *p, size_t data_len, uint32 version, Error - if (e.test(*o + 4 > max_off, E_HIGHCLASSOFFSET) // LookupClass doesn't stretch over max_off - || e.test(lookup[0] == 0 // A LookupClass with no looks is a suspicious thing ... - || lookup[0] * 2 + *o + 4 > max_off // numIDs lookup pairs fits within (start of LookupClass' lookups array, max_off] -- || lookup[3] + lookup[1] != lookup[0], E_BADCLASSLOOKUPINFO)) // rangeShift: numIDs - searchRange -+ || lookup[3] + lookup[1] != lookup[0], E_BADCLASSLOOKUPINFO) // rangeShift: numIDs - searchRange -+ || e.test(((o[1] - *o) & 1) != 0, ERROROFFSET)) // glyphs are in pairs so difference must be even. - return ERROROFFSET; - } - --- -2.12.2 - |