From 68d4cedb8726fa239f56d62060d8fee7e09cb8be Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 21 Jun 2004 18:04:02 +0000 Subject: [PATCH] Use the gcc-3.3 strict-aliasing compatible macros from fterrcompat.h Mon Jun 21 13:55:17 2004 Owen Taylor * pango/opentype/otlbuffer.c: Use the gcc-3.3 strict-aliasing compatible macros from fterrcompat.h (#140495, reported by Stanislav Brabec) --- src/otlbuffer.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/otlbuffer.c b/src/otlbuffer.c index bb0d5e4..6c9c036 100644 --- a/src/otlbuffer.c +++ b/src/otlbuffer.c @@ -15,6 +15,12 @@ #include FT_INTERNAL_MEMORY_H +/* To get the gcc-3.3 strict-aliasing compatible versions + * FREE/REALLOC_ARRAY/etc. rather than the FT_* versions + * that + */ +#include "fterrcompat.h" + static FT_Error otl_buffer_ensure( OTL_Buffer buffer, FT_ULong size ) @@ -29,11 +35,11 @@ while (size > new_allocated) new_allocated += (new_allocated >> 1) + 8; - if ( FT_REALLOC_ARRAY( buffer->in_string, buffer->allocated, new_allocated, OTL_GlyphItemRec ) ) + if ( REALLOC_ARRAY( buffer->in_string, buffer->allocated, new_allocated, OTL_GlyphItemRec ) ) return error; - if ( FT_REALLOC_ARRAY( buffer->out_string, buffer->allocated, new_allocated, OTL_GlyphItemRec ) ) + if ( REALLOC_ARRAY( buffer->out_string, buffer->allocated, new_allocated, OTL_GlyphItemRec ) ) return error; - if ( FT_REALLOC_ARRAY( buffer->positions, buffer->allocated, new_allocated, OTL_PositionRec ) ) + if ( REALLOC_ARRAY( buffer->positions, buffer->allocated, new_allocated, OTL_PositionRec ) ) return error; buffer->allocated = new_allocated; @@ -48,7 +54,7 @@ { FT_Error error; - if ( FT_ALLOC( *buffer, sizeof( OTL_BufferRec ) ) ) + if ( ALLOC( *buffer, sizeof( OTL_BufferRec ) ) ) return error; (*buffer)->memory = memory; @@ -89,10 +95,10 @@ { FT_Memory memory = buffer->memory; - FT_FREE( buffer->in_string ); - FT_FREE( buffer->out_string ); - FT_FREE( buffer->positions ); - FT_FREE( buffer ); + FREE( buffer->in_string ); + FREE( buffer->out_string ); + FREE( buffer->positions ); + FREE( buffer ); return FT_Err_Ok; } -- 2.7.4