Index: src/base/ftutil.c |
diff --git a/src/base/ftutil.c b/src/base/ftutil.c |
index 5f77be557ad0eb9aa947058b09bf8b80ccdbc94a..879d0275291107726420ea23b0568aa00211cbd2 100644 |
--- a/src/base/ftutil.c |
+++ b/src/base/ftutil.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* FreeType utility file for memory and list management (body). */ |
/* */ |
-/* Copyright 2002, 2004, 2005, 2006, 2007 by */ |
+/* Copyright 2002, 2004-2007, 2013 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -75,12 +75,12 @@ |
{ |
block = memory->alloc( memory, size ); |
if ( block == NULL ) |
- error = FT_Err_Out_Of_Memory; |
+ error = FT_THROW( Out_Of_Memory ); |
} |
else if ( size < 0 ) |
{ |
/* may help catch/prevent security issues */ |
- error = FT_Err_Invalid_Argument; |
+ error = FT_THROW( Invalid_Argument ); |
} |
*p_error = error; |
@@ -98,6 +98,7 @@ |
{ |
FT_Error error = FT_Err_Ok; |
+ |
block = ft_mem_qrealloc( memory, item_size, |
cur_count, new_count, block, &error ); |
if ( !error && new_count > cur_count ) |
@@ -127,7 +128,7 @@ |
if ( cur_count < 0 || new_count < 0 || item_size < 0 ) |
{ |
/* may help catch/prevent nasty security issues */ |
- error = FT_Err_Invalid_Argument; |
+ error = FT_THROW( Invalid_Argument ); |
} |
else if ( new_count == 0 || item_size == 0 ) |
{ |
@@ -136,7 +137,7 @@ |
} |
else if ( new_count > FT_INT_MAX/item_size ) |
{ |
- error = FT_Err_Array_Too_Large; |
+ error = FT_THROW( Array_Too_Large ); |
} |
else if ( cur_count == 0 ) |
{ |
@@ -153,7 +154,7 @@ |
block2 = memory->realloc( memory, cur_size, new_size, block ); |
if ( block2 == NULL ) |
- error = FT_Err_Out_Of_Memory; |
+ error = FT_THROW( Out_Of_Memory ); |
else |
block = block2; |
} |
@@ -432,70 +433,4 @@ |
} |
-#ifdef FT_CONFIG_OPTION_OLD_INTERNALS |
- |
- FT_BASE_DEF( FT_Error ) |
- FT_Alloc( FT_Memory memory, |
- FT_Long size, |
- void* *P ) |
- { |
- FT_Error error; |
- |
- |
- (void)FT_ALLOC( *P, size ); |
- return error; |
- } |
- |
- |
- FT_BASE_DEF( FT_Error ) |
- FT_QAlloc( FT_Memory memory, |
- FT_Long size, |
- void* *p ) |
- { |
- FT_Error error; |
- |
- |
- (void)FT_QALLOC( *p, size ); |
- return error; |
- } |
- |
- |
- FT_BASE_DEF( FT_Error ) |
- FT_Realloc( FT_Memory memory, |
- FT_Long current, |
- FT_Long size, |
- void* *P ) |
- { |
- FT_Error error; |
- |
- |
- (void)FT_REALLOC( *P, current, size ); |
- return error; |
- } |
- |
- |
- FT_BASE_DEF( FT_Error ) |
- FT_QRealloc( FT_Memory memory, |
- FT_Long current, |
- FT_Long size, |
- void* *p ) |
- { |
- FT_Error error; |
- |
- |
- (void)FT_QREALLOC( *p, current, size ); |
- return error; |
- } |
- |
- |
- FT_BASE_DEF( void ) |
- FT_Free( FT_Memory memory, |
- void* *P ) |
- { |
- if ( *P ) |
- FT_MEM_FREE( *P ); |
- } |
- |
-#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ |
- |
/* END */ |