diff --git a/ChangeLog b/ChangeLog index 638b9fa79..b4c83d93f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2007-01-13 Werner Lemberg + + * src/base/ftoutln.c (FT_Outline_Get_Orientation): Fix compilation + with C++ compiler. + + * src/autofit/afhints.c (af_glyph_hints_dump_segments, + af_glyph_hints_dump_edges): Ditto. + + * src/base/rules.mk (BASE_SRC): Remove ftgasp.c (it's already in + `modules.cfg'). + + * src/sfnt/ttsbit0.h: Remove. + + * src/sfnt/rules.mk (SFNT_DRV_SRC): Don't include ttsbit0.c. + 2007-01-12 David Turner * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Fix memory stomping diff --git a/modules.cfg b/modules.cfg index 6f1d084b3..a05ecb19e 100644 --- a/modules.cfg +++ b/modules.cfg @@ -211,14 +211,14 @@ BASE_EXTENSIONS += ftwinfnt.c # See include/freetype/ftxf86.h for the API. BASE_EXTENSIONS += ftxf86.c -# Support for LCD color filtering of subpixel bitmaps +# Support for LCD color filtering of subpixel bitmaps. # # See include/freetype/ftlcdfil.h for the API. BASE_EXTENSIONS += ftlcdfil.c -# Support for GASP table queries +# Support for GASP table queries. # -# See include/freetype/ftgasp.h for the API +# See include/freetype/ftgasp.h for the API. BASE_EXTENSIONS += ftgasp.c #### diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c index d682ddbd4..65a46620d 100644 --- a/src/autofit/afhints.c +++ b/src/autofit/afhints.c @@ -4,7 +4,7 @@ /* */ /* Auto-fitter hinting routines (body). */ /* */ -/* Copyright 2003, 2004, 2005, 2006 by */ +/* Copyright 2003, 2004, 2005, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -191,7 +191,7 @@ void af_glyph_hints_dump_segments( AF_GlyphHints hints ) { - FT_Int dimension; + FT_Int dimension; for ( dimension = 1; dimension >= 0; dimension-- ) @@ -212,7 +212,7 @@ printf ( " [ %5d | %4d | %5s | %4d | %5d | %5d | %5d ]\n", seg - segments, (int)seg->pos, - af_dir_str( seg->dir ), + af_dir_str( (AF_Direction)seg->dir ), AF_INDEX_NUM( seg->link, segments ), AF_INDEX_NUM( seg->serif, segments ), seg->height, @@ -252,7 +252,7 @@ " %5d | %c | %5.2f | %5.2f ]\n", edge - edges, (int)edge->fpos, - af_dir_str( edge->dir ), + af_dir_str( (AF_Direction)edge->dir ), AF_INDEX_NUM( edge->link, edges ), AF_INDEX_NUM( edge->serif, edges ), edge->blue_edge ? 'y' : 'n', diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index 46868d05a..2a35659e1 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -4,7 +4,7 @@ /* */ /* FreeType outline management (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -946,9 +946,9 @@ FT_Vector* prev; FT_Vector* point; - int i; - FT_Pos ray_y[3]; - int result[3]; + int i; + FT_Pos ray_y[3]; + FT_Orientation result[3]; if ( !outline || outline->n_points <= 0 ) diff --git a/src/base/rules.mk b/src/base/rules.mk index 9079b4e36..d6e441254 100644 --- a/src/base/rules.mk +++ b/src/base/rules.mk @@ -44,7 +44,6 @@ BASE_SRC := $(BASE_DIR)/ftcalc.c \ $(BASE_DIR)/ftrfork.c \ $(BASE_DIR)/ftstream.c \ $(BASE_DIR)/fttrigon.c \ - $(BASE_DIR)/ftgasp.c \ $(BASE_DIR)/ftutil.c # Base layer `extensions' sources diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk index fb15dd616..ff7840e7f 100644 --- a/src/sfnt/rules.mk +++ b/src/sfnt/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2002, 2003, 2004, 2005, 2006 by +# Copyright 1996-2000, 2002, 2003, 2004, 2005, 2006, 2007 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -29,7 +29,6 @@ SFNT_DRV_SRC := $(SFNT_DIR)/ttload.c \ $(SFNT_DIR)/ttmtx.c \ $(SFNT_DIR)/ttcmap.c \ $(SFNT_DIR)/ttsbit.c \ - $(SFNT_DIR)/ttsbit0.c \ $(SFNT_DIR)/ttpost.c \ $(SFNT_DIR)/ttkern.c \ $(SFNT_DIR)/ttbdf.c \ diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c index 50d6ec3ea..eff49dadd 100644 --- a/src/sfnt/ttsbit.c +++ b/src/sfnt/ttsbit.c @@ -28,7 +28,7 @@ #include "ttsbit0.c" -#else /* !OPTIMIZE_MEMORY || OLD_INTERNALS */ +#else /* !FT_CONFIG_OPTION_OLD_INTERNALS */ #include #include FT_INTERNAL_DEBUG_H @@ -1495,7 +1495,7 @@ return error; } -#endif /* !OPTIMIZE_MEMORY || OLD_INTERNALS */ +#endif /* !FT_CONFIG_OPTION_OLD_INTERNALS */ /* END */ diff --git a/src/sfnt/ttsbit0.c b/src/sfnt/ttsbit0.c index aae2cae7e..38aeb662f 100644 --- a/src/sfnt/ttsbit0.c +++ b/src/sfnt/ttsbit0.c @@ -5,7 +5,7 @@ /* TrueType and OpenType embedded bitmap support (body). */ /* This is a heap-optimized version. */ /* */ -/* Copyright 2005, 2006 by */ +/* Copyright 2005, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,9 @@ /***************************************************************************/ +/* This file is included by ttsbit.c */ + + #include #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H diff --git a/src/sfnt/ttsbit0.h b/src/sfnt/ttsbit0.h deleted file mode 100644 index 396ddc555..000000000 --- a/src/sfnt/ttsbit0.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * ttsbit0.h - * - * This is a dummy file, used to please the build system. It is never - * included by the sfnt sources. - * - */