ref: 4309edccfdd515685caeb4920f2825d665d22abc
parent: ea4c3dc4853aeddbc5364223cf0e825b65cb574e
author: Werner Lemberg <[email protected]>
date: Fri Nov 11 10:49:14 EST 2005
* 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.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-10 Werner Lemberg <[email protected]>
+
+ * src/autofit/afangles.c, src/autofit/aftypes.h (af_angle_diff):
+ Comment out. Unused.
+
+2005-11-10 Christian Biesinger <[email protected]>
+
+ * 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 <[email protected]>
* src/type1/t1afm.c (T1_Read_PFM): Zero offset means `no kerning
--- a/builds/beos/beos.mk
+++ b/builds/beos/beos.mk
@@ -2,7 +2,7 @@
# 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.
#
# 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
# fully.
-include $(TOP_DIR)/builds/compiler/ansi-cc.mk
include $(TOP_DIR)/builds/beos/beos-def.mk
+include $(TOP_DIR)/builds/compiler/ansi-cc.mk
include $(TOP_DIR)/builds/link_std.mk
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -100,6 +100,7 @@
#
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-rpath $(libdir) -version-info $(version_info) \
- $(LDFLAGS) -export-symbols $(EXPORTS_LIST)
+ $(LDFLAGS) -export-symbols $(EXPORTS_LIST) \
+ -no-undefined
# EOF
--- a/src/autofit/afangles.c
+++ b/src/autofit/afangles.c
@@ -322,9 +322,7 @@
return v.y;
}
-#endif /* 0 */
-
FT_LOCAL_DEF( AF_Angle )
af_angle_diff( AF_Angle angle1,
AF_Angle angle2 )
@@ -341,6 +339,8 @@
return delta;
}
+
+#endif /* 0 */
FT_LOCAL_DEF( void )
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -125,6 +125,7 @@
FT_Pos dy );
+#if 0
/*
* compute `angle2 - angle1'; the result is always within
* the range [-AF_ANGLE_PI .. AF_ANGLE_PI - 1]
@@ -132,21 +133,24 @@
FT_LOCAL( AF_Angle )
af_angle_diff( AF_Angle angle1,
AF_Angle angle2 );
+#endif /* 0 */
-#define AF_ANGLE_DIFF(result,angle1,angle2) \
- FT_BEGIN_STMNT \
- AF_Angle _delta = (angle2) - (angle1); \
- \
- \
- _delta %= AF_ANGLE_2PI; \
- if ( _delta < 0 ) \
- _delta += AF_ANGLE_2PI; \
- \
- if ( _delta > AF_ANGLE_PI ) \
- _delta -= AF_ANGLE_2PI; \
- \
- result = _delta; \
+
+#define AF_ANGLE_DIFF( result, angle1, angle2 ) \
+ FT_BEGIN_STMNT \
+ AF_Angle _delta = (angle2) - (angle1); \
+ \
+ \
+ _delta %= AF_ANGLE_2PI; \
+ if ( _delta < 0 ) \
+ _delta += AF_ANGLE_2PI; \
+ \
+ if ( _delta > AF_ANGLE_PI ) \
+ _delta -= AF_ANGLE_2PI; \
+ \
+ result = _delta; \
FT_END_STMNT
+
/*************************************************************************/
/*************************************************************************/