minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* 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.
This commit is contained in:
Werner Lemberg 2007-01-13 08:45:00 +00:00
parent 27cf9de104
commit 23df31adcc
9 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2007-01-13 Werner Lemberg <wl@gnu.org>
* 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 <david@freetype.org> 2007-01-12 David Turner <david@freetype.org>
* src/base/ftbitmap.c (ft_bitmap_assure_buffer): Fix memory stomping * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Fix memory stomping

6
modules.cfg
View File

@ -211,14 +211,14 @@ BASE_EXTENSIONS += ftwinfnt.c
# See include/freetype/ftxf86.h for the API. # See include/freetype/ftxf86.h for the API.
BASE_EXTENSIONS += ftxf86.c 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. # See include/freetype/ftlcdfil.h for the API.
BASE_EXTENSIONS += ftlcdfil.c 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 BASE_EXTENSIONS += ftgasp.c
#### ####

8
src/autofit/afhints.c
View File

@ -4,7 +4,7 @@
/* */ /* */
/* Auto-fitter hinting routines (body). */ /* 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. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -191,7 +191,7 @@
void void
af_glyph_hints_dump_segments( AF_GlyphHints hints ) af_glyph_hints_dump_segments( AF_GlyphHints hints )
{ {
FT_Int dimension; FT_Int dimension;
for ( dimension = 1; dimension >= 0; dimension-- ) for ( dimension = 1; dimension >= 0; dimension-- )
@ -212,7 +212,7 @@
printf ( " [ %5d | %4d | %5s | %4d | %5d | %5d | %5d ]\n", printf ( " [ %5d | %4d | %5s | %4d | %5d | %5d | %5d ]\n",
seg - segments, seg - segments,
(int)seg->pos, (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->link, segments ),
AF_INDEX_NUM( seg->serif, segments ), AF_INDEX_NUM( seg->serif, segments ),
seg->height, seg->height,
@ -252,7 +252,7 @@
" %5d | %c | %5.2f | %5.2f ]\n", " %5d | %c | %5.2f | %5.2f ]\n",
edge - edges, edge - edges,
(int)edge->fpos, (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->link, edges ),
AF_INDEX_NUM( edge->serif, edges ), AF_INDEX_NUM( edge->serif, edges ),
edge->blue_edge ? 'y' : 'n', edge->blue_edge ? 'y' : 'n',

8
src/base/ftoutln.c
View File

@ -4,7 +4,7 @@
/* */ /* */
/* FreeType outline management (body). */ /* 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. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -946,9 +946,9 @@
FT_Vector* prev; FT_Vector* prev;
FT_Vector* point; FT_Vector* point;
int i; int i;
FT_Pos ray_y[3]; FT_Pos ray_y[3];
int result[3]; FT_Orientation result[3];
if ( !outline || outline->n_points <= 0 ) if ( !outline || outline->n_points <= 0 )

1
src/base/rules.mk
View File

@ -44,7 +44,6 @@ BASE_SRC := $(BASE_DIR)/ftcalc.c \
$(BASE_DIR)/ftrfork.c \ $(BASE_DIR)/ftrfork.c \
$(BASE_DIR)/ftstream.c \ $(BASE_DIR)/ftstream.c \
$(BASE_DIR)/fttrigon.c \ $(BASE_DIR)/fttrigon.c \
$(BASE_DIR)/ftgasp.c \
$(BASE_DIR)/ftutil.c $(BASE_DIR)/ftutil.c
# Base layer `extensions' sources # Base layer `extensions' sources

3
src/sfnt/rules.mk
View File

@ -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. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # 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)/ttmtx.c \
$(SFNT_DIR)/ttcmap.c \ $(SFNT_DIR)/ttcmap.c \
$(SFNT_DIR)/ttsbit.c \ $(SFNT_DIR)/ttsbit.c \
$(SFNT_DIR)/ttsbit0.c \
$(SFNT_DIR)/ttpost.c \ $(SFNT_DIR)/ttpost.c \
$(SFNT_DIR)/ttkern.c \ $(SFNT_DIR)/ttkern.c \
$(SFNT_DIR)/ttbdf.c \ $(SFNT_DIR)/ttbdf.c \

4
src/sfnt/ttsbit.c
View File

@ -28,7 +28,7 @@
#include "ttsbit0.c" #include "ttsbit0.c"
#else /* !OPTIMIZE_MEMORY || OLD_INTERNALS */ #else /* !FT_CONFIG_OPTION_OLD_INTERNALS */
#include <ft2build.h> #include <ft2build.h>
#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_DEBUG_H
@ -1495,7 +1495,7 @@
return error; return error;
} }
#endif /* !OPTIMIZE_MEMORY || OLD_INTERNALS */ #endif /* !FT_CONFIG_OPTION_OLD_INTERNALS */
/* END */ /* END */

5
src/sfnt/ttsbit0.c
View File

@ -5,7 +5,7 @@
/* TrueType and OpenType embedded bitmap support (body). */ /* TrueType and OpenType embedded bitmap support (body). */
/* This is a heap-optimized version. */ /* This is a heap-optimized version. */
/* */ /* */
/* Copyright 2005, 2006 by */ /* Copyright 2005, 2006, 2007 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* 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 <ft2build.h> #include <ft2build.h>
#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H #include FT_INTERNAL_STREAM_H

7
src/sfnt/ttsbit0.h
View File

@ -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.
*
*/