* src/autofit/afangles.c, src/autofit/aftypes.h (af_angle_diff):

Comment out.  Unused.


* builds/beos/beos.mk: Call beos-def.mk before anything else to
define the separator.

* builds/unix/unix-cc.in (LINK_LIBRARY): Add `-no-undefined' flag.
This commit is contained in:
Werner Lemberg 2005-11-11 15:49:14 +00:00
parent ea4c3dc485
commit 4309edccfd
5 changed files with 35 additions and 18 deletions

View File

@ -1,3 +1,15 @@
2005-11-10 Werner Lemberg <wl@gnu.org>
* src/autofit/afangles.c, src/autofit/aftypes.h (af_angle_diff):
Comment out. Unused.
2005-11-10 Christian Biesinger <cbiesinger@web.de>
* builds/beos/beos.mk: Call beos-def.mk before anything else to
define the separator.
* builds/unix/unix-cc.in (LINK_LIBRARY): Add `-no-undefined' flag.
2005-11-07 Werner Lemberg <wl@gnu.org> 2005-11-07 Werner Lemberg <wl@gnu.org>
* src/type1/t1afm.c (T1_Read_PFM): Zero offset means `no kerning * src/type1/t1afm.c (T1_Read_PFM): Zero offset means `no kerning

View File

@ -2,7 +2,7 @@
# FreeType 2 configuration rules for a BeOS system # FreeType 2 configuration rules for a BeOS system
# #
# Copyright 1996-2000, 2002 by # Copyright 1996-2000, 2002, 2005 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,
@ -11,8 +11,8 @@
# indicate that you have read the license and understand and accept it # indicate that you have read the license and understand and accept it
# fully. # fully.
include $(TOP_DIR)/builds/compiler/ansi-cc.mk
include $(TOP_DIR)/builds/beos/beos-def.mk include $(TOP_DIR)/builds/beos/beos-def.mk
include $(TOP_DIR)/builds/compiler/ansi-cc.mk
include $(TOP_DIR)/builds/link_std.mk include $(TOP_DIR)/builds/link_std.mk

View File

@ -100,6 +100,7 @@ CCexe := $(CCraw) # used to compile "apinames" only
# #
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-rpath $(libdir) -version-info $(version_info) \ -rpath $(libdir) -version-info $(version_info) \
$(LDFLAGS) -export-symbols $(EXPORTS_LIST) $(LDFLAGS) -export-symbols $(EXPORTS_LIST) \
-no-undefined
# EOF # EOF

View File

@ -322,8 +322,6 @@ for n in r:
return v.y; return v.y;
} }
#endif /* 0 */
FT_LOCAL_DEF( AF_Angle ) FT_LOCAL_DEF( AF_Angle )
af_angle_diff( AF_Angle angle1, af_angle_diff( AF_Angle angle1,
@ -342,6 +340,8 @@ for n in r:
return delta; return delta;
} }
#endif /* 0 */
FT_LOCAL_DEF( void ) FT_LOCAL_DEF( void )
af_sort_pos( FT_UInt count, af_sort_pos( FT_UInt count,

View File

@ -125,6 +125,7 @@ FT_BEGIN_HEADER
FT_Pos dy ); FT_Pos dy );
#if 0
/* /*
* compute `angle2 - angle1'; the result is always within * compute `angle2 - angle1'; the result is always within
* the range [-AF_ANGLE_PI .. AF_ANGLE_PI - 1] * the range [-AF_ANGLE_PI .. AF_ANGLE_PI - 1]
@ -132,22 +133,25 @@ FT_BEGIN_HEADER
FT_LOCAL( AF_Angle ) FT_LOCAL( AF_Angle )
af_angle_diff( AF_Angle angle1, af_angle_diff( AF_Angle angle1,
AF_Angle angle2 ); AF_Angle angle2 );
#endif /* 0 */
#define AF_ANGLE_DIFF(result,angle1,angle2) \
FT_BEGIN_STMNT \ #define AF_ANGLE_DIFF( result, angle1, angle2 ) \
AF_Angle _delta = (angle2) - (angle1); \ FT_BEGIN_STMNT \
\ AF_Angle _delta = (angle2) - (angle1); \
\ \
_delta %= AF_ANGLE_2PI; \ \
if ( _delta < 0 ) \ _delta %= AF_ANGLE_2PI; \
_delta += AF_ANGLE_2PI; \ if ( _delta < 0 ) \
\ _delta += AF_ANGLE_2PI; \
if ( _delta > AF_ANGLE_PI ) \ \
_delta -= AF_ANGLE_2PI; \ if ( _delta > AF_ANGLE_PI ) \
\ _delta -= AF_ANGLE_2PI; \
result = _delta; \ \
result = _delta; \
FT_END_STMNT FT_END_STMNT
/*************************************************************************/ /*************************************************************************/
/*************************************************************************/ /*************************************************************************/
/***** *****/ /***** *****/