diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:31:25 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:31:25 -0500 |
| commit | 05f00e318b7842595179ad4d228dfaee5e992951 (patch) | |
| tree | 65059975d8e906513b01e7161caf87e7772674cf /freetype/src/base/ftbdf.c | |
| parent | 67f9dfd6bae84de480e0f4407d5ee27fccc34d9f (diff) | |
| download | vcxsrv-05f00e318b7842595179ad4d228dfaee5e992951.tar.gz vcxsrv-05f00e318b7842595179ad4d228dfaee5e992951.tar.bz2 vcxsrv-05f00e318b7842595179ad4d228dfaee5e992951.zip | |
Updated to freetype 2.5.5
Diffstat (limited to 'freetype/src/base/ftbdf.c')
| -rw-r--r-- | freetype/src/base/ftbdf.c | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/freetype/src/base/ftbdf.c b/freetype/src/base/ftbdf.c index 5755f8558..d9dcbad5e 100644 --- a/freetype/src/base/ftbdf.c +++ b/freetype/src/base/ftbdf.c @@ -4,7 +4,7 @@ /* */ /* FreeType API for accessing BDF-specific strings (body). */ /* */ -/* Copyright 2002-2004, 2013 by */ +/* Copyright 2002-2004, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,8 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_INTERNAL_OBJECTS_H #include FT_SERVICE_BDF_H @@ -32,19 +34,18 @@ const char* encoding = NULL; const char* registry = NULL; + FT_Service_BDF service; - error = FT_ERR( Invalid_Argument ); - - if ( face ) - { - FT_Service_BDF service; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); - FT_FACE_FIND_SERVICE( face, service, BDF ); + FT_FACE_FIND_SERVICE( face, service, BDF ); - if ( service && service->get_charset_id ) - error = service->get_charset_id( face, &encoding, ®istry ); - } + if ( service && service->get_charset_id ) + error = service->get_charset_id( face, &encoding, ®istry ); + else + error = FT_THROW( Invalid_Argument ); if ( acharset_encoding ) *acharset_encoding = encoding; @@ -65,23 +66,25 @@ { FT_Error error; + FT_Service_BDF service; - error = FT_ERR( Invalid_Argument ); - aproperty->type = BDF_PROPERTY_TYPE_NONE; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); - if ( face ) - { - FT_Service_BDF service; + if ( !aproperty ) + return FT_THROW( Invalid_Argument ); + aproperty->type = BDF_PROPERTY_TYPE_NONE; - FT_FACE_FIND_SERVICE( face, service, BDF ); + FT_FACE_FIND_SERVICE( face, service, BDF ); - if ( service && service->get_property ) - error = service->get_property( face, prop_name, aproperty ); - } + if ( service && service->get_property ) + error = service->get_property( face, prop_name, aproperty ); + else + error = FT_THROW( Invalid_Argument ); - return error; + return error; } |