diff options
| author | Werner Lemberg <wl@gnu.org> | 2013-03-14 10:27:35 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2013-03-14 10:27:35 +0100 |
| commit | 059bc335ce42220b222763379e89d0cbf2b949eb (patch) | |
| tree | 664afa6d13d54d6bd82e431d2b114a31e0b91a5b /src/base/ftgloadr.c | |
| parent | c58ce3beee198cff82269a482cd3f6d4c7d43511 (diff) | |
| download | freetype2-059bc335ce42220b222763379e89d0cbf2b949eb.tar.gz | |
*/*: Use `FT_THROW'.
This is essentially a mechanical conversion, adding inclusion of
`FT_INTERNAL_DEBUG_H' where necessary, and providing the macros for
stand-alone compiling modes of the rasterizer modules.
To convert the remaining occurrences of FT_Err_XXX and friends it is
necessary to rewrite the code. Note, however, that it doesn't harm
if some cases are not handled since FT_THROW is a no-op.
Diffstat (limited to 'src/base/ftgloadr.c')
| -rw-r--r-- | src/base/ftgloadr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c index 3a5615e5e..663db2636 100644 --- a/src/base/ftgloadr.c +++ b/src/base/ftgloadr.c @@ -4,7 +4,7 @@ /* */ /* The FreeType glyph loader (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2006, 2010 by */ +/* Copyright 2002-2006, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,7 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_GLYPH_LOADER_H #include FT_INTERNAL_MEMORY_H #include FT_INTERNAL_OBJECTS_H @@ -219,7 +220,7 @@ new_max = FT_PAD_CEIL( new_max, 8 ); if ( new_max > FT_OUTLINE_POINTS_MAX ) - return FT_Err_Array_Too_Large; + return FT_THROW( Array_Too_Large ); if ( FT_RENEW_ARRAY( base->points, old_max, new_max ) || FT_RENEW_ARRAY( base->tags, old_max, new_max ) ) @@ -251,7 +252,7 @@ new_max = FT_PAD_CEIL( new_max, 4 ); if ( new_max > FT_OUTLINE_CONTOURS_MAX ) - return FT_Err_Array_Too_Large; + return FT_THROW( Array_Too_Large ); if ( FT_RENEW_ARRAY( base->contours, old_max, new_max ) ) goto Exit; |