Index: src/raster/ftrend1.c |
diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c |
index 859cb7d864f7c91a6cdaed76be10343f453506c2..aa7f6d56649a001dca03237ca1cd6f6831d38580 100644 |
--- a/src/raster/ftrend1.c |
+++ b/src/raster/ftrend1.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* The FreeType glyph rasterizer interface (body). */ |
/* */ |
-/* Copyright 1996-2003, 2005, 2006, 2011 by */ |
+/* Copyright 1996-2003, 2005, 2006, 2011, 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_OBJECTS_H |
#include FT_OUTLINE_H |
#include "ftrend1.h" |
@@ -37,7 +38,7 @@ |
library->raster_pool, |
library->raster_pool_size ); |
- return Raster_Err_Ok; |
+ return FT_Err_Ok; |
} |
@@ -61,12 +62,12 @@ |
const FT_Matrix* matrix, |
const FT_Vector* delta ) |
{ |
- FT_Error error = Raster_Err_Ok; |
+ FT_Error error = FT_Err_Ok; |
if ( slot->format != render->glyph_format ) |
{ |
- error = Raster_Err_Invalid_Argument; |
+ error = FT_THROW( Invalid_Argument ); |
goto Exit; |
} |
@@ -114,7 +115,7 @@ |
/* check glyph image format */ |
if ( slot->format != render->glyph_format ) |
{ |
- error = Raster_Err_Invalid_Argument; |
+ error = FT_THROW( Invalid_Argument ); |
goto Exit; |
} |
@@ -124,13 +125,13 @@ |
{ |
/* raster1 is only capable of producing monochrome bitmaps */ |
if ( render->clazz == &ft_raster1_renderer_class ) |
- return Raster_Err_Cannot_Render_Glyph; |
+ return FT_THROW( Cannot_Render_Glyph ); |
} |
else |
{ |
/* raster5 is only capable of producing 5-gray-levels bitmaps */ |
if ( render->clazz == &ft_raster5_renderer_class ) |
- return Raster_Err_Cannot_Render_Glyph; |
+ return FT_THROW( Cannot_Render_Glyph ); |
} |
#else /* FT_CONFIG_OPTION_PIC */ |
/* When PIC is enabled, we cannot get to the class object */ |
@@ -142,13 +143,13 @@ |
{ |
/* raster1 is only capable of producing monochrome bitmaps */ |
if ( render->clazz->root.module_name[6] == '1' ) |
- return Raster_Err_Cannot_Render_Glyph; |
+ return FT_THROW( Cannot_Render_Glyph ); |
} |
else |
{ |
/* raster5 is only capable of producing 5-gray-levels bitmaps */ |
if ( render->clazz->root.module_name[6] == '5' ) |
- return Raster_Err_Cannot_Render_Glyph; |
+ return FT_THROW( Cannot_Render_Glyph ); |
} |
#endif /* FT_CONFIG_OPTION_PIC */ |
@@ -179,7 +180,7 @@ |
if ( width > FT_USHORT_MAX || height > FT_USHORT_MAX ) |
{ |
- error = Raster_Err_Invalid_Argument; |
+ error = FT_THROW( Invalid_Argument ); |
goto Exit; |
} |