diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
| commit | 9db9c1f2215e32047c7329ab769d54dd3c1ddeb7 (patch) | |
| tree | 98acb9a60cf237138f939b5dadb0d9ae7722ddeb /src/3rdparty/freetype/src/base/ftmm.c | |
| parent | e9d32707afeddfdd2906af7bed60c375b1035dd6 (diff) | |
| parent | 3c8f4512df30dee4a867a498fff6d2b27b881e4b (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/freetype/src/base/ftmm.c')
| -rw-r--r-- | src/3rdparty/freetype/src/base/ftmm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/freetype/src/base/ftmm.c b/src/3rdparty/freetype/src/base/ftmm.c index 586d5e84d..030772981 100644 --- a/src/3rdparty/freetype/src/base/ftmm.c +++ b/src/3rdparty/freetype/src/base/ftmm.c @@ -4,7 +4,7 @@ /* */ /* Multiple Master font support (body). */ /* */ -/* Copyright 1996-2001, 2003, 2004 by */ +/* Copyright 1996-2001, 2003, 2004, 2009 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -52,7 +52,7 @@ *aservice, MULTI_MASTERS ); - if ( aservice ) + if ( *aservice ) error = FT_Err_Ok; } |