Fix loading of named instances (TrueType)
This commit is contained in:
Marek Kasik
parent
34253665ed
commit
1fb77021ab
67
0077-truetype-Fix-loading-of-named-instances.patch
Normal file
67
0077-truetype-Fix-loading-of-named-instances.patch
Normal file
@ -0,0 +1,67 @@
|
||||
From 55bbb98f5c5a89230127d6b998a6e23e634b5d0e Mon Sep 17 00:00:00 2001
|
||||
From: Behdad Esfahbod <behdad@behdad.org>
|
||||
Date: Tue, 1 Aug 2017 09:17:02 +0200
|
||||
Subject: [PATCH 077/132] [truetype] Fix loading of named instances.
|
||||
|
||||
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Preserve file position
|
||||
while loading the `avar' table.
|
||||
---
|
||||
ChangeLog | 7 +++++++
|
||||
include/freetype/ftmm.h | 2 +-
|
||||
src/truetype/ttgxvar.c | 11 ++++++++++-
|
||||
3 files changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
|
||||
index c41b80ea6..1f48a4945 100644
|
||||
--- a/include/freetype/ftmm.h
|
||||
+++ b/include/freetype/ftmm.h
|
||||
@@ -178,7 +178,7 @@ FT_BEGIN_HEADER
|
||||
/* strid :: The entry in `name' table identifying this instance. */
|
||||
/* */
|
||||
/* psid :: The entry in `name' table identifying a PostScript name */
|
||||
- /* for this instance. */
|
||||
+ /* for this instance. Value 0 indicates a missing entry. */
|
||||
/* */
|
||||
typedef struct FT_Var_Named_Style_
|
||||
{
|
||||
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
|
||||
index 68458362e..df42b3bfd 100644
|
||||
--- a/src/truetype/ttgxvar.c
|
||||
+++ b/src/truetype/ttgxvar.c
|
||||
@@ -2139,8 +2139,16 @@
|
||||
goto Exit;
|
||||
|
||||
if ( fvar_head.instanceCount && !face->blend->avar_loaded )
|
||||
+ {
|
||||
+ FT_ULong offset = FT_STREAM_POS();
|
||||
+
|
||||
+
|
||||
ft_var_load_avar( face );
|
||||
|
||||
+ if ( FT_STREAM_SEEK( offset ) )
|
||||
+ goto Exit;
|
||||
+ }
|
||||
+
|
||||
ns = mmvar->namedstyle;
|
||||
nsc = face->blend->normalized_stylecoords;
|
||||
for ( i = 0; i < fvar_head.instanceCount; i++, ns++ )
|
||||
@@ -2157,6 +2165,7 @@
|
||||
for ( j = 0; j < fvar_head.axisCount; j++, c++ )
|
||||
*c = FT_GET_LONG();
|
||||
|
||||
+ /* valid psid values are 6 and [256;32767] */
|
||||
if ( usePsName )
|
||||
ns->psid = FT_GET_USHORT();
|
||||
|
||||
@@ -2174,7 +2183,7 @@
|
||||
SFNT_Service sfnt = (SFNT_Service)face->sfnt;
|
||||
|
||||
FT_Int found, dummy1, dummy2;
|
||||
- FT_UInt strid = 0xFFFFFFFFUL;
|
||||
+ FT_UInt strid = ~0U;
|
||||
|
||||
|
||||
/* the default instance is missing in array the */
|
||||
--
|
||||
2.13.5
|
||||
|
||||
45
0079-src-truetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch
Normal file
45
0079-src-truetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From 7e50824288fac5a36c2938fdb3e1c949ea53f982 Mon Sep 17 00:00:00 2001
|
||||
From: Werner Lemberg <wl@gnu.org>
|
||||
Date: Tue, 1 Aug 2017 12:44:35 +0200
|
||||
Subject: [PATCH 079/132] * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko.
|
||||
|
||||
---
|
||||
ChangeLog | 4 ++++
|
||||
include/freetype/ftmm.h | 3 ++-
|
||||
src/truetype/ttgxvar.c | 4 +++-
|
||||
3 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
|
||||
index 1f48a4945..b1bc1ed82 100644
|
||||
--- a/include/freetype/ftmm.h
|
||||
+++ b/include/freetype/ftmm.h
|
||||
@@ -178,7 +178,8 @@ FT_BEGIN_HEADER
|
||||
/* strid :: The entry in `name' table identifying this instance. */
|
||||
/* */
|
||||
/* psid :: The entry in `name' table identifying a PostScript name */
|
||||
- /* for this instance. Value 0 indicates a missing entry. */
|
||||
+ /* for this instance. Value 0xFFFF indicates a missing */
|
||||
+ /* entry. */
|
||||
/* */
|
||||
typedef struct FT_Var_Named_Style_
|
||||
{
|
||||
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
|
||||
index df42b3bfd..5a87df139 100644
|
||||
--- a/src/truetype/ttgxvar.c
|
||||
+++ b/src/truetype/ttgxvar.c
|
||||
@@ -2165,9 +2165,11 @@
|
||||
for ( j = 0; j < fvar_head.axisCount; j++, c++ )
|
||||
*c = FT_GET_LONG();
|
||||
|
||||
- /* valid psid values are 6 and [256;32767] */
|
||||
+ /* valid psid values are 6, [256;32767], and 0xFFFF */
|
||||
if ( usePsName )
|
||||
ns->psid = FT_GET_USHORT();
|
||||
+ else
|
||||
+ ns->psid = 0xFFFF;
|
||||
|
||||
ft_var_to_normalized( face,
|
||||
fvar_head.axisCount,
|
||||
--
|
||||
2.13.5
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
Summary: A free and portable font rendering engine
|
||||
Name: freetype
|
||||
Version: 2.8
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.freetype.org
|
||||
@ -29,6 +29,9 @@ Patch4: freetype-2.8-pcf-encoding.patch
|
||||
|
||||
Patch5: freetype-2.8-loop-counter.patch
|
||||
|
||||
Patch6: 0077-truetype-Fix-loading-of-named-instances.patch
|
||||
Patch7: 0079-src-truetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch
|
||||
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: zlib-devel
|
||||
@ -89,6 +92,8 @@ popd
|
||||
%patch3 -p1 -b .libtool
|
||||
%patch4 -p1 -b .pcf-encoding
|
||||
%patch5 -p1 -b .loop-counter
|
||||
%patch6 -p1 -b .named-instances
|
||||
%patch7 -p1 -b .named-instances2
|
||||
|
||||
%build
|
||||
|
||||
@ -202,6 +207,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Thu Sep 21 2017 Marek Kasik <mkasik@redhat.com> - 2.8-6
|
||||
- Fix loading of named instances (TrueType)
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user