From: <br...@us...> - 2010-05-03 03:50:29
|
Revision: 4141 http://openvrml.svn.sourceforge.net/openvrml/?rev=4141&view=rev Author: braden Date: 2010-05-03 03:50:23 +0000 (Mon, 03 May 2010) Log Message: ----------- fcfreetype.h is C++-safe in fontconfig >= 2.3.0. It should be safe to require at least that version. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/src/node/vrml97/text.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-03 02:00:42 UTC (rev 4140) +++ trunk/ChangeLog 2010-05-03 03:50:23 UTC (rev 4141) @@ -1,5 +1,14 @@ 2010-05-02 Braden McDaniel <br...@en...> + fcfreetype.h is C++-safe in fontconfig >= 2.3.0. It should be + safe to require at least that version. + + * configure.ac: Require fontconfig >= 2.3.0. + * src/node/vrml97/text.cpp: Don't need to wrap fcfreetype.h in + 'extern "C"' anymore. + +2010-05-02 Braden McDaniel <br...@en...> + Added exception specifications for text_node::glyph_geometry and text_node::line_geometry member functions. Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2010-05-03 02:00:42 UTC (rev 4140) +++ trunk/configure.ac 2010-05-03 03:50:23 UTC (rev 4141) @@ -127,7 +127,10 @@ [AC_MSG_FAILURE([libxml not found])]) PKG_CHECK_MODULES([PNG], [libpng], , [have_libpng=no]) -PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], , [have_fontconfig=no]) +# +# fcfreetype.h is C++-safe in fontconfig >= 2.3.0. +# +PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.3.0], , [have_fontconfig=no]) PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 2.2], , [have_freetype=no]) have_libmozjs=yes Modified: trunk/src/node/vrml97/text.cpp =================================================================== --- trunk/src/node/vrml97/text.cpp 2010-05-03 02:00:42 UTC (rev 4140) +++ trunk/src/node/vrml97/text.cpp 2010-05-03 03:50:23 UTC (rev 4141) @@ -38,9 +38,7 @@ # undef interface # else # include <fontconfig/fontconfig.h> -extern "C" { # include <fontconfig/fcfreetype.h> -} # endif # endif # include <boost/array.hpp> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |