diff options
author | marha <marha@users.sourceforge.net> | 2011-09-05 10:19:03 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-05 10:19:03 +0200 |
commit | 9441c8f47bb24faebc885bfc3c5e37f47a3ad984 (patch) | |
tree | 276b55ded8f63c6bc5041785785ba927f168e077 /freetype/src/type1/t1load.c | |
parent | c7b24c70d1e2d558d512665ffa5479e64b36692d (diff) | |
parent | 6eaea4464631b5d8c1f44a46016163e351028afc (diff) | |
download | vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.tar.gz vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.tar.bz2 vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXfont/configure.ac
libXfont/doc/fontlib.xml
libXfont/src/bitmap/bitscale.c
libXfont/src/fontfile/decompress.c
Diffstat (limited to 'freetype/src/type1/t1load.c')
-rw-r--r-- | freetype/src/type1/t1load.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/freetype/src/type1/t1load.c b/freetype/src/type1/t1load.c index 6d1ab9fe0..3fe1edd80 100644 --- a/freetype/src/type1/t1load.c +++ b/freetype/src/type1/t1load.c @@ -4,8 +4,7 @@ /* */ /* Type 1 font loader (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */ -/* 2010 by */ +/* Copyright 1996-2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -922,6 +921,9 @@ PS_Blend blend = face->blend; + if ( blend && blend->num_designs == 0 ) + blend = NULL; + /* if the keyword has a dedicated callback, call it */ if ( field->type == T1_FIELD_TYPE_CALLBACK ) { |