aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/base/ftstroke.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-06-21 10:45:51 +0200
committermarha <marha@users.sourceforge.net>2013-06-21 10:48:19 +0200
commitfa791414601df61d20d860299dba80fdb62565df (patch)
treeeecc4c74bb78dece330009c571ed57d7f1aaede2 /freetype/src/base/ftstroke.c
parent7f9fb534564d0eb8a62cf444e569a07166e5ee03 (diff)
downloadvcxsrv-fa791414601df61d20d860299dba80fdb62565df.tar.gz
vcxsrv-fa791414601df61d20d860299dba80fdb62565df.tar.bz2
vcxsrv-fa791414601df61d20d860299dba80fdb62565df.zip
Upgraded freetype to 2.5.0.1
Diffstat (limited to 'freetype/src/base/ftstroke.c')
-rw-r--r--freetype/src/base/ftstroke.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/freetype/src/base/ftstroke.c b/freetype/src/base/ftstroke.c
index fd6a0c10b..ee61ceca0 100644
--- a/freetype/src/base/ftstroke.c
+++ b/freetype/src/base/ftstroke.c
@@ -4,7 +4,7 @@
/* */
/* FreeType path stroker (body). */
/* */
-/* Copyright 2002-2006, 2008-2011 by */
+/* Copyright 2002-2006, 2008-2011, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -795,7 +795,7 @@
if ( !library )
- return FT_Err_Invalid_Argument;
+ return FT_THROW( Invalid_Argument );
memory = library->memory;
@@ -1954,7 +1954,7 @@
if ( !stroker || border > 1 )
{
- error = FT_Err_Invalid_Argument;
+ error = FT_THROW( Invalid_Argument );
goto Exit;
}
@@ -2060,7 +2060,7 @@
if ( !outline || !stroker )
- return FT_Err_Invalid_Argument;
+ return FT_THROW( Invalid_Argument );
FT_Stroker_Rewind( stroker );
@@ -2238,7 +2238,7 @@
return error;
Invalid_Outline:
- return FT_Err_Invalid_Outline;
+ return FT_THROW( Invalid_Outline );
}
@@ -2258,7 +2258,7 @@
FT_Stroker stroker,
FT_Bool destroy )
{
- FT_Error error = FT_Err_Invalid_Argument;
+ FT_Error error = FT_ERR( Invalid_Argument );
FT_Glyph glyph = NULL;
FT_Library library = stroker->library;
@@ -2334,7 +2334,7 @@
FT_Bool inside,
FT_Bool destroy )
{
- FT_Error error = FT_Err_Invalid_Argument;
+ FT_Error error = FT_ERR( Invalid_Argument );
FT_Glyph glyph = NULL;
FT_Library library = stroker->library;