[raster] Improvements for stand-alone mode.

* src/raster/rules.mk: Don't handle ftmisc.h.  It is needed for
stand-alone mode only.

* src/raster/ftmisc.h (FT_MemoryRec , FT_Alloc_Func, FT_Free_Func,
FT_Realloc_Func): Copy declarations from ftsystem.h.
This commit is contained in:
Werner Lemberg 2009-09-03 13:14:24 +02:00
parent 4694ea2b95
commit 5e240c1270
3 changed files with 36 additions and 2 deletions

View File

@ -1,3 +1,13 @@
2009-09-03 Werner Lemberg <wl@gnu.org>
[raster] Improvements for stand-alone mode.
* src/raster/rules.mk: Don't handle ftmisc.h. It is needed for
stand-alone mode only.
* src/raster/ftmisc.h (FT_MemoryRec , FT_Alloc_Func, FT_Free_Func,
FT_Realloc_Func): Copy declarations from ftsystem.h.
2009-09-02 Bram Tassyns <bramt@enfocus.be>
Improve vertical metrics calculation (Savannah bug #27364).

View File

@ -52,6 +52,31 @@
(FT_ULong)_x4 )
/* from include/freetype2/ftsystem.h */
typedef struct FT_MemoryRec_* FT_Memory;
typedef void* (*FT_Alloc_Func)( FT_Memory memory,
long size );
typedef void (*FT_Free_Func)( FT_Memory memory,
void* block );
typedef void* (*FT_Realloc_Func)( FT_Memory memory,
long cur_size,
long new_size,
void* block );
typedef struct FT_MemoryRec_
{
void* user;
FT_Alloc_Func alloc;
FT_Free_Func free;
FT_Realloc_Func realloc;
} FT_MemoryRec;
/* from src/ftcalc.c */
#include <inttypes.h>

View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2001, 2003, 2008 by
# Copyright 1996-2000, 2001, 2003, 2008, 2009 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -31,7 +31,6 @@ RASTER_DRV_SRC := $(RASTER_DIR)/ftraster.c \
# raster driver headers
#
RASTER_DRV_H := $(RASTER_DRV_SRC:%.c=%.h) \
$(RASTER_DIR)/ftmisc.h \
$(RASTER_DIR)/rasterrs.h