walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the gcc-3.3 strict-aliasing compatible macros from fterrcompat.h 

Mon Jun 21 13:55:17 2004  Owen Taylor  <otaylor@redhat.com>

        * pango/opentype/otlbuffer.c: Use the gcc-3.3
        strict-aliasing compatible macros from fterrcompat.h
        (#140495, reported by Stanislav Brabec)
This commit is contained in:
Owen Taylor 2004-06-21 18:04:02 +00:00 committed by Owen Taylor
parent b327765176
commit 68d4cedb87
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/otlbuffer.c
View File

@ -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;
}