forked from minhngoc25a/freetype2
[cff] Fix segfault on missing `psaux' (#52218)
* src/cff/cffload.c (cff_done_blend): Add a check for possible nullptr. * modules.cfg: Update dependency list.
This commit is contained in:
parent
ccb0f7998d
commit
94f6d57a4c
|
@ -1,3 +1,11 @@
|
||||||
|
2017-10-12 Ewald Hew <ewaldhew@gmail.com>
|
||||||
|
|
||||||
|
[cff] Fix segfault on missing `psaux' (#52218)
|
||||||
|
|
||||||
|
* src/cff/cffload.c (cff_done_blend): Add a check for possible nullptr.
|
||||||
|
|
||||||
|
* modules.cfg: Update dependency list.
|
||||||
|
|
||||||
2017-10-15 Alexei Podtelezhnikov <apodtele@gmail.com>
|
2017-10-15 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
[base, cff] Fix MSVC warnings.
|
[base, cff] Fix MSVC warnings.
|
||||||
|
|
|
@ -42,7 +42,7 @@ FONT_MODULES += type1
|
||||||
|
|
||||||
# CFF/OpenType font driver.
|
# CFF/OpenType font driver.
|
||||||
#
|
#
|
||||||
# This driver needs the `sfnt', `pshinter', and `psnames' modules.
|
# This driver needs the `sfnt', `psaux', `pshinter', and `psnames' modules.
|
||||||
FONT_MODULES += cff
|
FONT_MODULES += cff
|
||||||
|
|
||||||
# Type 1 CID-keyed font driver.
|
# Type 1 CID-keyed font driver.
|
||||||
|
|
|
@ -1595,6 +1595,7 @@
|
||||||
FT_Service_MultiMasters mm = (FT_Service_MultiMasters)face->mm;
|
FT_Service_MultiMasters mm = (FT_Service_MultiMasters)face->mm;
|
||||||
|
|
||||||
|
|
||||||
|
if (mm)
|
||||||
mm->done_blend( FT_FACE( face ) );
|
mm->done_blend( FT_FACE( face ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue