SF.net SVN: openvrml:[4037] trunk

[<br...@us...>]

Revision: 4037
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4037&view=rev
Author:   braden
Date:     2009-11-01 08:25:04 +0000 (Sun, 01 Nov 2009)

Log Message:
-----------
Require at least FreeType 2.2.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/src/node/vrml97/text.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-01 08:19:57 UTC (rev 4036)
+++ trunk/ChangeLog	2009-11-01 08:25:04 UTC (rev 4037)
@@ -1,5 +1,12 @@
 2009-11-01 Braden McDaniel  <br...@en...>
 
+	Require at least FreeType 2.2.
+
+	* configure.ac: Require FreeType >= 2.2.
+	* src/node/vrml97/text.cpp: Remove use of OPENVRML_FT_CONST.
+
+2009-11-01 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Set JS_CFLAGS (if it has not been set) when
 	building --with-libjs; ensure libjs was built with
 	-DJS_THREADSAFE.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-11-01 08:19:57 UTC (rev 4036)
+++ trunk/configure.ac	2009-11-01 08:25:04 UTC (rev 4037)
@@ -127,30 +127,7 @@
 
 PKG_CHECK_MODULES([PNG], [libpng], , [have_libpng=no])
 PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], , [have_fontconfig=no])
-PKG_CHECK_MODULES([FREETYPE], [freetype2], , [have_freetype=no])
-#
-# 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 X$have_freetype != Xno],
-      [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_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([FREETYPE], [freetype2 >= 2.2], , [have_freetype=no])
 
 have_libmozjs=yes
 PKG_CHECK_MODULES([JS], [mozilla-js >= 1.8.1.8], , [have_libmozjs=no])
@@ -301,9 +278,7 @@
        AS_IF([test X$have_freetype = Xno -a -z "${FREETYPE_LIBS+x}"],
              [AC_MSG_FAILURE([FreeType is required for rendering Text nodes])])
        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.])])
+                 [Defined if support for rendering Text nodes is enabled.])])
 
 #
 # Script node JavaScript support

Modified: trunk/src/node/vrml97/text.cpp
===================================================================
--- trunk/src/node/vrml97/text.cpp	2009-11-01 08:19:57 UTC (rev 4036)
+++ trunk/src/node/vrml97/text.cpp	2009-11-01 08:25:04 UTC (rev 4037)
@@ -1744,7 +1744,7 @@
     const float stepSize_ = 0.2f;
 
     extern "C" int
-    moveTo_(OPENVRML_FT_CONST FT_Vector * const to,
+    moveTo_(const FT_Vector * const to,
             void * const user)
     {
         using std::vector;
@@ -1765,7 +1765,7 @@
     }
 
     extern "C" int
-    lineTo_(OPENVRML_FT_CONST FT_Vector * const to,
+    lineTo_(const FT_Vector * const to,
             void * const user)
     {
         using openvrml::make_vec2f;
@@ -1832,8 +1832,8 @@
     }
 
     extern "C" int
-    conicTo_(OPENVRML_FT_CONST FT_Vector * const control,
-             OPENVRML_FT_CONST FT_Vector * const to,
+    conicTo_(const FT_Vector * const control,
+             const FT_Vector * const to,
              void * const user)
     {
         using std::vector;
@@ -1868,9 +1868,9 @@
     }
 
     extern "C" int
-    cubicTo_(OPENVRML_FT_CONST FT_Vector * const control1,
-             OPENVRML_FT_CONST FT_Vector * const control2,
-             OPENVRML_FT_CONST FT_Vector * const to,
+    cubicTo_(const FT_Vector * const control1,
+             const FT_Vector * const control2,
+             const FT_Vector * const to,
              void * const user)
     {
         using std::vector;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.