From 04c2aa18bf05dbedc88212caa7eb93fb0839bdd3 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 25 Nov 2014 10:22:12 +0100 Subject: [PATCH] */*: s/Invalid_Argument/Invalid_Outline/ where appropriate. --- ChangeLog | 4 ++++ src/base/ftoutln.c | 12 +++++++++--- src/base/ftstroke.c | 5 ++++- src/smooth/ftgrays.c | 5 ++++- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29ea4c6d3..2e2cf1902 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-11-25 Werner Lemberg + + */*: s/Invalid_Argument/Invalid_Outline/ where appropriate. + 2014-11-25 Werner Lemberg */*: s/Invalid_Argument/Invalid_Face_Handle/ where appropriate. diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index 0ed561edb..a2445b42a 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -73,7 +73,10 @@ FT_Pos delta; - if ( !outline || !func_interface ) + if ( !outline ) + return FT_THROW( Invalid_Outline ); + + if ( !func_interface ) return FT_THROW( Invalid_Argument ); shift = func_interface->shift; @@ -614,7 +617,10 @@ if ( !library ) return FT_THROW( Invalid_Library_Handle ); - if ( !outline || !params ) + if ( !outline ) + return FT_THROW( Invalid_Outline ); + + if ( !params ) return FT_THROW( Invalid_Argument ); renderer = library->cur_renderer; @@ -911,7 +917,7 @@ if ( !outline ) - return FT_THROW( Invalid_Argument ); + return FT_THROW( Invalid_Outline ); xstrength /= 2; ystrength /= 2; diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c index ce24591ef..82dfa663f 100644 --- a/src/base/ftstroke.c +++ b/src/base/ftstroke.c @@ -2060,7 +2060,10 @@ FT_Int tag; /* current point's state */ - if ( !outline || !stroker ) + if ( !outline ) + return FT_THROW( Invalid_Outline ); + + if ( !stroker ) return FT_THROW( Invalid_Argument ); FT_Stroker_Rewind( stroker ); diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 9283326d2..9d37d6451 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -1515,7 +1515,10 @@ typedef ptrdiff_t FT_PtrDist; TPos delta; - if ( !outline || !func_interface ) + if ( !outline ) + return FT_THROW( Invalid_Outline ); + + if ( !func_interface ) return FT_THROW( Invalid_Argument ); shift = func_interface->shift;