Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15587
Modified Files:
ChangeLog configure.ac
Log Message:
Clean up of breakage from Windows font support check-in.
Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** configure.ac 12 Aug 2006 05:14:58 -0000 1.92
--- configure.ac 22 Sep 2006 01:06:06 -0000 1.93
***************
*** 80,83 ****
--- 80,107 ----
PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config])
+ #
+ # FreeType >= 2.2 uses const in callback function signatures. This
+ # doesn't cause an error in C; but it does in C++.
+ #
+ AS_IF([test -n "${FREETYPE_CONFIG}"],
+ [AC_MSG_CHECKING([if FreeType callback function signatures use const])
+ AC_CACHE_VAL([ov_cv_ft_const],
+ [AC_LANG_PUSH([C++])
+ save_CXXFLAGS="${CXXFLAGS}"
+ CXXFLAGS="${CXXFLAGS} `${FREETYPE_CONFIG} --cflags`"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+ [#include <ft2build.h>
+ #include FT_OUTLINE_H
+ int moveTo(const FT_Vector *, void *);],
+ [FT_Outline_MoveToFunc f = moveTo])],
+ [ov_cv_ft_const=const],
+ [ov_cv_ft_const= ])
+ CXXFLAGS="${save_CXXFLAGS}"
+ AC_LANG_POP])
+ AS_IF([test -n "$ov_cv_ft_const"],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
+ ])
+
PKG_CHECK_MODULES([JS], [$REQUIRE_MOZILLA_JS], , [have_js=no])
***************
*** 176,179 ****
--- 200,205 ----
AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1],
[Defined if support for rendering Text nodes is enabled.])
+ AC_DEFINE_UNQUOTED([OPENVRML_FT_CONST], [$ov_cv_ft_const],
+ [const for FreeType callback function signatures.])
fi
AC_SUBST([FONTCONFIG_CFLAGS])
Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1330
retrieving revision 1.1331
diff -C2 -d -r1.1330 -r1.1331
*** ChangeLog 20 Sep 2006 01:25:55 -0000 1.1330
--- ChangeLog 22 Sep 2006 01:06:06 -0000 1.1331
***************
*** 1,2 ****
--- 1,23 ----
+ 2006-09-21 Braden McDaniel <br...@en...>
+
+ Clean up of breakage from Windows font support check-in.
+
+ * configure.ac: Check to see whether FreeType function callback
+ signatures need const.
+ * src/libopenvrml/openvrml/vrml97node.cpp
+ (text_node::update_face()): Use
+ boost::ignore_unused_variable_warning to quell warnings about
+ scope_guard variables. Use unsigned_char_string instead of
+ obsoleted FcChar8_string type. Revert face_index to an int; the
+ fontconfig API doesn't like FT_Long.
+ (moveTo_(const FT_Vector *, void *)): Use OPENVRML_FT_CONST macro
+ in function signature.
+ (lineTo_(const FT_Vector *, void *)): Use OPENVRML_FT_CONST macro
+ in function signature.
+ (conicTo_(const FT_Vector *, const FT_Vector *, void *)): Use
+ OPENVRML_FT_CONST macro in function signature.
+ (cubicTo_(const FT_Vector *, const FT_Vector *, const FT_Vector *,
+ void *)): Use OPENVRML_FT_CONST macro in function signature.
+
2006-09-19 Braden McDaniel <br...@en...>
|
