openvrml-commit

SF.net SVN: openvrml:[4226] trunk

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

Revision: 4226
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4226&view=rev
Author:   braden
Date:     2011-02-11 05:14:30 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Define BOOST_FILESYSTEM_VERSION=2 to build with Boost 1.46.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-02-05 07:29:12 UTC (rev 4225)
+++ trunk/ChangeLog	2011-02-11 05:14:30 UTC (rev 4226)
@@ -1,3 +1,14 @@
+2011-02-11 Braden McDaniel  <br...@en...>
+
+	Define BOOST_FILESYSTEM_VERSION=2 to build with Boost 1.46.
+
+	* src/Makefile.am
+	(libopenvrml_libopenvrml_la_CPPFLAGS): Add
+	-DBOOST_FILESYSTEM_VERSION=2.
+	(local_libopenvrml_dl_la_CPPFLAGS): Add
+	-DBOOST_FILESYSTEM_VERSION=2.
+	(script_java_la_CPPFLAGS): Add -DBOOST_FILESYSTEM_VERSION=2.
+
 2011-02-05 Braden McDaniel  <br...@en...>
 
 	* src/local/libopenvrml-control/openvrml_control/browser.cpp

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2011-02-05 07:29:12 UTC (rev 4225)
+++ trunk/src/Makefile.am	2011-02-11 05:14:30 UTC (rev 4226)
@@ -70,7 +70,8 @@
         -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \
         -DOPENVRML_PKGLIBDIR_=\"$(pkglibdir)\" \
         -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
-        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30
+        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30 \
+        -DBOOST_FILESYSTEM_VERSION=2
 libopenvrml_libopenvrml_la_CXXFLAGS = \
         $(FREETYPE_CFLAGS) \
         $(PTHREAD_CFLAGS) \
@@ -132,7 +133,8 @@
         local/libopenvrml-dl/openvrml/local/dl.h
 local_libopenvrml_dl_la_CPPFLAGS = \
         -I$(top_builddir)/src/libopenvrml \
-        -I$(top_srcdir)/src/libopenvrml
+        -I$(top_srcdir)/src/libopenvrml \
+        -DBOOST_FILESYSTEM_VERSION=2
 local_libopenvrml_dl_la_LIBADD = \
         -lboost_filesystem$(BOOST_LIB_SUFFIX) \
         -lboost_system$(BOOST_LIB_SUFFIX) \
@@ -175,7 +177,8 @@
         -DJRE_HOME=\"$(JRE_HOME)\" \
         -DOPENVRML_JVM_ARCH=\"$(OPENVRML_JVM_ARCH)\" \
         -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
-        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30
+        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30 \
+        -DBOOST_FILESYSTEM_VERSION=2
 script_java_la_LDFLAGS = \
         -module \
         -no-undefined \


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

SF.net SVN: openvrml:[4228] trunk

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

Revision: 4228
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4228&view=rev
Author:   braden
Date:     2011-04-07 08:36:18 +0000 (Thu, 07 Apr 2011)

Log Message:
-----------
Newer SpiderMonkey (XULRunner 2.0) changes the type of property mutator functions to JSStrictPropertyOp, which adds a boolean argument.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-02-11 05:21:26 UTC (rev 4227)
+++ trunk/ChangeLog	2011-04-07 08:36:18 UTC (rev 4228)
@@ -1,3 +1,12 @@
+2011-04-07 Braden McDaniel  <br...@en...>
+
+	Newer SpiderMonkey (XULRunner 2.0) changes the type of property
+	mutator functions to JSStrictPropertyOp, which adds a boolean
+	argument.
+
+	* configure.ac
+	* src/script/javascript.cpp
+
 2011-02-11 Braden McDaniel  <br...@en...>
 
 	Define BOOST_FILESYSTEM_VERSION=2 to build with Boost 1.46.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2011-02-11 05:21:26 UTC (rev 4227)
+++ trunk/configure.ac	2011-04-07 08:36:18 UTC (rev 4228)
@@ -246,6 +246,26 @@
                  [Defined if JSNative is the same as JSFastNative])])
 
 #
+# XULRunner 2.0 changes the mutator type to JSStrictPropertyOp.
+#
+AC_CACHE_CHECK([whether SpiderMonkey has JSStrictPropertyOp],
+[ov_cv_js_has_strictpropertyop],
+[ov_cv_js_has_strictpropertyop=no
+ov_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$JS_CFLAGS $CPPFLAGS"
+AC_LANG_PUSH([C])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[#include <jsapi.h>]],
+[[JSStrictPropertyOp op;]])],
+[ov_cv_js_has_strictpropertyop=yes])
+AC_LANG_POP([C])
+CPPFLAGS=$ov_save_CPPFLAGS
+])
+AS_IF([test X$ov_cv_js_has_strictpropertyop = Xyes],
+      [AC_DEFINE([OPENVRML_JS_HAS_STRICTPROPERTYOP], [1],
+                 [Defined if SpiderMonkey has JSStrictPropertyOp])])
+
+#
 # openvrml-xembed and openvrml-player both use GOption, which was
 # introduced in GLib 2.6.
 #

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2011-02-11 05:21:26 UTC (rev 4227)
+++ trunk/src/script/javascript.cpp	2011-04-07 08:36:18 UTC (rev 4228)
@@ -160,6 +160,40 @@
 #   define OPENVRML_JS_IS_CONSTRUCTING(cx, vp) JS_IsConstructing(cx)
 # endif
 
+# ifdef OPENVRML_JS_HAS_STRICTPROPERTYOP
+#   define OPENVRML_DECLARE_JSSTRICTPROPERTYOP(name)                    \
+    JSBool (name)(JSContext *, JSObject *, jspropertyop_id, JSBool, jsval *)
+
+#   define OPENVRML_DEFINE_JSSTRICTPROPERTYOP(name)                   \
+    JSBool (name)(JSContext * cx, JSObject * obj, jspropertyop_id id, \
+                  JSBool strict, jsval * vp)
+
+#   define OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(class_name, name)  \
+    JSBool class_name::name(JSContext * cx, JSObject * obj,             \
+                            jspropertyop_id id, JSBool strict, jsval * vp)
+
+#   define OPENVRML_CALL_JSSTRICTPROPERTYOP(name, cx, obj, id, vp) \
+    (name)((cx), (obj), (id), JS_FALSE, (vp))
+
+    JSStrictPropertyOp openvrml_JS_StrictPropertyStub = JS_StrictPropertyStub;
+# else
+#   define OPENVRML_DECLARE_JSSTRICTPROPERTYOP(name)                    \
+    JSBool (name)(JSContext *, JSObject *, jspropertyop_id, jsval *)
+
+#   define OPENVRML_DEFINE_JSSTRICTPROPERTYOP(name)                   \
+    JSBool (name)(JSContext * cx, JSObject * obj, jspropertyop_id id, \
+                  jsval * vp)
+
+#   define OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(class_name, name)  \
+    JSBool class_name::name(JSContext * cx, JSObject * obj,             \
+                            jspropertyop_id id, jsval * vp)
+
+#   define OPENVRML_CALL_JSSTRICTPROPERTYOP(name, cx, obj, id, vp) \
+    (name)((cx), (obj), (id), (vp))
+
+    JSPropertyOp openvrml_JS_StrictPropertyStub = JS_PropertyStub;
+# endif
+
     class SFNode;
     class MFNode;
 
@@ -199,9 +233,7 @@
             OPENVRML_NOTHROW;
 
     private:
-        static JSBool field_setProperty(JSContext * cx, JSObject * obj,
-                                        jspropertyop_id id, jsval * val)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(field_setProperty);
 
         virtual void do_initialize(double timeStamp);
         virtual void do_process_event(const std::string & id,
@@ -287,7 +319,7 @@
             JS_PropertyStub,  // addProperty
             JS_PropertyStub,  // delProperty
             JS_PropertyStub,  // getProperty
-            JS_PropertyStub,  // setProperty
+            openvrml_JS_StrictPropertyStub,  // setProperty
             JS_EnumerateStub, // enumerate
             JS_ResolveStub,   // resolve
             JS_ConvertStub,   // convert
@@ -311,7 +343,7 @@
             JS_PropertyStub,  // addProperty
             JS_PropertyStub,  // delProperty
             JS_PropertyStub,  // getProperty
-            JS_PropertyStub,  // setProperty
+            openvrml_JS_StrictPropertyStub,  // setProperty
             JS_EnumerateStub, // enumerate
             JS_ResolveStub,   // resolve
             JS_ConvertStub,   // convert
@@ -400,9 +432,7 @@
         static JSBool getProperty(JSContext * cx, JSObject * obj,
                                   jspropertyop_id id, jsval * vp)
             OPENVRML_NOTHROW;
-        static JSBool setProperty(JSContext * cx, JSObject * obj,
-                                  jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setProperty);
         static OPENVRML_DECLARE_JSNATIVE(setHSV);
         static OPENVRML_DECLARE_JSNATIVE(getHSV);
     };
@@ -429,9 +459,7 @@
         static JSBool getProperty(JSContext * cx, JSObject * obj,
                                   jspropertyop_id id, jsval * vp)
             OPENVRML_NOTHROW;
-        static JSBool setProperty(JSContext * cx, JSObject * obj,
-                                  jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setProperty);
     };
 
     class OPENVRML_JAVASCRIPT_LOCAL SFNode : public sfield {
@@ -455,9 +483,7 @@
         static JSBool getProperty(JSContext * cx, JSObject * obj,
                                   jspropertyop_id id, jsval * vp)
             OPENVRML_NOTHROW;
-        static JSBool setProperty(JSContext * cx, JSObject * obj,
-                                  jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setProperty);
     };
 
     class OPENVRML_JAVASCRIPT_LOCAL SFRotation : public sfield {
@@ -481,9 +507,7 @@
         static JSBool getProperty(JSContext * cx, JSObject * obj,
                                   jspropertyop_id id, jsval * vp)
             OPENVRML_NOTHROW;
-        static JSBool setProperty(JSContext * cx, JSObject * obj,
-                                  jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setProperty);
         static OPENVRML_DECLARE_JSNATIVE(getAxis);
         static OPENVRML_DECLARE_JSNATIVE(inverse);
         static OPENVRML_DECLARE_JSNATIVE(multiply);
@@ -506,9 +530,7 @@
         static JSBool getProperty(JSContext * cx, JSObject * obj,
                                   jspropertyop_id id, jsval * rval)
             OPENVRML_NOTHROW;
-        static JSBool setProperty(JSContext * cx, JSObject * obj,
-                                  jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setProperty);
         static OPENVRML_DECLARE_JSNATIVE(add);
         static OPENVRML_DECLARE_JSNATIVE(divide);
         static OPENVRML_DECLARE_JSNATIVE(dot);
@@ -563,9 +585,7 @@
         static JSBool getProperty(JSContext * cx, JSObject * obj,
                                   jspropertyop_id id, jsval * vp)
             OPENVRML_NOTHROW;
-        static JSBool setProperty(JSContext * cx, JSObject * obj,
-                                  jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setProperty);
         static OPENVRML_DEFINE_JSNATIVE(add);
         static OPENVRML_DEFINE_JSNATIVE(cross);
         static OPENVRML_DEFINE_JSNATIVE(divide);
@@ -648,12 +668,8 @@
 
     protected:
         static OPENVRML_DECLARE_JSNATIVE(construct);
-        static JSBool setElement(JSContext * cx, JSObject * obj,
-                                 jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
-        static JSBool setLength(JSContext * cx, JSObject * obj,
-                                jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement);
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength);
         static OPENVRML_DECLARE_JSNATIVE(toString);
         static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW;
 
@@ -675,12 +691,8 @@
 
     protected:
         static OPENVRML_DECLARE_JSNATIVE(construct);
-        static JSBool setElement(JSContext * cx, JSObject * obj,
-                                 jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
-        static JSBool setLength(JSContext * cx, JSObject * obj,
-                                jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement);
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength);
         static OPENVRML_DECLARE_JSNATIVE(toString);
         static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW;
 
@@ -704,10 +716,8 @@
         static OPENVRML_DECLARE_JSNATIVE(construct);
         static JSBool initObject(JSContext * cx, JSObject * obj,
                                  uintN argc, jsval * argv);
-        static JSBool setElement(JSContext * cx, JSObject * obj,
-                                 jspropertyop_id id, jsval * vp);
-        static JSBool setLength(JSContext * cx, JSObject * obj,
-                                jspropertyop_id id, jsval * vp);
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement);
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength);
         static OPENVRML_DECLARE_JSNATIVE(toString);
         static void finalize(JSContext * cx, JSObject * obj);
     };
@@ -765,10 +775,8 @@
         static OPENVRML_DECLARE_JSNATIVE(construct);
         static JSBool initObject(JSContext * cx, JSObject * obj,
                                  uintN argc, jsval * argv);
-        static JSBool setElement(JSContext * cx, JSObject * obj,
-                                 jspropertyop_id id, jsval * vp);
-        static JSBool setLength(JSContext * cx, JSObject * obj,
-                                jspropertyop_id id, jsval * vp);
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement);
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength);
         static OPENVRML_DECLARE_JSNATIVE(toString);
         static void finalize(JSContext * cx, JSObject * obj);
     };
@@ -795,12 +803,8 @@
         static OPENVRML_DECLARE_JSNATIVE(construct);
         static JSBool initObject(JSContext * cx, JSObject * obj,
                                  uintN argc, jsval * argv) OPENVRML_NOTHROW;
-        static JSBool setElement(JSContext * cx, JSObject * obj,
-                                 jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
-        static JSBool setLength(JSContext * cx, JSObject * obj,
-                                jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement);
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength);
         static OPENVRML_DECLARE_JSNATIVE(toString);
         static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW;
     };
@@ -836,12 +840,8 @@
         static OPENVRML_DECLARE_JSNATIVE(construct);
         static JSBool initObject(JSContext * cx, JSObject * obj,
                                  uintN argc, jsval * argv) OPENVRML_NOTHROW;
-        static JSBool setElement(JSContext * cx, JSObject * obj,
-                                 jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
-        static JSBool setLength(JSContext * cx, JSObject * obj,
-                                jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement);
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength);
         static OPENVRML_DECLARE_JSNATIVE(toString);
         static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW;
     };
@@ -931,9 +931,7 @@
             static JSBool getElement(JSContext * cx, JSObject * obj,
                                      jspropertyop_id id, jsval * vp)
                 OPENVRML_NOTHROW;
-            static JSBool setElement(JSContext * cx, JSObject * obj,
-                                     jspropertyop_id id, jsval * vp)
-                OPENVRML_NOTHROW;
+            static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement);
         };
 
         static JSClass jsclass;
@@ -947,9 +945,7 @@
         static JSBool getElement(JSContext * cx, JSObject * obj,
                                  jspropertyop_id id, jsval * vp)
             OPENVRML_NOTHROW;
-        static JSBool setElement(JSContext * cx, JSObject * obj,
-                                 jspropertyop_id id, jsval * vp)
-            OPENVRML_NOTHROW;
+        static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement);
         static OPENVRML_DECLARE_JSNATIVE(setTransform);
         static OPENVRML_DECLARE_JSNATIVE(getTransform);
         static OPENVRML_DECLARE_JSNATIVE(inverse);
@@ -968,11 +964,8 @@
     JSRuntime * script::rt = 0; // Javascript runtime singleton object
     size_t script::nInstances = 0; // Number of distinct script objects
 
-    OPENVRML_JAVASCRIPT_LOCAL JSBool eventOut_setProperty(JSContext * cx,
-                                               JSObject * obj,
-                                               jspropertyop_id id,
-                                               jsval * val)
-        OPENVRML_NOTHROW;
+    OPENVRML_JAVASCRIPT_LOCAL
+    OPENVRML_DECLARE_JSSTRICTPROPERTYOP(eventOut_setProperty);
 
     OPENVRML_JAVASCRIPT_LOCAL void errorReporter(JSContext * cx,
                                       const char * message,
@@ -1556,11 +1549,7 @@
 
 // Must assign the proper type to eventOuts
 
-    JSBool eventOut_setProperty(JSContext * const cx,
-                                JSObject *,
-                                const jspropertyop_id id,
-                                jsval * const val)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_JSSTRICTPROPERTYOP(eventOut_setProperty)
     {
         using std::find_if;
 
@@ -1597,7 +1586,7 @@
             using std::auto_ptr;
 
             auto_ptr<openvrml::field_value> fieldValue =
-                createFieldValueFromJsval(cx, *val, field_type_id);
+                createFieldValueFromJsval(cx, *vp, field_type_id);
             const openvrml::script_node::eventout_map_t::const_iterator eventout =
                 scriptNode.eventout_map().find(eventId);
             assert(eventout != scriptNode.eventout_map().end());
@@ -1611,11 +1600,7 @@
         return JS_TRUE;
     }
 
-    JSBool script::field_setProperty(JSContext * const cx,
-                                     JSObject *,
-                                     const jspropertyop_id id,
-                                     jsval * const val)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(script, field_setProperty)
     {
         using std::find_if;
 
@@ -1651,7 +1636,7 @@
         try {
             using std::auto_ptr;
             auto_ptr<openvrml::field_value> fieldValue =
-                createFieldValueFromJsval(cx, *val, field_type_id);
+                createFieldValueFromJsval(cx, *vp, field_type_id);
             s->field(fieldId, *fieldValue);
         } catch (bad_conversion & ex) {
             JS_ReportError(cx, ex.what());
@@ -2759,11 +2744,7 @@
         return JS_TRUE;
     }
 
-    JSBool SFColor::setProperty(JSContext * const cx,
-                                JSObject * const obj,
-                                const jspropertyop_id id,
-                                jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFColor, setProperty)
     {
         assert(JS_GetPrivate(cx, obj));
         sfield::sfdata & sfdata =
@@ -3097,9 +3078,7 @@
  *
  * @todo Implement me!
  */
-    JSBool SFImage::setProperty(JSContext *, JSObject *,
-                                jspropertyop_id, jsval *)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFImage, setProperty)
     {
         // ...
         return JS_FALSE;
@@ -3111,7 +3090,7 @@
         JS_PropertyStub,     // addProperty
         JS_PropertyStub,     // delProperty
         getProperty,         // getProperty
-        JS_PropertyStub,     // setProperty
+        openvrml_JS_StrictPropertyStub,     // setProperty
         JS_EnumerateStub,    // enumerate
         JS_ResolveStub,      // resolve
         JS_ConvertStub,      // convert
@@ -3328,11 +3307,7 @@
 
 // This should only happen if directOutput is set...
 
-    JSBool SFNode::setProperty(JSContext * const cx,
-                               JSObject * const obj,
-                               const jspropertyop_id id,
-                               jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFNode, setProperty)
     {
         if (JSVAL_IS_STRING(id)) {
             using std::auto_ptr;
@@ -3628,11 +3603,7 @@
         return JS_TRUE;
     }
 
-    JSBool SFRotation::setProperty(JSContext * const cx,
-                                   JSObject * const obj,
-                                   const jspropertyop_id id,
-                                   jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFRotation, setProperty)
     {
         assert(JS_GetPrivate(cx, obj));
         sfield::sfdata & sfdata =
@@ -4107,11 +4078,8 @@
     }
 
     template <typename SFVec2>
-    JSBool sfvec2_jsobject<SFVec2>::setProperty(JSContext * const cx,
-                                                JSObject * const obj,
-                                                const jspropertyop_id id,
-                                                jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(sfvec2_jsobject<SFVec2>,
+                                              setProperty)
     {
         typedef typename SFVec2::field_type sfvec2_t;
         typedef typename SFVec2::value_type vec2_t;
@@ -4716,11 +4684,8 @@
     }
 
     template <typename SFVec3>
-    JSBool sfvec3_jsobject<SFVec3>::setProperty(JSContext * const cx,
-                                                JSObject * const obj,
-                                                const jspropertyop_id id,
-                                                jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(sfvec3_jsobject<SFVec3>,
+                                              setProperty)
     {
         typedef typename SFVec3::field_type sfvec3_t;
         typedef typename SFVec3::value_type vec3_t;
@@ -5349,11 +5314,7 @@
     }
 
     template <typename Subclass>
-    JSBool MFJSObject<Subclass>::setElement(JSContext * const cx,
-                                            JSObject * const obj,
-                                            const jspropertyop_id id,
-                                            jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFJSObject<Subclass>, setElement)
     {
         assert(cx);
         assert(obj);
@@ -5378,7 +5339,10 @@
             //
             if (size_t(jspropertyop_id_to_int(id)) >= mfdata->array.size()) {
                 jsval newLength = INT_TO_JSVAL(jspropertyop_id_to_int(id) + 1);
-                if (!setLength(cx, obj, 0, &newLength)) { return JS_FALSE; }
+                if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, obj, 0,
+                                                                 &newLength)) {
+                    return JS_FALSE;
+                }
             }
 
             //
@@ -5391,11 +5355,7 @@
     }
 
     template <typename Subclass>
-    JSBool MFJSObject<Subclass>::setLength(JSContext * const cx,
-                                           JSObject * const obj,
-                                           jspropertyop_id,
-                                           jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFJSObject<Subclass>, setLength)
     {
         using std::copy;
 
@@ -5577,11 +5537,7 @@
     }
 
     template <typename Subclass>
-    JSBool MFJSDouble<Subclass>::setElement(JSContext * const cx,
-                                            JSObject * const obj,
-                                            const jspropertyop_id id,
-                                            jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFJSDouble<Subclass>, setElement)
     {
         if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0) {
             MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
@@ -5598,7 +5554,10 @@
             //
             if (size_t(jspropertyop_id_to_int(id)) >= mfdata->array.size()) {
                 jsval newLength = INT_TO_JSVAL(jspropertyop_id_to_int(id) + 1);
-                if (!setLength(cx, obj, 0, &newLength)) { return JS_FALSE; }
+                if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, obj, 0,
+                                                                 &newLength)) {
+                    return JS_FALSE;
+                }
             }
 
             //
@@ -5614,11 +5573,7 @@
     }
 
     template <typename Subclass>
-    JSBool MFJSDouble<Subclass>::setLength(JSContext * const cx,
-                                           JSObject * const obj,
-                                           jspropertyop_id,
-                                           jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFJSDouble<Subclass>, setLength)
     {
         using std::copy;
 
@@ -5772,7 +5727,10 @@
         if (!mfboolObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(bools.size());
-        if (!setLength(cx, mfboolObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfboolObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfboolObj));
@@ -5833,10 +5791,7 @@
         return JS_TRUE;
     }
 
-    JSBool MFBool::setElement(JSContext * const cx,
-                              JSObject * const obj,
-                              const jspropertyop_id id,
-                              jsval * const vp)
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFBool, setElement)
     {
         assert(cx);
         assert(obj);
@@ -5853,7 +5808,10 @@
             //
             if (index >= mfdata->array.size()) {
                 jsval newLength = INT_TO_JSVAL(jspropertyop_id_to_int(id) + 1);
-                if (!setLength(cx, obj, 0, &newLength)) { return JS_FALSE; }
+                if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, obj, 0,
+                                                                 &newLength)) {
+                    return JS_FALSE;
+                }
             }
 
             //
@@ -5868,10 +5826,7 @@
         return JS_TRUE;
     }
 
-    JSBool MFBool::setLength(JSContext * const cx,
-                             JSObject * const obj,
-                             jspropertyop_id,
-                             jsval * const vp)
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFBool, setLength)
     {
         assert(cx);
         assert(obj);
@@ -5989,7 +5944,10 @@
         if (!mfcolorObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(colors.size());
-        if (!setLength(cx, mfcolorObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfcolorObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfcolorObj));
@@ -6037,7 +5995,10 @@
         if (!mffloatObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(floats.size());
-        if (!setLength(cx, mffloatObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mffloatObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mffloatObj));
@@ -6109,7 +6070,10 @@
         if (!mfdoubleObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(doubles.size());
-        if (!setLength(cx, mfdoubleObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfdoubleObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfdoubleObj));
@@ -6202,7 +6166,10 @@
         if (!mfint32Obj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(int32s.size());
-        if (!setLength(cx, mfint32Obj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfint32Obj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfint32Obj));
@@ -6289,10 +6256,7 @@
         return JS_TRUE;
     }
 
-    JSBool MFInt32::setElement(JSContext * const cx,
-                               JSObject * const obj,
-                               const jspropertyop_id id,
-                               jsval * const vp)
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFInt32, setElement)
     {
         assert(cx);
         assert(obj);
@@ -6309,7 +6273,9 @@
             //
             if (index >= mfdata->array.size()) {
                 jsval newLength = INT_TO_JSVAL(jspropertyop_id_to_int(id) + 1);
-                if (!setLength(cx, obj, 0, &newLength)) { return JS_FALSE; }
+                if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, obj, 0,
+                                                                 &newLength)) {
+                    return JS_FALSE; }
             }
 
             //
@@ -6326,10 +6292,7 @@
         return JS_TRUE;
     }
 
-    JSBool MFInt32::setLength(JSContext * const cx,
-                              JSObject * const obj,
-                              jspropertyop_id,
-                              jsval * const vp)
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFInt32, setLength)
     {
         assert(cx);
         assert(obj);
@@ -6468,7 +6431,10 @@
         if (!mfnodeObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(nodes.size());
-        if (!setLength(cx, mfnodeObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfnodeObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfnodeObj));
@@ -6539,11 +6505,7 @@
         return initObject(cx, obj, argc, OPENVRML_JS_ARGV(cx, vp));
     }
 
-    JSBool MFNode::setElement(JSContext * const cx,
-                              JSObject * const obj,
-                              const jspropertyop_id id,
-                              jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFNode, setElement)
     {
         assert(cx);
         assert(obj);
@@ -6571,7 +6533,10 @@
             //
             if (size_t(jspropertyop_id_to_int(id)) >= mfdata->array.size()) {
                 jsval newLength = INT_TO_JSVAL(jspropertyop_id_to_int(id) + 1);
-                if (!setLength(cx, obj, 0, &newLength)) { return JS_FALSE; }
+                if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, obj, 0,
+                                                                 &newLength)) {
+                    return JS_FALSE;
+                }
             }
 
             //
@@ -6583,11 +6548,7 @@
         return JS_TRUE;
     }
 
-    JSBool MFNode::setLength(JSContext * const cx,
-                             JSObject * const obj,
-                             jspropertyop_id,
-                             jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFNode, setLength)
     {
         assert(cx);
         assert(obj);
@@ -6724,7 +6685,10 @@
         if (!mfrotationObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(rotations.size());
-        if (!setLength(cx, mfrotationObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfrotationObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfrotationObj));
@@ -6824,7 +6788,10 @@
         if (!mfstringObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(strings.size());
-        if (!setLength(cx, mfstringObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfstringObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfstringObj));
@@ -6914,11 +6881,7 @@
         return JS_TRUE;
     }
 
-    JSBool MFString::setElement(JSContext * const cx,
-                                JSObject * const obj,
-                                const jspropertyop_id id,
-                                jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFString, setElement)
     {
         if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0) {
             MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
@@ -6929,7 +6892,10 @@
             //
             if (size_t(jspropertyop_id_to_int(id)) >= mfdata->array.size()) {
                 jsval newLength = INT_TO_JSVAL(jspropertyop_id_to_int(id) + 1);
-                if (!setLength(cx, obj, 0, &newLength)) { return JS_FALSE; }
+                if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, obj, 0,
+                                                                 &newLength)) {
+                    return JS_FALSE;
+                }
             }
 
             //
@@ -6947,11 +6913,7 @@
         return JS_TRUE;
     }
 
-    JSBool MFString::setLength(JSContext * const cx,
-                               JSObject * const obj,
-                               jspropertyop_id,
-                               jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFString, setLength)
     {
         MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
         assert(mfdata);
@@ -7069,7 +7031,10 @@
         if (!mftimeObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(times.size());
-        if (!setLength(cx, mftimeObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mftimeObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mftimeObj));
@@ -7139,7 +7104,10 @@
         if (!mfvec2fObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(vec2fs.size());
-        if (!setLength(cx, mfvec2fObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfvec2fObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfvec2fObj));
@@ -7217,7 +7185,10 @@
         if (!mfvec2dObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(vec2ds.size());
-        if (!setLength(cx, mfvec2dObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfvec2dObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfvec2dObj));
@@ -7295,7 +7266,10 @@
         if (!mfvec3fObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(vec3fs.size());
-        if (!setLength(cx, mfvec3fObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfvec3fObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfvec3fObj));
@@ -7374,7 +7348,10 @@
         if (!mfvec3dObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(vec3ds.size());
-        if (!setLength(cx, mfvec3dObj, 0, &length)) { return JS_FALSE; }
+        if (!OPENVRML_CALL_JSSTRICTPROPERTYOP(setLength, cx, mfvec3dObj, 0,
+                                                         &length)) {
+            return JS_FALSE;
+        }
 
         MFData * const mfdata =
             static_cast<MFData *>(JS_GetPrivate(cx, mfvec3dObj));
@@ -7493,11 +7470,7 @@
         return JS_TRUE;
     }
 
-    JSBool VrmlMatrix::Row::setElement(JSContext * const cx,
-                                       JSObject * const obj,
-                                       const jspropertyop_id id,
-                                       jsval * const vp)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(VrmlMatrix::Row, setElement)
     {
         assert(cx);
         assert(obj);
@@ -7639,9 +7612,7 @@
         return JS_TRUE;
     }
 
-    JSBool VrmlMatrix::setElement(JSContext *, JSObject *,
-                                  jspropertyop_id, jsval *)
-        OPENVRML_NOTHROW
+    OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(VrmlMatrix, setElement)
     {
         return JS_TRUE;
     }


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

SF.net SVN: openvrml:[4230] trunk

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

Revision: 4230
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4230&view=rev
Author:   braden
Date:     2011-04-12 05:14:40 +0000 (Tue, 12 Apr 2011)

Log Message:
-----------
Define BOOST_FILESYSTEM_VERSION=2 to compile with Boost 1.46.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml/openvrml.vcxproj
    trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-07 08:52:14 UTC (rev 4229)
+++ trunk/ChangeLog	2011-04-12 05:14:40 UTC (rev 4230)
@@ -1,3 +1,10 @@
+2011-04-12 Braden McDaniel  <br...@en...>
+
+	Define BOOST_FILESYSTEM_VERSION=2 to compile with Boost 1.46.
+
+	* src/libopenvrml/openvrml.vcxproj
+	* src/local/libopenvrml-dl/openvrml-dl.vcxproj
+
 2011-04-07 Braden McDaniel  <br...@en...>
 
 	Newer SpiderMonkey (XULRunner 2.0) changes the type of property

Modified: trunk/src/libopenvrml/openvrml.vcxproj
===================================================================
--- trunk/src/libopenvrml/openvrml.vcxproj	2011-04-07 08:52:14 UTC (rev 4229)
+++ trunk/src/libopenvrml/openvrml.vcxproj	2011-04-12 05:14:40 UTC (rev 4230)
@@ -65,7 +65,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.99";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.99";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -91,7 +91,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.99";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.99";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

Modified: trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj	2011-04-07 08:52:14 UTC (rev 4229)
+++ trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj	2011-04-12 05:14:40 UTC (rev 4230)
@@ -70,7 +70,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -82,7 +82,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>


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

SF.net SVN: openvrml:[4232] trunk

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

Revision: 4232
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4232&view=rev
Author:   braden
Date:     2011-04-17 02:42:07 +0000 (Sun, 17 Apr 2011)

Log Message:
-----------
Update to Doxygen 1.4.7.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/Doxyfile
    trunk/doc/Makefile.am
    trunk/doc/doxygen-header

Property Changed:
----------------
    trunk/doc/manual/

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-12 05:17:42 UTC (rev 4231)
+++ trunk/ChangeLog	2011-04-17 02:42:07 UTC (rev 4232)
@@ -1,3 +1,11 @@
+2011-04-16 Braden McDaniel  <br...@en...>
+
+	Update to Doxygen 1.4.7.
+
+	* doc/Doxyfile
+	* doc/Makefile.am
+	* doc/doxygen-header
+
 2011-04-12 Braden McDaniel  <br...@en...>
 
 	Define BOOST_FILESYSTEM_VERSION=2 to compile with Boost 1.46.

Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile	2011-04-12 05:17:42 UTC (rev 4231)
+++ trunk/doc/Doxyfile	2011-04-17 02:42:07 UTC (rev 4232)
@@ -1,4 +1,4 @@
-# Doxyfile 1.7.1
+# Doxyfile 1.7.4
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -6,6 +6,8 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = OpenVRML
 PROJECT_NUMBER         = 0.18.6
+PROJECT_BRIEF          =
+PROJECT_LOGO           =
 OUTPUT_DIRECTORY       =
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -62,6 +64,7 @@
 SORT_MEMBERS_CTORS_1ST = NO
 SORT_GROUP_NAMES       = NO
 SORT_BY_SCOPE_NAME     = YES
+STRICT_PROTO_MATCHING  = NO
 GENERATE_TODOLIST      = NO
 GENERATE_TESTLIST      = NO
 GENERATE_BUGLIST       = NO
@@ -111,6 +114,7 @@
 INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -136,7 +140,6 @@
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = doxygen-header
 HTML_FOOTER            = doxygen-footer
-HTML_TIMESTAMP         = NO
 HTML_STYLESHEET        =
 HTML_COLORSTYLE_HUE    = 0
 HTML_COLORSTYLE_SAT    = 0
@@ -174,6 +177,8 @@
 EXT_LINKS_IN_WINDOW    = NO
 FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
+USE_MATHJAX            = NO
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 SEARCHENGINE           = NO
 SERVER_BASED_SEARCH    = NO
 #---------------------------------------------------------------------------
@@ -282,6 +287,7 @@
 DOT_IMAGE_FORMAT       = png
 DOT_PATH               =
 DOTFILE_DIRS           =
+MSCFILE_DIRS           =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 0
 DOT_TRANSPARENT        = YES

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am	2011-04-12 05:17:42 UTC (rev 4231)
+++ trunk/doc/Makefile.am	2011-04-17 02:42:07 UTC (rev 4232)
@@ -57,16 +57,18 @@
 DOXYGEN_OUTPUT_FILES = \
         $(srcdir)/manual/*.css \
         $(srcdir)/manual/*.html \
+        $(srcdir)/manual/*.js \
         $(srcdir)/manual/*.map \
         $(srcdir)/manual/*.md5 \
         $(srcdir)/manual/*__incl.png \
-        $(srcdir)/manual/*inherit__graph*.png \
+        $(srcdir)/manual/*__inherit__graph*.png \
         $(srcdir)/manual/bc_s.png \
         $(srcdir)/manual/closed.png \
         $(srcdir)/manual/doxygen.png \
         $(srcdir)/manual/formula.repository \
         $(srcdir)/manual/form_*.png \
         $(srcdir)/manual/graph_legend.png \
+        $(srcdir)/manual/inherit_graph_*.png \
         $(srcdir)/manual/nav_f.png \
         $(srcdir)/manual/nav_h.png \
         $(srcdir)/manual/open.png \

Modified: trunk/doc/doxygen-header
===================================================================
--- trunk/doc/doxygen-header	2011-04-12 05:17:42 UTC (rev 4231)
+++ trunk/doc/doxygen-header	2011-04-17 02:42:07 UTC (rev 4232)
@@ -234,6 +234,13 @@
   padding-right: 0;
   line-height: 3.0ex;
 }
+
+.body {
+  padding-left: 0;
+  padding-right: 0;
+  padding-top: 0;
+  padding-bottom: 0.75em;
+}
 </style>
 </head>
 <body>
@@ -247,3 +254,4 @@
   </tr>
 </table>
 <div class="body">
+<div>


Property changes on: trunk/doc/manual
___________________________________________________________________
Modified: svn:ignore
   - *.css
*.dot
*.html
*.map
*.md5
*inherit__graph*.png
*__incl.png
doxygen.png
form_*.png
formula.repository
graph_legend.*
bc_s.png
open.png
closed.png
nav_?.png
tab_?.png
_formulas.tex

   + *.css
*.dot
*.html
*.map
*.md5
*__incl.png
*__inherit__graph.png
doxygen.png
form_*.png
formula.repository
graph_legend.*
inherit_graph_*.png
jquery.js
bc_s.png
open.png
closed.png
nav_?.png
tab_?.png
_formulas.tex



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

SF.net SVN: openvrml:[4236] trunk

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

Revision: 4236
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4236&view=rev
Author:   braden
Date:     2011-04-21 01:39:36 +0000 (Thu, 21 Apr 2011)

Log Message:
-----------
Define BOOST_FILESYSTEM_VERSION=2 to compile with Boost 1.46.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tests/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-17 04:27:08 UTC (rev 4235)
+++ trunk/ChangeLog	2011-04-21 01:39:36 UTC (rev 4236)
@@ -1,3 +1,8 @@
+2011-04-20 Braden McDaniel  <br...@en...>
+
+	* tests/Makefile.am (AM_CPPFLAGS): Define
+	BOOST_FILESYSTEM_VERSION=2 to compile with Boost 1.46.
+
 2011-04-16 Braden McDaniel  <br...@en...>
 
 	Update to Doxygen 1.4.7.

Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am	2011-04-17 04:27:08 UTC (rev 4235)
+++ trunk/tests/Makefile.am	2011-04-21 01:39:36 UTC (rev 4236)
@@ -1,7 +1,8 @@
 AM_CPPFLAGS = \
         -I$(top_builddir)/src/libopenvrml \
         -I$(top_srcdir)/src/libopenvrml \
-        -DBOOST_TEST_DYN_LINK
+        -DBOOST_TEST_DYN_LINK \
+        -DBOOST_FILESYSTEM_VERSION=2
 AM_CXXFLAGS = $(PTHREAD_CFLAGS)
 
 TESTS_ENVIRONMENT = \


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

SF.net SVN: openvrml:[4238] trunk

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

Revision: 4238
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4238&view=rev
Author:   braden
Date:     2011-04-21 04:03:21 +0000 (Thu, 21 Apr 2011)

Log Message:
-----------
Updates for 0.18.7 release.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/README
    trunk/doc/Doxyfile
    trunk/src/Makefile.am
    trunk/src/libopenvrml/openvrml.rc
    trunk/src/libopenvrml/openvrml.vcxproj
    trunk/src/libopenvrml-gl/openvrml-gl.rc

Property Changed:
----------------
    trunk/
    trunk/src/libopenvrml/openvrml/bad_url.cpp
    trunk/src/libopenvrml/openvrml/bad_url.h
    trunk/src/libopenvrml/openvrml/local/proto.cpp
    trunk/src/libopenvrml/openvrml/local/proto.h
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/libopenvrml/openvrml/scene.h
    trunk/src/libopenvrml/openvrml/script.cpp
    trunk/src/mozilla-plugin/
    trunk/src/node/vrml97/register_node_metatypes.cpp
    trunk/src/node/x3d-cad-geometry/cad_face.cpp
    trunk/src/node/x3d-cad-geometry/cad_face.h
    trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp
    trunk/src/node/x3d-cad-geometry/indexed_quad_set.h
    trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp
    trunk/src/node/x3d-core/metadata_double.cpp
    trunk/src/node/x3d-core/metadata_double.h
    trunk/src/node/x3d-core/metadata_float.cpp
    trunk/src/node/x3d-core/metadata_float.h
    trunk/src/node/x3d-core/metadata_integer.cpp
    trunk/src/node/x3d-core/metadata_integer.h
    trunk/src/node/x3d-core/metadata_set.cpp
    trunk/src/node/x3d-core/metadata_set.h
    trunk/src/node/x3d-core/metadata_string.cpp
    trunk/src/node/x3d-core/metadata_string.h
    trunk/src/node/x3d-core/register_node_metatypes.cpp
    trunk/src/node/x3d-dis/espdu_transform.cpp
    trunk/src/node/x3d-dis/espdu_transform.h
    trunk/src/node/x3d-dis/receiver_pdu.cpp
    trunk/src/node/x3d-dis/receiver_pdu.h
    trunk/src/node/x3d-dis/register_node_metatypes.cpp
    trunk/src/node/x3d-dis/signal_pdu.cpp
    trunk/src/node/x3d-dis/signal_pdu.h
    trunk/src/node/x3d-dis/transmitter_pdu.cpp
    trunk/src/node/x3d-dis/transmitter_pdu.h
    trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp
    trunk/src/node/x3d-environmental-effects/texture_background.cpp
    trunk/src/node/x3d-environmental-effects/texture_background.h
    trunk/src/node/x3d-event-utilities/boolean_filter.cpp
    trunk/src/node/x3d-event-utilities/boolean_filter.h
    trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp
    trunk/src/node/x3d-event-utilities/boolean_sequencer.h
    trunk/src/node/x3d-event-utilities/boolean_toggle.cpp
    trunk/src/node/x3d-event-utilities/boolean_toggle.h
    trunk/src/node/x3d-event-utilities/boolean_trigger.cpp
    trunk/src/node/x3d-event-utilities/boolean_trigger.h
    trunk/src/node/x3d-event-utilities/integer_sequencer.cpp
    trunk/src/node/x3d-event-utilities/integer_sequencer.h
    trunk/src/node/x3d-event-utilities/integer_trigger.cpp
    trunk/src/node/x3d-event-utilities/integer_trigger.h
    trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp
    trunk/src/node/x3d-event-utilities/time_trigger.cpp
    trunk/src/node/x3d-event-utilities/time_trigger.h
    trunk/src/node/x3d-geometry2d/arc2d.cpp
    trunk/src/node/x3d-geometry2d/arc2d.h
    trunk/src/node/x3d-geometry2d/arc_close2d.cpp
    trunk/src/node/x3d-geometry2d/arc_close2d.h
    trunk/src/node/x3d-geometry2d/circle2d.cpp
    trunk/src/node/x3d-geometry2d/circle2d.h
    trunk/src/node/x3d-geometry2d/disk2d.cpp
    trunk/src/node/x3d-geometry2d/disk2d.h
    trunk/src/node/x3d-geometry2d/polyline2d.cpp
    trunk/src/node/x3d-geometry2d/polyline2d.h
    trunk/src/node/x3d-geometry2d/polypoint2d.cpp
    trunk/src/node/x3d-geometry2d/polypoint2d.h
    trunk/src/node/x3d-geometry2d/rectangle2d.cpp
    trunk/src/node/x3d-geometry2d/rectangle2d.h
    trunk/src/node/x3d-geometry2d/register_node_metatypes.cpp
    trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
    trunk/src/node/x3d-geometry2d/triangle_set2d.h
    trunk/src/node/x3d-geospatial/geo_coordinate.cpp
    trunk/src/node/x3d-geospatial/geo_coordinate.h
    trunk/src/node/x3d-geospatial/geo_elevation_grid.cpp
    trunk/src/node/x3d-geospatial/geo_elevation_grid.h
    trunk/src/node/x3d-geospatial/geo_location.cpp
    trunk/src/node/x3d-geospatial/geo_location.h
    trunk/src/node/x3d-geospatial/geo_lod.cpp
    trunk/src/node/x3d-geospatial/geo_lod.h
    trunk/src/node/x3d-geospatial/geo_metadata.cpp
    trunk/src/node/x3d-geospatial/geo_metadata.h
    trunk/src/node/x3d-geospatial/geo_origin.cpp
    trunk/src/node/x3d-geospatial/geo_origin.h
    trunk/src/node/x3d-geospatial/geo_position_interpolator.cpp
    trunk/src/node/x3d-geospatial/geo_position_interpolator.h
    trunk/src/node/x3d-geospatial/geo_touch_sensor.cpp
    trunk/src/node/x3d-geospatial/geo_touch_sensor.h
    trunk/src/node/x3d-geospatial/geo_viewpoint.cpp
    trunk/src/node/x3d-geospatial/geo_viewpoint.h
    trunk/src/node/x3d-geospatial/register_node_metatypes.cpp
    trunk/src/node/x3d-grouping/register_node_metatypes.cpp
    trunk/src/node/x3d-grouping/static_group.cpp
    trunk/src/node/x3d-grouping/static_group.h
    trunk/src/node/x3d-h-anim/h_anim_displacer.cpp
    trunk/src/node/x3d-h-anim/h_anim_displacer.h
    trunk/src/node/x3d-h-anim/h_anim_humanoid.cpp
    trunk/src/node/x3d-h-anim/h_anim_humanoid.h
    trunk/src/node/x3d-h-anim/h_anim_joint.cpp
    trunk/src/node/x3d-h-anim/h_anim_joint.h
    trunk/src/node/x3d-h-anim/h_anim_segment.cpp
    trunk/src/node/x3d-h-anim/h_anim_segment.h
    trunk/src/node/x3d-h-anim/h_anim_site.cpp
    trunk/src/node/x3d-h-anim/h_anim_site.h
    trunk/src/node/x3d-h-anim/register_node_metatypes.cpp
    trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
    trunk/src/node/x3d-interpolation/coordinate_interpolator2d.h
    trunk/src/node/x3d-interpolation/position_interpolator2d.cpp
    trunk/src/node/x3d-interpolation/position_interpolator2d.h
    trunk/src/node/x3d-interpolation/register_node_metatypes.cpp
    trunk/src/node/x3d-key-device-sensor/key_sensor.cpp
    trunk/src/node/x3d-key-device-sensor/key_sensor.h
    trunk/src/node/x3d-key-device-sensor/register_node_metatypes.cpp
    trunk/src/node/x3d-key-device-sensor/string_sensor.cpp
    trunk/src/node/x3d-key-device-sensor/string_sensor.h
    trunk/src/node/x3d-networking/load_sensor.cpp
    trunk/src/node/x3d-networking/load_sensor.h
    trunk/src/node/x3d-networking/register_node_metatypes.cpp
    trunk/src/node/x3d-nurbs/contour2d.cpp
    trunk/src/node/x3d-nurbs/contour2d.h
    trunk/src/node/x3d-nurbs/contour_polyline2d.cpp
    trunk/src/node/x3d-nurbs/contour_polyline2d.h
    trunk/src/node/x3d-nurbs/coordinate_double.cpp
    trunk/src/node/x3d-nurbs/coordinate_double.h
    trunk/src/node/x3d-nurbs/nurbs_curve.cpp
    trunk/src/node/x3d-nurbs/nurbs_curve.h
    trunk/src/node/x3d-nurbs/nurbs_curve2d.cpp
    trunk/src/node/x3d-nurbs/nurbs_curve2d.h
    trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp
    trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.h
    trunk/src/node/x3d-nurbs/nurbs_patch_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_patch_surface.h
    trunk/src/node/x3d-nurbs/nurbs_position_interpolator.cpp
    trunk/src/node/x3d-nurbs/nurbs_position_interpolator.h
    trunk/src/node/x3d-nurbs/nurbs_set.cpp
    trunk/src/node/x3d-nurbs/nurbs_set.h
    trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp
    trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.h
    trunk/src/node/x3d-nurbs/nurbs_swept_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_swept_surface.h
    trunk/src/node/x3d-nurbs/nurbs_swung_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_swung_surface.h
    trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp
    trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.h
    trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.h
    trunk/src/node/x3d-nurbs/register_node_metatypes.cpp
    trunk/src/node/x3d-rendering/color_rgba.cpp
    trunk/src/node/x3d-rendering/color_rgba.h
    trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
    trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h
    trunk/src/node/x3d-rendering/indexed_triangle_set.cpp
    trunk/src/node/x3d-rendering/indexed_triangle_set.h
    trunk/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
    trunk/src/node/x3d-rendering/indexed_triangle_strip_set.h
    trunk/src/node/x3d-rendering/register_node_metatypes.cpp
    trunk/src/node/x3d-rendering/triangle_fan_set.cpp
    trunk/src/node/x3d-rendering/triangle_fan_set.h
    trunk/src/node/x3d-rendering/triangle_set.cpp
    trunk/src/node/x3d-rendering/triangle_set.h
    trunk/src/node/x3d-rendering/triangle_strip_set.cpp
    trunk/src/node/x3d-rendering/triangle_strip_set.h
    trunk/src/node/x3d-shape/fill_properties.cpp
    trunk/src/node/x3d-shape/fill_properties.h
    trunk/src/node/x3d-shape/line_properties.cpp
    trunk/src/node/x3d-shape/line_properties.h
    trunk/src/node/x3d-shape/register_node_metatypes.cpp
    trunk/src/node/x3d-texturing/multi_texture.cpp
    trunk/src/node/x3d-texturing/multi_texture.h
    trunk/src/node/x3d-texturing/multi_texture_coordinate.cpp
    trunk/src/node/x3d-texturing/multi_texture_coordinate.h
    trunk/src/node/x3d-texturing/multi_texture_transform.cpp
    trunk/src/node/x3d-texturing/multi_texture_transform.h
    trunk/src/node/x3d-texturing/register_node_metatypes.cpp
    trunk/src/node/x3d-texturing/texture_coordinate_generator.cpp
    trunk/src/node/x3d-texturing/texture_coordinate_generator.h


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18:3951,3955,3960,3994,4104,4110,4152
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-21 01:45:35 UTC (rev 4237)
+++ trunk/ChangeLog	2011-04-21 04:03:21 UTC (rev 4238)
@@ -3,6 +3,20 @@
 	* tests/Makefile.am (AM_CPPFLAGS): Define
 	BOOST_FILESYSTEM_VERSION=2 to compile with Boost 1.46.
 
+2011-04-17 Braden McDaniel  <br...@en...>
+
+	Updates for 0.18.7 release.
+
+	* README
+	* NEWS
+	* configure.ac
+	* doc/Doxyfile
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+	* src/Makefile.am
+	(LIBOPENVRML_LIBRARY_VERSION): Update to 9:5:1.
+
 2011-04-16 Braden McDaniel  <br...@en...>
 
 	Update to Doxygen 1.4.7.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2011-04-21 01:45:35 UTC (rev 4237)
+++ trunk/NEWS	2011-04-21 04:03:21 UTC (rev 4238)
@@ -1,3 +1,15 @@
+Changes new in version 0.18.7, 17 April, 2011
+========================================================================
+
+- Build against XULRunner 2.0.
+
+- Added Visual C++ 2010 project files.
+
+- Fixed issues compiling with Text node rendering disabled.
+
+- Improved parser resilience.
+
+
 Changes new in version 0.18.6, 2 June, 2010
 ========================================================================
 

Modified: trunk/README
===================================================================
--- trunk/README	2011-04-21 01:45:35 UTC (rev 4237)
+++ trunk/README	2011-04-21 04:03:21 UTC (rev 4238)
@@ -1,6 +1,6 @@
 OpenVRML library version 0.18.99
 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Braden McDaniel <br...@en...>
 Portions Copyright SGI and others
 

Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile	2011-04-21 01:45:35 UTC (rev 4237)
+++ trunk/doc/Doxyfile	2011-04-21 04:03:21 UTC (rev 4238)
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = OpenVRML
-PROJECT_NUMBER         = 0.18.6
+PROJECT_NUMBER         = 0.18.7
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       =

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2011-04-21 01:45:35 UTC (rev 4237)
+++ trunk/src/Makefile.am	2011-04-21 04:03:21 UTC (rev 4238)
@@ -47,7 +47,7 @@
         libopenvrml/private.h \
         openvrml-player/filechooserdialog.h
 
-LIBOPENVRML_LIBRARY_VERSION =    9:4:0
+LIBOPENVRML_LIBRARY_VERSION =    9:5:1
 LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0
 #                                | | |
 #                         +------+ | +---+


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3955,3960,3994,4104,4110,4152
/branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674
   + /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674


Property changes on: trunk/src/libopenvrml/openvrml/local/proto.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801
   + /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/local/proto.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801
   + /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3955,3960,3994,4104,4110,4152
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801

Modified: trunk/src/libopenvrml/openvrml.rc
===================================================================
--- trunk/src/libopenvrml/openvrml.rc	2011-04-21 01:45:35 UTC (rev 4237)
+++ trunk/src/libopenvrml/openvrml.rc	2011-04-21 04:03:21 UTC (rev 4238)
@@ -11,8 +11,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,3,0,0
- PRODUCTVERSION 0,18,5,0
+ FILEVERSION 9,5,1,0
+ PRODUCTVERSION 0,18,7,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -28,12 +28,12 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "OpenVRML Library"
-            VALUE "FileVersion", "9, 3, 0, 0"
+            VALUE "FileVersion", "9, 5, 1, 0"
             VALUE "InternalName", "openvrml"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "OriginalFilename", "openvrml.dll"
             VALUE "ProductName", "OpenVRML Library"
-            VALUE "ProductVersion", "0.18.99"
+            VALUE "ProductVersion", "0.18.7"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/src/libopenvrml/openvrml.vcxproj
===================================================================
--- trunk/src/libopenvrml/openvrml.vcxproj	2011-04-21 01:45:35 UTC (rev 4237)
+++ trunk/src/libopenvrml/openvrml.vcxproj	2011-04-21 04:03:21 UTC (rev 4238)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -65,7 +65,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.99";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.7";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -91,7 +91,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.99";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.7";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

Modified: trunk/src/libopenvrml-gl/openvrml-gl.rc
===================================================================
--- trunk/src/libopenvrml-gl/openvrml-gl.rc	2011-04-21 01:45:35 UTC (rev 4237)
+++ trunk/src/libopenvrml-gl/openvrml-gl.rc	2011-04-21 04:03:21 UTC (rev 4238)
@@ -12,7 +12,7 @@
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 8,0,0,0
- PRODUCTVERSION 0,18,5,0
+ PRODUCTVERSION 0,18,7,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -30,10 +30,10 @@
             VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
             VALUE "FileVersion", "8, 0, 0, 0"
             VALUE "InternalName", "openvrml-gl"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "OriginalFilename", "openvrml-gl.dll"
             VALUE "ProductName", "OpenVRML Library"
-            VALUE "ProductVersion", "0.18.99"
+            VALUE "ProductVersion", "0.18.7"
         END
     END
     BLOCK "VarFileInfo"


Property changes on: trunk/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/mozilla-plugin:3951,3955,3960,3994,4104,4110,4152
   + /branches/0.18/src/mozilla-plugin:3951,3955,3960,3994,4104,4110,4152,4234


Property changes on: trunk/src/node/vrml97/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734


Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3955,3960,3994,4104,4110,4152
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3955,3960,3994,4104,4110,4152
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734


Property changes on: trunk/src/node/x3d-core/metadata_double.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_double.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_double.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_double.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_float.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_float.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_float.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_float.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_integer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_integer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_integer.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_integer.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_set.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_set.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_set.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_string.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_string.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-core/metadata_string.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_string.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734


Property changes on: trunk/src/node/x3d-dis/espdu_transform.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/espdu_transform.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/receiver_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/receiver_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734


Property changes on: trunk/src/node/x3d-dis/signal_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/signal_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734


Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630
   + /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630


Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630
   + /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3955,3960,3994,4104,4110,4152
/branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopen...
 
[truncated message content]

SF.net SVN: openvrml:[4241] trunk

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

Revision: 4241
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4241&view=rev
Author:   braden
Date:     2011-07-24 05:43:19 +0000 (Sun, 24 Jul 2011)

Log Message:
-----------
Updates for 0.18.8 release.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/doc/Doxyfile
    trunk/src/Makefile.am
    trunk/src/libopenvrml/openvrml.rc
    trunk/src/libopenvrml/openvrml.vcxproj
    trunk/src/libopenvrml-gl/openvrml-gl.rc

Property Changed:
----------------
    trunk/
    trunk/src/libopenvrml/openvrml/bad_url.cpp
    trunk/src/libopenvrml/openvrml/bad_url.h
    trunk/src/libopenvrml/openvrml/local/proto.cpp
    trunk/src/libopenvrml/openvrml/local/proto.h
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/libopenvrml/openvrml/scene.h
    trunk/src/libopenvrml/openvrml/script.cpp
    trunk/src/mozilla-plugin/
    trunk/src/node/vrml97/register_node_metatypes.cpp
    trunk/src/node/x3d-cad-geometry/cad_face.cpp
    trunk/src/node/x3d-cad-geometry/cad_face.h
    trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp
    trunk/src/node/x3d-cad-geometry/indexed_quad_set.h
    trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp
    trunk/src/node/x3d-core/metadata_double.cpp
    trunk/src/node/x3d-core/metadata_double.h
    trunk/src/node/x3d-core/metadata_float.cpp
    trunk/src/node/x3d-core/metadata_float.h
    trunk/src/node/x3d-core/metadata_integer.cpp
    trunk/src/node/x3d-core/metadata_integer.h
    trunk/src/node/x3d-core/metadata_set.cpp
    trunk/src/node/x3d-core/metadata_set.h
    trunk/src/node/x3d-core/metadata_string.cpp
    trunk/src/node/x3d-core/metadata_string.h
    trunk/src/node/x3d-core/register_node_metatypes.cpp
    trunk/src/node/x3d-dis/espdu_transform.cpp
    trunk/src/node/x3d-dis/espdu_transform.h
    trunk/src/node/x3d-dis/receiver_pdu.cpp
    trunk/src/node/x3d-dis/receiver_pdu.h
    trunk/src/node/x3d-dis/register_node_metatypes.cpp
    trunk/src/node/x3d-dis/signal_pdu.cpp
    trunk/src/node/x3d-dis/signal_pdu.h
    trunk/src/node/x3d-dis/transmitter_pdu.cpp
    trunk/src/node/x3d-dis/transmitter_pdu.h
    trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp
    trunk/src/node/x3d-environmental-effects/texture_background.cpp
    trunk/src/node/x3d-environmental-effects/texture_background.h
    trunk/src/node/x3d-event-utilities/boolean_filter.cpp
    trunk/src/node/x3d-event-utilities/boolean_filter.h
    trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp
    trunk/src/node/x3d-event-utilities/boolean_sequencer.h
    trunk/src/node/x3d-event-utilities/boolean_toggle.cpp
    trunk/src/node/x3d-event-utilities/boolean_toggle.h
    trunk/src/node/x3d-event-utilities/boolean_trigger.cpp
    trunk/src/node/x3d-event-utilities/boolean_trigger.h
    trunk/src/node/x3d-event-utilities/integer_sequencer.cpp
    trunk/src/node/x3d-event-utilities/integer_sequencer.h
    trunk/src/node/x3d-event-utilities/integer_trigger.cpp
    trunk/src/node/x3d-event-utilities/integer_trigger.h
    trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp
    trunk/src/node/x3d-event-utilities/time_trigger.cpp
    trunk/src/node/x3d-event-utilities/time_trigger.h
    trunk/src/node/x3d-geometry2d/arc2d.cpp
    trunk/src/node/x3d-geometry2d/arc2d.h
    trunk/src/node/x3d-geometry2d/arc_close2d.cpp
    trunk/src/node/x3d-geometry2d/arc_close2d.h
    trunk/src/node/x3d-geometry2d/circle2d.cpp
    trunk/src/node/x3d-geometry2d/circle2d.h
    trunk/src/node/x3d-geometry2d/disk2d.cpp
    trunk/src/node/x3d-geometry2d/disk2d.h
    trunk/src/node/x3d-geometry2d/polyline2d.cpp
    trunk/src/node/x3d-geometry2d/polyline2d.h
    trunk/src/node/x3d-geometry2d/polypoint2d.cpp
    trunk/src/node/x3d-geometry2d/polypoint2d.h
    trunk/src/node/x3d-geometry2d/rectangle2d.cpp
    trunk/src/node/x3d-geometry2d/rectangle2d.h
    trunk/src/node/x3d-geometry2d/register_node_metatypes.cpp
    trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
    trunk/src/node/x3d-geometry2d/triangle_set2d.h
    trunk/src/node/x3d-geospatial/geo_coordinate.cpp
    trunk/src/node/x3d-geospatial/geo_coordinate.h
    trunk/src/node/x3d-geospatial/geo_elevation_grid.cpp
    trunk/src/node/x3d-geospatial/geo_elevation_grid.h
    trunk/src/node/x3d-geospatial/geo_location.cpp
    trunk/src/node/x3d-geospatial/geo_location.h
    trunk/src/node/x3d-geospatial/geo_lod.cpp
    trunk/src/node/x3d-geospatial/geo_lod.h
    trunk/src/node/x3d-geospatial/geo_metadata.cpp
    trunk/src/node/x3d-geospatial/geo_metadata.h
    trunk/src/node/x3d-geospatial/geo_origin.cpp
    trunk/src/node/x3d-geospatial/geo_origin.h
    trunk/src/node/x3d-geospatial/geo_position_interpolator.cpp
    trunk/src/node/x3d-geospatial/geo_position_interpolator.h
    trunk/src/node/x3d-geospatial/geo_touch_sensor.cpp
    trunk/src/node/x3d-geospatial/geo_touch_sensor.h
    trunk/src/node/x3d-geospatial/geo_viewpoint.cpp
    trunk/src/node/x3d-geospatial/geo_viewpoint.h
    trunk/src/node/x3d-geospatial/register_node_metatypes.cpp
    trunk/src/node/x3d-grouping/register_node_metatypes.cpp
    trunk/src/node/x3d-grouping/static_group.cpp
    trunk/src/node/x3d-grouping/static_group.h
    trunk/src/node/x3d-h-anim/h_anim_displacer.cpp
    trunk/src/node/x3d-h-anim/h_anim_displacer.h
    trunk/src/node/x3d-h-anim/h_anim_humanoid.cpp
    trunk/src/node/x3d-h-anim/h_anim_humanoid.h
    trunk/src/node/x3d-h-anim/h_anim_joint.cpp
    trunk/src/node/x3d-h-anim/h_anim_joint.h
    trunk/src/node/x3d-h-anim/h_anim_segment.cpp
    trunk/src/node/x3d-h-anim/h_anim_segment.h
    trunk/src/node/x3d-h-anim/h_anim_site.cpp
    trunk/src/node/x3d-h-anim/h_anim_site.h
    trunk/src/node/x3d-h-anim/register_node_metatypes.cpp
    trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
    trunk/src/node/x3d-interpolation/coordinate_interpolator2d.h
    trunk/src/node/x3d-interpolation/position_interpolator2d.cpp
    trunk/src/node/x3d-interpolation/position_interpolator2d.h
    trunk/src/node/x3d-interpolation/register_node_metatypes.cpp
    trunk/src/node/x3d-key-device-sensor/key_sensor.cpp
    trunk/src/node/x3d-key-device-sensor/key_sensor.h
    trunk/src/node/x3d-key-device-sensor/register_node_metatypes.cpp
    trunk/src/node/x3d-key-device-sensor/string_sensor.cpp
    trunk/src/node/x3d-key-device-sensor/string_sensor.h
    trunk/src/node/x3d-networking/load_sensor.cpp
    trunk/src/node/x3d-networking/load_sensor.h
    trunk/src/node/x3d-networking/register_node_metatypes.cpp
    trunk/src/node/x3d-nurbs/contour2d.cpp
    trunk/src/node/x3d-nurbs/contour2d.h
    trunk/src/node/x3d-nurbs/contour_polyline2d.cpp
    trunk/src/node/x3d-nurbs/contour_polyline2d.h
    trunk/src/node/x3d-nurbs/coordinate_double.cpp
    trunk/src/node/x3d-nurbs/coordinate_double.h
    trunk/src/node/x3d-nurbs/nurbs_curve.cpp
    trunk/src/node/x3d-nurbs/nurbs_curve.h
    trunk/src/node/x3d-nurbs/nurbs_curve2d.cpp
    trunk/src/node/x3d-nurbs/nurbs_curve2d.h
    trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp
    trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.h
    trunk/src/node/x3d-nurbs/nurbs_patch_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_patch_surface.h
    trunk/src/node/x3d-nurbs/nurbs_position_interpolator.cpp
    trunk/src/node/x3d-nurbs/nurbs_position_interpolator.h
    trunk/src/node/x3d-nurbs/nurbs_set.cpp
    trunk/src/node/x3d-nurbs/nurbs_set.h
    trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp
    trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.h
    trunk/src/node/x3d-nurbs/nurbs_swept_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_swept_surface.h
    trunk/src/node/x3d-nurbs/nurbs_swung_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_swung_surface.h
    trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp
    trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.h
    trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.h
    trunk/src/node/x3d-nurbs/register_node_metatypes.cpp
    trunk/src/node/x3d-rendering/color_rgba.cpp
    trunk/src/node/x3d-rendering/color_rgba.h
    trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
    trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h
    trunk/src/node/x3d-rendering/indexed_triangle_set.cpp
    trunk/src/node/x3d-rendering/indexed_triangle_set.h
    trunk/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
    trunk/src/node/x3d-rendering/indexed_triangle_strip_set.h
    trunk/src/node/x3d-rendering/register_node_metatypes.cpp
    trunk/src/node/x3d-rendering/triangle_fan_set.cpp
    trunk/src/node/x3d-rendering/triangle_fan_set.h
    trunk/src/node/x3d-rendering/triangle_set.cpp
    trunk/src/node/x3d-rendering/triangle_set.h
    trunk/src/node/x3d-rendering/triangle_strip_set.cpp
    trunk/src/node/x3d-rendering/triangle_strip_set.h
    trunk/src/node/x3d-shape/fill_properties.cpp
    trunk/src/node/x3d-shape/fill_properties.h
    trunk/src/node/x3d-shape/line_properties.cpp
    trunk/src/node/x3d-shape/line_properties.h
    trunk/src/node/x3d-shape/register_node_metatypes.cpp
    trunk/src/node/x3d-texturing/multi_texture.cpp
    trunk/src/node/x3d-texturing/multi_texture.h
    trunk/src/node/x3d-texturing/multi_texture_coordinate.cpp
    trunk/src/node/x3d-texturing/multi_texture_coordinate.h
    trunk/src/node/x3d-texturing/multi_texture_transform.cpp
    trunk/src/node/x3d-texturing/multi_texture_transform.h
    trunk/src/node/x3d-texturing/register_node_metatypes.cpp
    trunk/src/node/x3d-texturing/texture_coordinate_generator.cpp
    trunk/src/node/x3d-texturing/texture_coordinate_generator.h


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-21 05:58:40 UTC (rev 4240)
+++ trunk/ChangeLog	2011-07-24 05:43:19 UTC (rev 4241)
@@ -1,3 +1,18 @@
+2011-04-21 Braden McDaniel  <br...@en...>
+
+	Updates for 0.18.8 release.
+
+	* README
+	* NEWS
+	* configure.ac
+	* doc/Doxyfile
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+	* src/Makefile.am
+	(LIBOPENVRML_LIBRARY_VERSION): Update to 10:0:1.  Previous change
+	was incorrect.
+
 2011-04-20 Braden McDaniel  <br...@en...>
 
 	* tests/Makefile.am (AM_CPPFLAGS): Define

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2011-04-21 05:58:40 UTC (rev 4240)
+++ trunk/NEWS	2011-07-24 05:43:19 UTC (rev 4241)
@@ -1,3 +1,9 @@
+Changes new in version 0.18.8, 21 April, 2011
+========================================================================
+
+- Fix botched libopenvrml library version.
+
+
 Changes new in version 0.18.7, 17 April, 2011
 ========================================================================
 

Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile	2011-04-21 05:58:40 UTC (rev 4240)
+++ trunk/doc/Doxyfile	2011-07-24 05:43:19 UTC (rev 4241)
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = OpenVRML
-PROJECT_NUMBER         = 0.18.7
+PROJECT_NUMBER         = 0.18.8
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       =

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2011-04-21 05:58:40 UTC (rev 4240)
+++ trunk/src/Makefile.am	2011-07-24 05:43:19 UTC (rev 4241)
@@ -47,7 +47,7 @@
         libopenvrml/private.h \
         openvrml-player/filechooserdialog.h
 
-LIBOPENVRML_LIBRARY_VERSION =    9:5:1
+LIBOPENVRML_LIBRARY_VERSION =    10:0:1
 LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0
 #                                | | |
 #                         +------+ | +---+


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674
   + /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674


Property changes on: trunk/src/libopenvrml/openvrml/local/proto.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801
   + /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/local/proto.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801
   + /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801

Modified: trunk/src/libopenvrml/openvrml.rc
===================================================================
--- trunk/src/libopenvrml/openvrml.rc	2011-04-21 05:58:40 UTC (rev 4240)
+++ trunk/src/libopenvrml/openvrml.rc	2011-07-24 05:43:19 UTC (rev 4241)
@@ -28,12 +28,12 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "OpenVRML Library"
-            VALUE "FileVersion", "9, 5, 1, 0"
+            VALUE "FileVersion", "10, 0, 1, 0"
             VALUE "InternalName", "openvrml"
             VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "OriginalFilename", "openvrml.dll"
             VALUE "ProductName", "OpenVRML Library"
-            VALUE "ProductVersion", "0.18.7"
+            VALUE "ProductVersion", "0.18.8"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/src/libopenvrml/openvrml.vcxproj
===================================================================
--- trunk/src/libopenvrml/openvrml.vcxproj	2011-04-21 05:58:40 UTC (rev 4240)
+++ trunk/src/libopenvrml/openvrml.vcxproj	2011-07-24 05:43:19 UTC (rev 4241)
@@ -65,7 +65,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.7";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -91,7 +91,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.7";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

Modified: trunk/src/libopenvrml-gl/openvrml-gl.rc
===================================================================
--- trunk/src/libopenvrml-gl/openvrml-gl.rc	2011-04-21 05:58:40 UTC (rev 4240)
+++ trunk/src/libopenvrml-gl/openvrml-gl.rc	2011-07-24 05:43:19 UTC (rev 4241)
@@ -33,7 +33,7 @@
             VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "OriginalFilename", "openvrml-gl.dll"
             VALUE "ProductName", "OpenVRML Library"
-            VALUE "ProductVersion", "0.18.7"
+            VALUE "ProductVersion", "0.18.8"
         END
     END
     BLOCK "VarFileInfo"


Property changes on: trunk/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/mozilla-plugin:3951,3955,3960,3994,4104,4110,4152,4234
   + /branches/0.18/src/mozilla-plugin:3951,3955,3960,3994,4104,4110,4152,4234,4239


Property changes on: trunk/src/node/vrml97/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734


Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734


Property changes on: trunk/src/node/x3d-core/metadata_double.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_double.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_double.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_double.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_float.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_float.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_float.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_float.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_integer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_integer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_integer.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_integer.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_set.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_set.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_set.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_string.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_string.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-core/metadata_string.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-core/metadata_string.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734


Property changes on: trunk/src/node/x3d-dis/espdu_transform.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/espdu_transform.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/receiver_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/receiver_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734


Property changes on: trunk/src/node/x3d-dis/signal_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/signal_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734


Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630
   + /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630


Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630
   + /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152,4234,4239
/branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734


Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3955,3960,3994,4104,4110,4152,4234
/branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_ev...
 
[truncated message content]

SF.net SVN: openvrml:[4243] trunk

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

Revision: 4243
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4243&view=rev
Author:   braden
Date:     2011-08-17 07:39:15 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
Use the Boost.Filesystem version 3 API.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/Makefile.am
    trunk/src/libopenvrml/openvrml/local/component.cpp
    trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-07-24 07:20:19 UTC (rev 4242)
+++ trunk/ChangeLog	2011-08-17 07:39:15 UTC (rev 4243)
@@ -1,3 +1,20 @@
+2011-08-17 Braden McDaniel  <br...@en...>
+
+	Use the Boost.Filesystem version 3 API.
+
+	* src/Makefile.am
+	(libopenvrml_libopenvrml_la_CPPFLAGS): Removed
+	-DBOOST_FILESYSTEM_VERSION=2.
+	(local_libopenvrml_dl_la_CPPFLAGS): Removed
+	-DBOOST_FILESYSTEM_VERSION=2.
+	(script_java_la_CPPFLAGS): Removed -DBOOST_FILESYSTEM_VERSION=2.
+	* src/libopenvrml/openvrml/local/component.cpp
+	(openvrml::local::component_registry::component_registry()): Use
+	boost::filesystem::path::string.
+	* src/local/libopenvrml-dl/openvrml/local/dl.cpp
+	(openvrml::local::dl::prepend_to_searchpath(const
+	boost::filesystem::path &)): Use boost::filesystem::path::string.
+
 2011-04-21 Braden McDaniel  <br...@en...>
 
 	Updates for 0.18.8 release.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2011-07-24 07:20:19 UTC (rev 4242)
+++ trunk/src/Makefile.am	2011-08-17 07:39:15 UTC (rev 4243)
@@ -70,8 +70,7 @@
         -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \
         -DOPENVRML_PKGLIBDIR_=\"$(pkglibdir)\" \
         -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
-        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30 \
-        -DBOOST_FILESYSTEM_VERSION=2
+        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30
 libopenvrml_libopenvrml_la_CXXFLAGS = \
         $(FREETYPE_CFLAGS) \
         $(PTHREAD_CFLAGS) \
@@ -133,8 +132,7 @@
         local/libopenvrml-dl/openvrml/local/dl.h
 local_libopenvrml_dl_la_CPPFLAGS = \
         -I$(top_builddir)/src/libopenvrml \
-        -I$(top_srcdir)/src/libopenvrml \
-        -DBOOST_FILESYSTEM_VERSION=2
+        -I$(top_srcdir)/src/libopenvrml
 local_libopenvrml_dl_la_LIBADD = \
         -lboost_filesystem$(BOOST_LIB_SUFFIX) \
         -lboost_system$(BOOST_LIB_SUFFIX) \
@@ -177,8 +175,7 @@
         -DJRE_HOME=\"$(JRE_HOME)\" \
         -DOPENVRML_JVM_ARCH=\"$(OPENVRML_JVM_ARCH)\" \
         -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
-        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30 \
-        -DBOOST_FILESYSTEM_VERSION=2
+        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30
 script_java_la_LDFLAGS = \
         -module \
         -no-undefined \

Modified: trunk/src/libopenvrml/openvrml/local/component.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/component.cpp	2011-07-24 07:20:19 UTC (rev 4242)
+++ trunk/src/libopenvrml/openvrml/local/component.cpp	2011-08-17 07:39:15 UTC (rev 4243)
@@ -358,8 +358,7 @@
          entry != directory_iterator();
          ++entry) {
         if (!is_directory(entry->path())) try {
-            auto_ptr<component>
-                c(new component(entry->path().file_string()));
+            auto_ptr<component> c(new component(entry->path().string()));
             std::string key = c->id();
             succeeded = this->insert(key, c.release()).second;
             assert(succeeded);

Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2011-07-24 07:20:19 UTC (rev 4242)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2011-08-17 07:39:15 UTC (rev 4243)
@@ -103,11 +103,13 @@
 int
 openvrml::local::dl::prepend_to_searchpath(const boost::filesystem::path & dir)
 {
+    const std::string & dir_str = dir.string();
+    const char * const dir_c_str = dir_str.c_str();
 # ifdef _WIN32
-    return SetDllDirectory(dir.directory_string().c_str());
+    return SetDllDirectory(dir_c_str);
 # else
     const char * const before = lt_dlgetsearchpath();
-    return lt_dlinsertsearchdir(before, dir.directory_string().c_str());
+    return lt_dlinsertsearchdir(before, dir_c_str);
 # endif
 }
 


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

SF.net SVN: openvrml:[4245] trunk

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

Revision: 4245
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4245&view=rev
Author:   braden
Date:     2011-08-20 06:28:22 +0000 (Sat, 20 Aug 2011)

Log Message:
-----------
Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost 1.44 and later.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/README
    trunk/src/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-08-17 15:44:12 UTC (rev 4244)
+++ trunk/ChangeLog	2011-08-20 06:28:22 UTC (rev 4245)
@@ -1,3 +1,16 @@
+2011-08-20 Braden McDaniel  <br...@en...>
+
+	Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost
+	1.44 and later.
+
+	* README: Note Boost 1.44 minimum version.
+	* src/Makefile.am
+	(libopenvrml_libopenvrml_la_CPPFLAGS): Define
+	BOOST_FILESYSTEM_VERSION=3.
+	(local_libopenvrml_dl_la_CPPFLAGS): Define
+	BOOST_FILESYSTEM_VERSION=3.
+	(script_java_la_CPPFLAGS): Define BOOST_FILESYSTEM_VERSION=3.
+
 2011-08-17 Braden McDaniel  <br...@en...>
 
 	Use the Boost.Filesystem version 3 API.

Modified: trunk/README
===================================================================
--- trunk/README	2011-08-17 15:44:12 UTC (rev 4244)
+++ trunk/README	2011-08-20 06:28:22 UTC (rev 4245)
@@ -136,7 +136,7 @@
 
    At a minimum, OpenVRML requires these libraries to build:
 
-     Boost (at least 1.38)      <http://boost.org>
+     Boost (at least 1.44)      <http://boost.org>
      libltdl (non-Windows only) <http://www.gnu.org/software/libtool/>
      libxml (non-Windows only)  <http://xmlsoft.org>
 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2011-08-17 15:44:12 UTC (rev 4244)
+++ trunk/src/Makefile.am	2011-08-20 06:28:22 UTC (rev 4245)
@@ -70,7 +70,8 @@
         -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \
         -DOPENVRML_PKGLIBDIR_=\"$(pkglibdir)\" \
         -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
-        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30
+        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30 \
+        -DBOOST_FILESYSTEM_VERSION=3
 libopenvrml_libopenvrml_la_CXXFLAGS = \
         $(FREETYPE_CFLAGS) \
         $(PTHREAD_CFLAGS) \
@@ -132,7 +133,8 @@
         local/libopenvrml-dl/openvrml/local/dl.h
 local_libopenvrml_dl_la_CPPFLAGS = \
         -I$(top_builddir)/src/libopenvrml \
-        -I$(top_srcdir)/src/libopenvrml
+        -I$(top_srcdir)/src/libopenvrml \
+        -DBOOST_FILESYSTEM_VERSION=3
 local_libopenvrml_dl_la_LIBADD = \
         -lboost_filesystem$(BOOST_LIB_SUFFIX) \
         -lboost_system$(BOOST_LIB_SUFFIX) \
@@ -175,7 +177,8 @@
         -DJRE_HOME=\"$(JRE_HOME)\" \
         -DOPENVRML_JVM_ARCH=\"$(OPENVRML_JVM_ARCH)\" \
         -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
-        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30
+        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30 \
+        -DBOOST_FILESYSTEM_VERSION=3
 script_java_la_LDFLAGS = \
         -module \
         -no-undefined \


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

SF.net SVN: openvrml:[4247] trunk

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

Revision: 4247
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4247&view=rev
Author:   braden
Date:     2012-04-23 06:19:36 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
NP[P]_GetMIMEDescription returns const char * in recent variations of NPAPI.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/src/mozilla-plugin/openvrml.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-08-20 06:32:28 UTC (rev 4246)
+++ trunk/ChangeLog	2012-04-23 06:19:36 UTC (rev 4247)
@@ -1,3 +1,11 @@
+2012-04-23 Braden McDaniel  <br...@en...>
+
+	NP[P]_GetMIMEDescription returns const char * in recent variations of
+	NPAPI.
+
+	* configure.ac
+	* src/mozilla-plugin/openvrml.cpp
+
 2011-08-20 Braden McDaniel  <br...@en...>
 
 	Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2011-08-20 06:32:28 UTC (rev 4246)
+++ trunk/configure.ac	2012-04-23 06:19:36 UTC (rev 4247)
@@ -288,13 +288,27 @@
                   [have_gnomeui=no])
 PKG_CHECK_MODULES([GIO], [gio-2.0], , [have_gio=no])
 PKG_CHECK_MODULES([CURL], [libcurl], , [have_libcurl=no])
-#
-# The Mozilla plug-in uses the npfunctions.h header introduced in
-# XULRunner 1.9.1.
-#
-PKG_CHECK_MODULES([MOZILLA_PLUGIN], [mozilla-plugin >= 1.9.1],
+PKG_CHECK_MODULES([MOZILLA_PLUGIN], [mozilla-plugin >= 2],
                   [have_mozilla_plugin=yes],
                   [have_mozilla_plugin=no])
+AC_LANG_PUSH([C++])
+ov_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$MOZILLA_PLUGIN_CFLAGS $CPPFLAGS"
+AC_CACHE_CHECK([if NP_GetMIMEDescription returns const char *],
+               [ov_cv_np_getmimedescription_const_char],
+[ov_cv_np_getmimedescription_const_char=yes
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <npfunctions.h>
+char * NP_GetMIMEDescription() { return 0; }]],
+                                   [])],
+                  [ov_cv_np_getmimedescription_const_char=no])])
+CPPFLAGS=$ov_save_CPPFLAGS
+AC_LANG_POP([C++])
+ov_np_getmimedescription_const=
+AS_IF([test X$ov_cv_np_getmimedescription_const_char = Xyes],
+      [ov_np_getmimedescription_const=const])
+AC_DEFINE_UNQUOTED([OPENVRML_NP_GETMIMEDESCRIPTION_CONST],
+                   [$ov_np_getmimedescription_const],
+                   [const if NP_GetMIMEDescription returns const char *.])
 
 AC_PATH_XTRA
 AX_CHECK_GLU

Modified: trunk/src/mozilla-plugin/openvrml.cpp
===================================================================
--- trunk/src/mozilla-plugin/openvrml.cpp	2011-08-20 06:32:28 UTC (rev 4246)
+++ trunk/src/mozilla-plugin/openvrml.cpp	2012-04-23 06:19:36 UTC (rev 4247)
@@ -215,7 +215,7 @@
 {
 }
 
-char * NP_GetMIMEDescription()
+OPENVRML_NP_GETMIMEDESCRIPTION_CONST char * NP_GetMIMEDescription()
 {
     return NPP_GetMIMEDescription();
 }
@@ -380,13 +380,13 @@
     return err;
 }
 
-char * NPP_GetMIMEDescription()
+OPENVRML_NP_GETMIMEDESCRIPTION_CONST char * NPP_GetMIMEDescription()
 {
     static const char mimeDescription[] =
         "model/x3d-vrml:x3dv:X3D world;"
         "model/vrml:wrl:VRML world;"
         "x-world/x-vrml:wrl:VRML world";
-    return const_cast<char *>(&mimeDescription[0]);
+    return &mimeDescription[0];
 }
 
 /**

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

SF.net SVN: openvrml:[4249] trunk

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

Revision: 4249
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4249&view=rev
Author:   braden
Date:     2012-04-23 07:37:06 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
libpng 1.5 removes direct access to struct members; use accessor functions instead.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/node/vrml97/image_stream_listener.cpp
    trunk/src/node/vrml97/image_stream_listener.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-23 06:47:59 UTC (rev 4248)
+++ trunk/ChangeLog	2012-04-23 07:37:06 UTC (rev 4249)
@@ -1,7 +1,15 @@
+2012-04-23 Tom Callaway <tca...@re...>
+
+	libpng 1.5 removes direct access to struct members; use accessor
+	functions instead.
+
+	* src/node/vrml97/image_stream_listener.cpp
+	* src/node/vrml97/image_stream_listener.h
+
 2012-04-23 Braden McDaniel  <br...@en...>
 
-	NP[P]_GetMIMEDescription returns const char * in recent variations of
-	NPAPI.
+	NP[P]_GetMIMEDescription returns const char * in recent variations
+	of NPAPI.
 
 	* configure.ac
 	* src/mozilla-plugin/openvrml.cpp

Modified: trunk/src/node/vrml97/image_stream_listener.cpp
===================================================================
--- trunk/src/node/vrml97/image_stream_listener.cpp	2012-04-23 06:47:59 UTC (rev 4248)
+++ trunk/src/node/vrml97/image_stream_listener.cpp	2012-04-23 07:37:06 UTC (rev 4249)
@@ -136,7 +136,9 @@
 
     png_read_update_info(png_ptr, info_ptr);
 
-    reader.old_row.resize(png_ptr->rowbytes);
+    reader.width = png_get_image_width(png_ptr, info_ptr);
+    reader.rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+    reader.old_row.resize(reader.rowbytes);
 }
 
 void openvrml_png_row_callback(png_structp png_ptr,
@@ -166,9 +168,7 @@
     // openvrml::image pixels start at the bottom left.
     //
     const size_t image_row = (image.y() - 1) - row_num;
-    const size_t bytes_per_row = png_ptr->rowbytes;
-    const size_t image_width = png_ptr->width;
-    for (size_t pixel_index = 0, byte_index = 0; pixel_index < image_width;
+    for (size_t pixel_index = 0, byte_index = 0; pixel_index < reader.width;
          ++pixel_index) {
         using openvrml::int32;
         int32 pixel = 0x00000000;
@@ -188,14 +188,14 @@
                 ++byte_index;
             }
         }
-        image.pixel(image_row * image_width + pixel_index, pixel);
+        image.pixel(image_row * reader.width + pixel_index, pixel);
     }
 
     reader.stream_listener.node_.modified(true);
 
-    assert(reader.old_row.size() >= bytes_per_row);
+    assert(reader.old_row.size() >= reader.rowbytes);
 
-    copy(new_row, new_row + bytes_per_row, reader.old_row.begin());
+    copy(new_row, new_row + reader.rowbytes, reader.old_row.begin());
 }
 
 void openvrml_png_end_callback(png_structp, png_infop)

Modified: trunk/src/node/vrml97/image_stream_listener.h
===================================================================
--- trunk/src/node/vrml97/image_stream_listener.h	2012-04-23 06:47:59 UTC (rev 4248)
+++ trunk/src/node/vrml97/image_stream_listener.h	2012-04-23 07:37:06 UTC (rev 4249)
@@ -88,6 +88,8 @@
             image_stream_listener & stream_listener;
             std::vector<png_byte> old_row;
             bool gray_palette;
+            png_uint_32 width;
+            png_size_t rowbytes;
 
             explicit png_reader(image_stream_listener & stream_listener);
             virtual ~png_reader() OPENVRML_NOTHROW;

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

SF.net SVN: openvrml:[4251] trunk

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

Revision: 4251
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4251&view=rev
Author:   braden
Date:     2012-04-23 08:19:23 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
More fallout from SpiderMonkey moves away from using jsvals as ids.  Just mitigate this for now.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-23 07:40:06 UTC (rev 4250)
+++ trunk/ChangeLog	2012-04-23 08:19:23 UTC (rev 4251)
@@ -1,3 +1,8 @@
+2012-04-23 Braden McDaniel  <br...@en...>
+
+	* src/script/javascript.cpp: More fallout from SpiderMonkey moves
+	away from using jsvals as ids.  Just mitigate this for now.
+
 2012-04-23 Tom Callaway <tca...@re...>
 
 	libpng 1.5 removes direct access to struct members; use accessor

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-23 07:40:06 UTC (rev 4250)
+++ trunk/src/script/javascript.cpp	2012-04-23 08:19:23 UTC (rev 4251)
@@ -53,7 +53,7 @@
 # endif
     }
 
-    ::int32 jspropertyop_id_to_int(const jspropertyop_id id)
+    int32_t jspropertyop_id_to_int(const jspropertyop_id id)
     {
 # if OPENVRML_JSPROPERTYOP_USES_JSID
         return JSID_TO_INT(id);
@@ -62,6 +62,25 @@
 # endif
     }
 
+    JSBool jspropertyop_id_is_string(const jspropertyop_id id)
+    {
+# if OPENVRML_JSPROPERTYOP_USES_JSID
+        return JSID_IS_STRING(id);
+# else
+        return JSVAL_IS_STRING(id);
+# endif
+    }
+
+    JSString * jspropertyop_id_to_string(JSContext * const cx,
+                                         const jspropertyop_id id)
+    {
+# if OPENVRML_JSPROPERTYOP_USES_JSID
+        return JSID_TO_STRING(id);
+# else
+        return JS_ValueToString(cx, id);
+# endif
+    }
+
     OPENVRML_LOCAL JSBool add_value_root(JSContext * const cx,
                                          jsval * const vp)
     {
@@ -453,7 +472,7 @@
     private:
         static OPENVRML_DECLARE_JSNATIVE(construct);
         static JSBool initObject(JSContext * cx, JSObject * obj,
-                                 uint32 x, uint32 y, uint32 comp,
+                                 uint32_t x, uint32_t y, uint32_t comp,
                                  JSObject * pixels_obj)
             OPENVRML_NOTHROW;
         static JSBool getProperty(JSContext * cx, JSObject * obj,
@@ -1553,7 +1572,7 @@
     {
         using std::find_if;
 
-        JSString * const str = JS_ValueToString(cx, id);
+        JSString * const str = jspropertyop_id_to_string(cx, id);
         if (!str) { return JS_FALSE; }
         const char * const eventId = JS_EncodeString(cx, str);
 
@@ -1604,7 +1623,7 @@
     {
         using std::find_if;
 
-        JSString * const str = JS_ValueToString(cx, id);
+        JSString * const str = jspropertyop_id_to_string(cx, id);
         if (!str) { return JS_FALSE; }
         const char * const fieldId = JS_EncodeString(cx, str);
 
@@ -1945,7 +1964,7 @@
 
         case field_value::sfint32_id:
         {
-            ::int32 i;
+            int32_t i;
             if (!JS_ValueToECMAInt32(cx, v, &i)) {
                 throw bad_conversion("Numeric value expected.");
             }
@@ -2944,7 +2963,7 @@
 
     OPENVRML_DEFINE_MEMBER_JSNATIVE(SFImage, construct)
     {
-        uint32 x = 0, y = 0, comp = 0;
+        uint32_t x = 0, y = 0, comp = 0;
         JSObject * pixels = 0;
         if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "uuuo",
                                  &x, &y, &comp, &pixels)) {
@@ -2981,9 +3000,9 @@
 //
     JSBool SFImage::initObject(JSContext * const cx,
                                JSObject * const obj,
-                               const uint32 x,
-                               const uint32 y,
-                               const uint32 comp,
+                               const uint32_t x,
+                               const uint32_t y,
+                               const uint32_t comp,
                                JSObject * const pixels_obj)
         OPENVRML_NOTHROW
     {
@@ -3009,7 +3028,7 @@
                     assert(JSVAL_IS_INT(mfdata->array[i]));
                     static const long byteMask[] =
                         { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 };
-                    ::int32 pixel;
+                    int32_t pixel;
                     if (!JS_ValueToInt32(cx, mfdata->array[i], &pixel)) {
                         return JS_FALSE;
                     }
@@ -3281,7 +3300,7 @@
                                jsval * const vp)
         OPENVRML_NOTHROW
     {
-        if (!JSVAL_IS_STRING(id)) { return JS_TRUE; }
+        if (!jspropertyop_id_is_string(id)) { return JS_TRUE; }
 
         assert(JS_GetPrivate(cx, obj));
         const sfield::sfdata & sfdata =
@@ -3296,7 +3315,8 @@
         script & s = *static_cast<script *>(JS_GetContextPrivate(cx));
 
         try {
-            const char * eventOut = JS_EncodeString(cx, JSVAL_TO_STRING(id));
+            const char * eventOut =
+                JS_EncodeString(cx, jspropertyop_id_to_string(cx, id));
             openvrml::event_emitter & emitter =
                 thisNode.value()->event_emitter(eventOut);
             *vp = s.vrmlFieldToJSVal(emitter.value());
@@ -3309,7 +3329,7 @@
 
     OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFNode, setProperty)
     {
-        if (JSVAL_IS_STRING(id)) {
+        if (jspropertyop_id_is_string(id)) {
             using std::auto_ptr;
             using std::string;
 
@@ -3325,7 +3345,7 @@
             boost::intrusive_ptr<openvrml::node> nodePtr = thisNode.value();
 
             const char * const eventInId =
-                JS_EncodeString(cx, JSVAL_TO_STRING(id));
+                JS_EncodeString(cx, jspropertyop_id_to_string(cx, id));
 
             try {
                 using boost::shared_ptr;
@@ -5366,7 +5386,7 @@
         MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
         assert(mfdata);
 
-        uint32 new_length;
+        uint32_t new_length;
         if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
 
         if (new_length == mfdata->array.size()) {
@@ -5584,7 +5604,7 @@
         MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
         assert(mfdata);
 
-        uint32 new_length;
+        uint32_t new_length;
         if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
 
         if (size_t(JSVAL_TO_INT(*vp)) == mfdata->array.size()) {
@@ -5835,7 +5855,7 @@
         MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
         assert(mfdata);
 
-        uint32 new_length;
+        uint32_t new_length;
         if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
 
         try {
@@ -6239,7 +6259,7 @@
                 // Convert the jsval to an int32 and back to a jsval in order
                 // to remove any decimal part.
                 //
-                ::int32 integer;
+                int32_t integer;
                 if (!JS_ValueToECMAInt32(cx, argv[i], &integer)) {
                     return JS_FALSE;
                 }
@@ -6282,7 +6302,7 @@
             // Convert the jsval to an int32 and back to a jsval in order
             // to remove any decimal part.
             //
-            ::int32 i;
+            int32_t i;
             if (!JS_ValueToECMAInt32(cx, *vp, &i)) { return JS_FALSE; }
             if (!JS_NewNumberValue(cx, jsdouble(i), &mfdata->array[index])) {
                 return JS_FALSE;
@@ -6301,7 +6321,7 @@
         MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
         assert(mfdata);
 
-        uint32 new_length;
+        uint32_t new_length;
         if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
 
         try {
@@ -6557,7 +6577,7 @@
         MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
         assert(mfdata);
 
-        uint32 new_length;
+        uint32_t new_length;
         if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
 
         try {
@@ -6918,7 +6938,7 @@
         MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
         assert(mfdata);
 
-        uint32 new_length;
+        uint32_t new_length;
         if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
 
         try {

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

SF.net SVN: openvrml:[4253] trunk

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

Revision: 4253
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4253&view=rev
Author:   braden
Date:     2012-04-24 02:01:18 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
gcc 4.7 insists that intrusive_ptr_add_ref/release declarations occur before inclusion of <boost/intrusive_ptr.hpp>.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/openvrml-xembed/browserfactory.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-23 08:22:36 UTC (rev 4252)
+++ trunk/ChangeLog	2012-04-24 02:01:18 UTC (rev 4253)
@@ -1,3 +1,9 @@
+2012-04-23 Tom Callaway <tca...@re...>
+
+	* src/openvrml-xembed/browserfactory.cpp: gcc 4.7 insists that
+	intrusive_ptr_add_ref/release declarations occur before inclusion
+	of <boost/intrusive_ptr.hpp>.
+
 2012-04-23 Braden McDaniel  <br...@en...>
 
 	* src/script/javascript.cpp: More fallout from SpiderMonkey moves

Modified: trunk/src/openvrml-xembed/browserfactory.cpp
===================================================================
--- trunk/src/openvrml-xembed/browserfactory.cpp	2012-04-23 08:22:36 UTC (rev 4252)
+++ trunk/src/openvrml-xembed/browserfactory.cpp	2012-04-24 02:01:18 UTC (rev 4253)
@@ -18,7 +18,6 @@
 // with this library; if not, see <http://www.gnu.org/licenses/>.
 //
 
-# include <boost/intrusive_ptr.hpp>
 # include <boost/scope_exit.hpp>
 # include <boost/ref.hpp>
 # include <gtk/gtk.h>
@@ -34,6 +33,20 @@
 # include "browser-factory-server-glue.h"
 # include "browser.h"
 
+namespace {
+    G_GNUC_INTERNAL void intrusive_ptr_add_ref(GObject * const obj)
+    {
+        g_object_ref(obj);
+    }
+
+    G_GNUC_INTERNAL void intrusive_ptr_release(GObject * const obj)
+    {
+        g_object_unref(obj);
+    }
+}
+
+# include <boost/intrusive_ptr.hpp>
+
 G_DEFINE_TYPE(OpenvrmlXembedBrowserFactory,
               openvrml_xembed_browser_factory,
               G_TYPE_OBJECT)
@@ -51,18 +64,6 @@
                                                       GParamSpec * pspec);
 }
 
-namespace {
-    G_GNUC_INTERNAL void intrusive_ptr_add_ref(GObject * const obj)
-    {
-        g_object_ref(obj);
-    }
-
-    G_GNUC_INTERNAL void intrusive_ptr_release(GObject * const obj)
-    {
-        g_object_unref(obj);
-    }
-}
-
 //
 // hosts maps the unique bus identifiers of hosts to a controls_map_t; a
 // controls_map_t maps an object path to an OpenvrmlXembedBrowser instance.

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

SF.net SVN: openvrml:[4255] trunk

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

Revision: 4255
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4255&view=rev
Author:   braden
Date:     2012-04-24 02:40:32 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Quell warnings from gcc 4.7.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
    trunk/src/openvrml-player/curlbrowserhost.cpp
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-24 02:03:29 UTC (rev 4254)
+++ trunk/ChangeLog	2012-04-24 02:40:32 UTC (rev 4255)
@@ -1,3 +1,11 @@
+2012-04-23 Braden McDaniel  <br...@en...>
+
+	Quell warnings from gcc 4.7.
+
+	* src/libopenvrml-gl/openvrml/gl/viewer.cpp
+	* src/openvrml-player/curlbrowserhost.cpp
+	* src/script/javascript.cpp
+
 2012-04-23 Tom Callaway <tca...@re...>
 
 	* src/openvrml-xembed/browserfactory.cpp: gcc 4.7 insists that

Modified: trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp	2012-04-24 02:03:29 UTC (rev 4254)
+++ trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp	2012-04-24 02:40:32 UTC (rev 4255)
@@ -1236,20 +1236,19 @@
             c0 = c1;
             ++c1;
 
-            double circ_angle0, circ_angle1 = 0.0;
+            double circ_angle = 0.0;
             double sha0 = sin(height_angle0), cha0 = cos(height_angle0);
             double sha1 = sin(height_angle1), cha1 = cos(height_angle1);
             double sca0, cca0;
-            double sca1 = sin(circ_angle1), cca1 = cos(circ_angle1);
+            double sca1 = sin(circ_angle), cca1 = cos(circ_angle);
 
             glBegin(GL_QUADS);
             for (size_t nc = 0; nc < nCirc; ++nc) {
-                circ_angle0 = circ_angle1;
-                circ_angle1 = (nc + 1) * cd;
+                circ_angle = (nc + 1) * cd;
                 sca0 = sca1;
-                sca1 = sin(circ_angle1);
+                sca1 = sin(circ_angle);
                 cca0 = cca1;
-                cca1 = cos(circ_angle1);
+                cca1 = cos(circ_angle);
 
                 glColor3fv(&(*c1)[0]);
                 glVertex3f(GLfloat(sha1 * cca0),
@@ -1281,20 +1280,19 @@
             c0 = c1;
             ++c1;
 
-            double circ_angle0, circ_angle1 = 0.0;
+            double circ_angle = 0.0;
             double sha0 = sin(height_angle0), cha0 = cos(height_angle0);
             double sha1 = sin(height_angle1), cha1 = cos(height_angle1);
             double sca0, cca0;
-            double sca1 = sin(circ_angle1), cca1 = cos(circ_angle1);
+            double sca1 = sin(circ_angle), cca1 = cos(circ_angle);
 
             glBegin(GL_QUADS);
             for (size_t nc = 0; nc < nCirc; ++nc) {
-                circ_angle0 = circ_angle1;
-                circ_angle1 = (nc + 1) * cd;
+                circ_angle = (nc + 1) * cd;
                 sca0 = sca1;
-                sca1 = sin(circ_angle1);
+                sca1 = sin(circ_angle);
                 cca0 = cca1;
-                cca1 = cos(circ_angle1);
+                cca1 = cos(circ_angle);
 
                 glColor3fv(&(*c1)[0]);
                 glVertex3f(GLfloat(sha1 * cca1),

Modified: trunk/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- trunk/src/openvrml-player/curlbrowserhost.cpp	2012-04-24 02:03:29 UTC (rev 4254)
+++ trunk/src/openvrml-player/curlbrowserhost.cpp	2012-04-24 02:40:32 UTC (rev 4255)
@@ -808,14 +808,14 @@
             //
             if (!stream_data->initialized()) {
                 const char * type = 0;
-                CURLcode result = curl_easy_getinfo(msg->easy_handle,
-                                                    CURLINFO_CONTENT_TYPE,
-                                                    &type);
+                curl_easy_getinfo(msg->easy_handle,
+                                  CURLINFO_CONTENT_TYPE,
+                                  &type);
                 if (!type) { type = "application/octet-stream"; }
                 const char * url = 0;
-                result = curl_easy_getinfo(msg->easy_handle,
-                                           CURLINFO_EFFECTIVE_URL,
-                                           &url);
+                curl_easy_getinfo(msg->easy_handle,
+                                  CURLINFO_EFFECTIVE_URL,
+                                  &url);
                 dbus_g_proxy_call_no_reply(
                     browser_host->priv->browser,
                     "NewStream",

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-24 02:03:29 UTC (rev 4254)
+++ trunk/src/script/javascript.cpp	2012-04-24 02:40:32 UTC (rev 4255)
@@ -4058,7 +4058,8 @@
             typedef typename SFVec2::field_type sfvec2_t;
             typedef typename SFVec2::value_type vec2_t;
 
-            const vec2_t vec2 = { { vec[0], vec[1] } };
+            const vec2_t vec2 = { { static_cast<float>(vec[0]),
+                                    static_cast<float>(vec[1]) } };
             auto_ptr<sfvec2_t> sfvec2(new sfvec2_t(vec2));
             auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec2.get()));
             sfvec2.release();
@@ -4665,7 +4666,9 @@
         try {
             using std::auto_ptr;
 
-            const vec3_t vec3 = { { vec[0], vec[1], vec[2] } };
+            const vec3_t vec3 = { { static_cast<float>(vec[0]),
+                                    static_cast<float>(vec[1]),
+                                    static_cast<float>(vec[2]) } };
             auto_ptr<sfvec3_t> sfvec3(new sfvec3_t(vec3));
             auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec3.get()));
             sfvec3.release();

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

SF.net SVN: openvrml:[4257] trunk

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

Revision: 4257
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4257&view=rev
Author:   braden
Date:     2012-04-26 06:55:28 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Applying the stream output operator to a boost::filesystem::path now yields a string within quotes; use boost::filesystem::path::generic_string instead.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-24 03:23:13 UTC (rev 4256)
+++ trunk/ChangeLog	2012-04-26 06:55:28 UTC (rev 4257)
@@ -1,3 +1,12 @@
+2012-04-26 Braden McDaniel  <br...@en...>
+
+	* src/local/libopenvrml-dl/openvrml/local/dl.cpp
+	(openvrml::local::dl::foreachfile(const
+	std::vector<boost::filesystem::path> &, int (*)(const std::string
+	&, void *), void *): Applying the stream output operator to a
+	boost::filesystem::path now yields a string within quotes; use
+	boost::filesystem::path::generic_string instead.
+
 2012-04-23 Braden McDaniel  <br...@en...>
 
 	Quell warnings from gcc 4.7.

Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2012-04-24 03:23:13 UTC (rev 4256)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2012-04-26 06:55:28 UTC (rev 4257)
@@ -85,7 +85,7 @@
     std::vector<boost::filesystem::path>::const_iterator dir =
         search_path.begin();
     while (dir != search_path.end()) {
-        path << *dir;
+        path << dir->generic_string();
         if (++dir != search_path.end()) { path << LT_PATHSEP_CHAR; }
     }
     ltforeachfile_data ltdata = { func, data };

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

SF.net SVN: openvrml:[4264] trunk

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

Revision: 4264
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4264&view=rev
Author:   braden
Date:     2012-04-27 02:36:32 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost 1.44 and later (and consistency with Makefile.am).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml/openvrml.vcxproj
    trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-27 00:35:07 UTC (rev 4263)
+++ trunk/ChangeLog	2012-04-27 02:36:32 UTC (rev 4264)
@@ -1,5 +1,13 @@
 2012-04-26 Braden McDaniel  <br...@en...>
 
+	Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost
+	1.44 and later (and consistency with Makefile.am).
+
+	* src/libopenvrml/openvrml.vcxproj
+	* src/local/libopenvrml-dl/openvrml-dl.vcxproj
+
+2012-04-26 Braden McDaniel  <br...@en...>
+
 	* src/local/libopenvrml-dl/openvrml/local/dl.cpp
 	(openvrml::local::dl::foreachfile(const
 	std::vector<boost::filesystem::path> &, int (*)(const std::string

Modified: trunk/src/libopenvrml/openvrml.vcxproj
===================================================================
--- trunk/src/libopenvrml/openvrml.vcxproj	2012-04-27 00:35:07 UTC (rev 4263)
+++ trunk/src/libopenvrml/openvrml.vcxproj	2012-04-27 02:36:32 UTC (rev 4264)
@@ -65,7 +65,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -91,7 +91,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -187,4 +187,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj	2012-04-27 00:35:07 UTC (rev 4263)
+++ trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj	2012-04-27 02:36:32 UTC (rev 4264)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -70,7 +70,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -82,7 +82,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -104,4 +104,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

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

SF.net SVN: openvrml:[4268] trunk

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

Revision: 4268
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4268&view=rev
Author:   braden
Date:     2012-04-27 05:00:41 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
javadoc does not necessarily emit "inherit.gif"; be more generic.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-27 02:54:46 UTC (rev 4267)
+++ trunk/ChangeLog	2012-04-27 05:00:41 UTC (rev 4268)
@@ -1,3 +1,8 @@
+2012-04-27 Braden McDaniel  <br...@en...>
+
+	* doc/Makefile.am (JAVADOC_RESOURCES_FILES): javadoc does not
+	necessarily emit "inherit.gif"; be more generic.
+
 2012-04-26 Braden McDaniel  <br...@en...>
 
 	Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am	2012-04-27 02:54:46 UTC (rev 4267)
+++ trunk/doc/Makefile.am	2012-04-27 05:00:41 UTC (rev 4268)
@@ -87,7 +87,7 @@
         $(srcdir)/javadoc/stylesheet.css
 
 JAVADOC_RESOURCES_FILES = \
-        $(srcdir)/javadoc/resources/inherit.gif
+        $(srcdir)/javadoc/resources/*
 
 JAVADOC_VRML_FILES = \
         $(srcdir)/javadoc/vrml/*.html

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

SF.net SVN: openvrml:[4270] trunk

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

Revision: 4270
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4270&view=rev
Author:   braden
Date:     2012-04-29 03:04:50 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
XULRunner 12.0 removes the JSObject* prototype argument from JS_ConstructObject.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-27 05:02:39 UTC (rev 4269)
+++ trunk/ChangeLog	2012-04-29 03:04:50 UTC (rev 4270)
@@ -1,3 +1,11 @@
+2012-04-28 Braden McDaniel  <br...@en...>
+
+	XULRunner 12.0 removes the JSObject* prototype argument from
+	JS_ConstructObject.
+
+	* configure.ac
+	* src/script/javascript.cpp
+
 2012-04-27 Braden McDaniel  <br...@en...>
 
 	* doc/Makefile.am (JAVADOC_RESOURCES_FILES): javadoc does not

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2012-04-27 05:02:39 UTC (rev 4269)
+++ trunk/configure.ac	2012-04-29 03:04:50 UTC (rev 4270)
@@ -266,6 +266,26 @@
                  [Defined if SpiderMonkey has JSStrictPropertyOp])])
 
 #
+# XULRunner 12.0 removes the JSObject* prototype argument from
+# JS_ConstructObject.
+#
+AC_CACHE_CHECK([whether JS_ConstructObject is missing the prototype argument],
+[ov_cv_js_constructobject_without_proto],
+[ov_cv_js_constructobject_without_proto=no
+ov_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$JS_CFLAGS $CPPFLAGS"
+AC_LANG_ASSERT([C])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[#include <jsapi.h>]],
+[[JS_ConstructObject(0, 0, 0)]])],
+[ov_cv_js_constructobject_without_proto=yes])
+CPPFLAGS=$ov_save_CPPFLAGS
+])
+AS_IF([test X$ov_cv_js_constructobject_without_proto = Xyes],
+      [AC_DEFINE([OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO], [1],
+                 [Defined if JS_ConstructObject is missing the prototype argument])])
+
+#
 # openvrml-xembed and openvrml-player both use GOption, which was
 # introduced in GLib 2.6.
 #

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-27 05:02:39 UTC (rev 4269)
+++ trunk/src/script/javascript.cpp	2012-04-29 03:04:50 UTC (rev 4270)
@@ -110,6 +110,40 @@
 # endif
     }
 
+    OPENVRML_LOCAL
+    JSObject *
+    js_construct_object(JSContext * const cx,
+                        JSClass * const clasp,
+                        JSObject * const proto,
+                        JSObject * const parent)
+    {
+        assert(!proto);
+# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+        return JS_ConstructObject(cx, clasp, parent);
+# else
+        return JS_ConstructObject(cx, clasp, proto, parent);
+# endif
+    }
+
+    OPENVRML_LOCAL
+    JSObject *
+    js_construct_object_with_arguments(JSContext * const cx,
+                                       JSClass * const clasp,
+                                       JSObject * const proto,
+                                       JSObject * const parent,
+                                       const uintN argc,
+                                       jsval * const argv)
+    {
+        assert(!proto);
+# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+        return js_construct_object_with_arguments(cx, clasp, parent, argc, argv);
+# else
+        return js_construct_object_with_arguments(cx, clasp, proto, parent,
+                                               argc, argv);
+# endif
+    }
+
+
 # ifdef OPENVRML_FAST_JSNATIVE
 #   define OPENVRML_DECLARE_JSNATIVE(name)                      \
     JSBool (name)(JSContext * cx, uintN argc, jsval * vp)
@@ -2640,7 +2674,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const sfcolorObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const sfcolorObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!sfcolorObj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, sfcolorObj));
@@ -3439,7 +3473,7 @@
                                jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const sfrotationObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const sfrotationObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!sfrotationObj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, sfrotationObj));
@@ -3679,7 +3713,7 @@
                 &obj_sfdata.field_value());
 
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3f::jsclass, 0,
+            js_construct_object(cx, &SFVec3f::jsclass, 0,
                                OPENVRML_JS_THIS_OBJECT(cx, vp));
         if (!robj) { return JS_FALSE; }
 
@@ -3709,7 +3743,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent);
+            js_construct_object(cx, &SFRotation::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -3758,7 +3792,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent);
+            js_construct_object(cx, &SFRotation::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -3807,7 +3841,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3f::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec3f::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -3899,7 +3933,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent);
+            js_construct_object(cx, &SFRotation::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -3976,7 +4010,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const sfvec2Obj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const sfvec2Obj = js_construct_object(cx, &jsclass, 0, obj);
         if (!sfvec2Obj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, sfvec2Obj));
@@ -4176,7 +4210,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec2::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -4219,7 +4253,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec2::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -4320,7 +4354,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec2::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -4354,7 +4388,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec2::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -4388,7 +4422,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec2::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -4442,7 +4476,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec2::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -4484,7 +4518,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const sfvec2dObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const sfvec2dObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!sfvec2dObj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, sfvec2dObj));
@@ -4583,7 +4617,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const sfvec3fObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const sfvec3fObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!sfvec3fObj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, sfvec3fObj));
@@ -4787,7 +4821,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec3::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -4841,7 +4875,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec3::jsclass, proto, parent);
         if (!robj) {return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -4884,7 +4918,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec3::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -4985,7 +5019,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec3::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -5019,7 +5053,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec3::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -5053,7 +5087,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec3::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -5107,7 +5141,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec3::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -5148,7 +5182,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const sfvec3dObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const sfvec3dObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!sfvec3dObj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, sfvec3dObj));
@@ -5416,7 +5450,7 @@
             try {
                 for (size_t i = length; i < newArray.size(); ++i) {
                     JSObject * const element =
-                        JS_ConstructObject(cx, &Subclass::sfjsclass, 0, 0);
+                        js_construct_object(cx, &Subclass::sfjsclass, 0, 0);
                     if (!element) { throw std::bad_alloc(); }
                     newArray[i] = OBJECT_TO_JSVAL(element);
                 }
@@ -5746,7 +5780,7 @@
                            jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const mfboolObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfboolObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfboolObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(bools.size());
@@ -5963,7 +5997,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const mfcolorObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfcolorObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfcolorObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(colors.size());
@@ -6014,7 +6048,7 @@
         assert(obj);
         assert(rval);
 
-        JSObject * const mffloatObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mffloatObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mffloatObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(floats.size());
@@ -6089,7 +6123,7 @@
         assert(obj);
         assert(rval);
 
-        JSObject * const mfdoubleObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfdoubleObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfdoubleObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(doubles.size());
@@ -6185,7 +6219,7 @@
         assert(obj);
         assert(rval);
 
-        JSObject * const mfint32Obj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfint32Obj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfint32Obj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(int32s.size());
@@ -6450,7 +6484,7 @@
         jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const mfnodeObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfnodeObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfnodeObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(nodes.size());
@@ -6610,8 +6644,9 @@
 
                 for (size_t i = length; i < newArray.size(); ++i) {
                     JSObject * const element =
-                        JS_ConstructObjectWithArguments(cx, &sfnode_jsclass, 0, 0,
-                                                        1, &arg);
+                        js_construct_object_with_arguments(cx, &sfnode_jsclass,
+                                                           0, 0,
+                                                           1, &arg);
                     if (!element) { throw std::bad_alloc(); }
                     newArray[i] = OBJECT_TO_JSVAL(element);
                 }
@@ -6704,7 +6739,7 @@
                                jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const mfrotationObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfrotationObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfrotationObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(rotations.size());
@@ -6807,7 +6842,7 @@
         assert(cx);
         assert(obj);
         assert(rval);
-        JSObject * const mfstringObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfstringObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfstringObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(strings.size());
@@ -7050,7 +7085,7 @@
                            jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const mftimeObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mftimeObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mftimeObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(times.size());
@@ -7123,7 +7158,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const mfvec2fObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfvec2fObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfvec2fObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(vec2fs.size());
@@ -7204,7 +7239,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const mfvec2dObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfvec2dObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfvec2dObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(vec2ds.size());
@@ -7285,7 +7320,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const mfvec3fObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfvec3fObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfvec3fObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(vec3fs.size());
@@ -7367,7 +7402,7 @@
                             jsval * const rval)
         OPENVRML_NOTHROW
     {
-        JSObject * const mfvec3dObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+        JSObject * const mfvec3dObj = js_construct_object(cx, &jsclass, 0, obj);
         if (!mfvec3dObj) { return JS_FALSE; }
 
         jsval length = INT_TO_JSVAL(vec3ds.size());
@@ -7624,7 +7659,7 @@
             //
             // Construct the result object.
             //
-            JSObject * const robj = JS_ConstructObject(cx, &Row::jsclass, 0,
+            JSObject * const robj = js_construct_object(cx, &Row::jsclass, 0,
                                                        JS_GetParent(cx, obj));
             if (!robj) { return JS_FALSE; }
 
@@ -7809,7 +7844,7 @@
         using openvrml::mat4f;
 
         JSObject * const robj =
-            JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0,
+            js_construct_object(cx, &VrmlMatrix::jsclass, 0,
                                JS_GetParent(cx,
                                             OPENVRML_JS_THIS_OBJECT(cx, vp)));
         if (!robj) { return JS_FALSE; }
@@ -7831,7 +7866,7 @@
         using openvrml::mat4f;
 
         JSObject * const robj =
-            JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0,
+            js_construct_object(cx, &VrmlMatrix::jsclass, 0,
                                JS_GetParent(cx,
                                             OPENVRML_JS_THIS_OBJECT(cx, vp)));
         if (!robj) { return JS_FALSE; }
@@ -7875,7 +7910,7 @@
         // Construct the result object.
         //
         JSObject * const robj =
-            JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0,
+            js_construct_object(cx, &VrmlMatrix::jsclass, 0,
                                JS_GetParent(cx,
                                             OPENVRML_JS_THIS_OBJECT(cx, vp)));
         if (!robj) { return JS_FALSE; }
@@ -7915,7 +7950,7 @@
         // Construct the result object.
         //
         JSObject * const robj =
-            JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0,
+            js_construct_object(cx, &VrmlMatrix::jsclass, 0,
                                JS_GetParent(cx,
                                             OPENVRML_JS_THIS_OBJECT(cx, vp)));
         if (!robj) { return JS_FALSE; }
@@ -7965,7 +8000,7 @@
         JSObject * const parent =
             JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3f::jsclass, proto, parent);
+            js_construct_object(cx, &SFVec3f::jsclass, proto, parent);
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));
@@ -8013,9 +8048,9 @@
         // Construct the result object.
         //
         JSObject * const robj =
-            JS_ConstructObject(cx, &SFVec3f::jsclass, 0,
-                               JS_GetParent(cx,
-                                            OPENVRML_JS_THIS_OBJECT(cx, vp)));
+            js_construct_object(cx, &SFVec3f::jsclass, 0,
+                                JS_GetParent(cx,
+                                             OPENVRML_JS_THIS_OBJECT(cx, vp)));
         if (!robj) { return JS_FALSE; }
 
         assert(JS_GetPrivate(cx, robj));

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

SF.net SVN: openvrml:[4272] trunk

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

Revision: 4272
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4272&view=rev
Author:   braden
Date:     2012-04-29 06:55:38 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Fix OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be #ifdef.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-29 03:06:39 UTC (rev 4271)
+++ trunk/ChangeLog	2012-04-29 06:55:38 UTC (rev 4272)
@@ -1,3 +1,9 @@
+2012-04-29 Braden McDaniel  <br...@en...>
+
+	* src/script/javascript.cpp: Fix
+	OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be
+	#ifdef.
+
 2012-04-28 Braden McDaniel  <br...@en...>
 
 	XULRunner 12.0 removes the JSObject* prototype argument from

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-29 03:06:39 UTC (rev 4271)
+++ trunk/src/script/javascript.cpp	2012-04-29 06:55:38 UTC (rev 4272)
@@ -118,7 +118,7 @@
                         JSObject * const parent)
     {
         assert(!proto);
-# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
         return JS_ConstructObject(cx, clasp, parent);
 # else
         return JS_ConstructObject(cx, clasp, proto, parent);
@@ -135,7 +135,7 @@
                                        jsval * const argv)
     {
         assert(!proto);
-# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
         return js_construct_object_with_arguments(cx, clasp, parent, argc, argv);
 # else
         return js_construct_object_with_arguments(cx, clasp, proto, parent,

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

SF.net SVN: openvrml:[4274] trunk

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

Revision: 4274
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4274&view=rev
Author:   braden
Date:     2012-04-29 07:30:59 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Fix copy/paste error.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-29 06:58:35 UTC (rev 4273)
+++ trunk/ChangeLog	2012-04-29 07:30:59 UTC (rev 4274)
@@ -1,5 +1,9 @@
 2012-04-29 Braden McDaniel  <br...@en...>
 
+	* src/script/javascript.cpp: Fix copy/paste error.
+
+2012-04-29 Braden McDaniel  <br...@en...>
+
 	* src/script/javascript.cpp: Fix
 	OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be
 	#ifdef.

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-29 06:58:35 UTC (rev 4273)
+++ trunk/src/script/javascript.cpp	2012-04-29 07:30:59 UTC (rev 4274)
@@ -136,9 +136,9 @@
     {
         assert(!proto);
 # ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
-        return js_construct_object_with_arguments(cx, clasp, parent, argc, argv);
+        return JS_ConstructObjectWithArguments(cx, clasp, parent, argc, argv);
 # else
-        return js_construct_object_with_arguments(cx, clasp, proto, parent,
+        return JS_ConstructObjectWithArguments(cx, clasp, proto, parent,
                                                argc, argv);
 # endif
     }

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

SF.net SVN: openvrml:[4276] trunk

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

Revision: 4276
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4276&view=rev
Author:   braden
Date:     2012-04-29 08:04:55 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
As of XULRunner 12.0, JSRuntime should now be used by a single thread.  For now, at least, employ a JSRuntime for each Script node.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-29 07:37:59 UTC (rev 4275)
+++ trunk/ChangeLog	2012-04-29 08:04:55 UTC (rev 4276)
@@ -1,5 +1,11 @@
 2012-04-29 Braden McDaniel  <br...@en...>
 
+	* src/script/javascript.cpp: As of XULRunner 12.0, JSRuntime
+	should now be used by a single thread.  For now, at least, employ
+	a JSRuntime for each Script node.
+
+2012-04-29 Braden McDaniel  <br...@en...>
+
 	* src/script/javascript.cpp: Fix copy/paste error.
 
 2012-04-29 Braden McDaniel  <br...@en...>

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-29 07:37:59 UTC (rev 4275)
+++ trunk/src/script/javascript.cpp	2012-04-29 08:04:55 UTC (rev 4276)
@@ -264,13 +264,15 @@
         friend OPENVRML_DECLARE_MEMBER_JSNATIVE(Browser, addRoute);
         friend OPENVRML_DECLARE_MEMBER_JSNATIVE(Browser, deleteRoute);
 
-        static JSRuntime * rt;
-        static size_t nInstances;
+        JSRuntime * rt;
 
         double d_timeStamp;
 
         JSContext * cx;
         JSClass & sfnode_class;
+# ifndef NDEBUG
+        boost::thread::id thread_id_;
+# endif
 
     public:
         script(openvrml::script_node & node,
@@ -1014,9 +1016,6 @@
         VrmlMatrix();
     };
 
-    JSRuntime * script::rt = 0; // Javascript runtime singleton object
-    size_t script::nInstances = 0; // Number of distinct script objects
-
     OPENVRML_JAVASCRIPT_LOCAL
     OPENVRML_DECLARE_JSSTRICTPROPERTYOP(eventOut_setProperty);
 
@@ -1030,28 +1029,28 @@
     script::
     script(openvrml::script_node & node,
            const boost::shared_ptr<openvrml::resource_istream> & source)
-    OPENVRML_THROW1(std::bad_alloc):
-    openvrml::script(node),
+        OPENVRML_THROW1(std::bad_alloc):
+        openvrml::script(node),
+        rt(0),
         cx(0),
         sfnode_class(this->direct_output()
                      ? SFNode::direct_output_jsclass
-                     : SFNode::jsclass)
+                     : SFNode::jsclass),
+        thread_id_(boost::this_thread::get_id())
     {
         using std::bad_alloc;
 
         //
         // Initialize the runtime.
         //
-        if (!rt && !(rt = JS_NewRuntime(MAX_HEAP_BYTES))) {
-            throw bad_alloc();
-        }
+        this->rt = JS_NewRuntime(MAX_HEAP_BYTES);
+        if (!this->rt) { throw bad_alloc(); }
 
         //
         // Initialize the context for this script object.
         //
-        if (!(this->cx = JS_NewContext(rt, STACK_CHUNK_BYTES))) {
-            throw bad_alloc();
-        }
+        this->cx = JS_NewContext(rt, STACK_CHUNK_BYTES);
+        if (!this->cx) { throw bad_alloc(); }
 
         //
         // Store a pointer to this script object in the context.
@@ -1131,17 +1130,12 @@
                                source_str.c_str(), source_str.length(),
                                filename, lineno, &rval);
         OPENVRML_VERIFY_(ok);
-
-        ++nInstances;
     }
 
     script::~script()
     {
         JS_DestroyContext(this->cx);
-        if (--nInstances == 0) {
-            JS_DestroyRuntime(rt);
-            rt = 0;
-        }
+        JS_DestroyRuntime(this->rt);
     }
 
     void script::do_initialize(const double timestamp)
@@ -1187,14 +1181,8 @@
                           const openvrml::field_value * const argv[])
     {
         assert(this->cx);
+        assert(this->thread_id_ == boost::this_thread::get_id());
 
-# ifdef JS_THREADSAFE
-        JS_SetContextThread(this->cx);
-        BOOST_SCOPE_EXIT((cx)) {
-            JS_ClearContextThread(cx);
-        } BOOST_SCOPE_EXIT_END
-# endif
-
         jsval fval, rval;
         JSObject * const globalObj = JS_GetGlobalObject(this->cx);
         assert(globalObj);

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

SF.net SVN: openvrml:[4278] trunk

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

Revision: 4278
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4278&view=rev
Author:   braden
Date:     2012-04-29 19:23:58 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Make initialization of thread_id_ conditional on NDEBUG.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-29 08:06:42 UTC (rev 4277)
+++ trunk/ChangeLog	2012-04-29 19:23:58 UTC (rev 4278)
@@ -1,5 +1,12 @@
 2012-04-29 Braden McDaniel  <br...@en...>
 
+	* src/script/javascript.cpp
+	(script::script(openvrml::script_node &, const
+	boost::shared_ptr<openvrml::resource_istream> &)): Make
+	initialization of thread_id_ conditional on NDEBUG.
+
+2012-04-29 Braden McDaniel  <br...@en...>
+
 	* src/script/javascript.cpp: As of XULRunner 12.0, JSRuntime
 	should now be used by a single thread.  For now, at least, employ
 	a JSRuntime for each Script node.

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-29 08:06:42 UTC (rev 4277)
+++ trunk/src/script/javascript.cpp	2012-04-29 19:23:58 UTC (rev 4278)
@@ -1035,8 +1035,10 @@
         cx(0),
         sfnode_class(this->direct_output()
                      ? SFNode::direct_output_jsclass
-                     : SFNode::jsclass),
-        thread_id_(boost::this_thread::get_id())
+                     : SFNode::jsclass)
+# ifndef NDEBUG
+        ,thread_id_(boost::this_thread::get_id())
+# endif
     {
         using std::bad_alloc;
 

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

SF.net SVN: openvrml:[4280] trunk

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

Revision: 4280
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4280&view=rev
Author:   braden
Date:     2012-05-01 04:59:34 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Project file clean-up.  Remove references to site-specific library directories; these should be set in user (site-specific) properties.  Reorganize preprocessor symbol definitions to leverage commonality between Debug and Release configurations and remove unneeded definitions.

Modified Paths:
--------------
    trunk/examples/pretty-print.vcxproj
    trunk/examples/sdl-viewer.vcxproj
    trunk/src/libopenvrml/openvrml.vcxproj
    trunk/src/libopenvrml-gl/openvrml-gl.vcxproj
    trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj
    trunk/src/node/vrml97/vrml97.vcxproj
    trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj
    trunk/src/node/x3d-core/x3d-core.vcxproj
    trunk/src/node/x3d-dis/x3d-dis.vcxproj
    trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj
    trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj
    trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj
    trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj
    trunk/src/node/x3d-grouping/x3d-grouping.vcxproj
    trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj
    trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj
    trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj
    trunk/src/node/x3d-networking/x3d-networking.vcxproj
    trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj
    trunk/src/node/x3d-rendering/x3d-rendering.vcxproj
    trunk/src/node/x3d-shape/x3d-shape.vcxproj
    trunk/src/node/x3d-texturing/x3d-texturing.vcxproj
    trunk/src/script/javascript.vcxproj
    trunk/tests/parse-vrml97.vcxproj
    trunk/tests/parse-x3dvrml.vcxproj

Modified: trunk/examples/pretty-print.vcxproj
===================================================================
--- trunk/examples/pretty-print.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/examples/pretty-print.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -69,7 +69,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/examples/sdl-viewer.vcxproj
===================================================================
--- trunk/examples/sdl-viewer.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/examples/sdl-viewer.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -42,10 +42,6 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
@@ -57,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -80,7 +76,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SECURE_SCL=0;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

Modified: trunk/src/libopenvrml/openvrml.vcxproj
===================================================================
--- trunk/src/libopenvrml/openvrml.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/libopenvrml/openvrml.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -81,7 +81,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
+      <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -91,7 +91,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -111,7 +111,7 @@
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
+      <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
@@ -187,4 +187,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/src/libopenvrml-gl/openvrml-gl.vcxproj
===================================================================
--- trunk/src/libopenvrml-gl/openvrml-gl.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/libopenvrml-gl/openvrml-gl.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -56,7 +56,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -81,7 +81,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SECURE_SCL=0;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -89,6 +89,7 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
       <AdditionalDependencies>GlU32.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>

Modified: trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -70,7 +70,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -82,7 +82,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -104,4 +104,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/src/node/vrml97/vrml97.vcxproj
===================================================================
--- trunk/src/node/vrml97/vrml97.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/vrml97/vrml97.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -47,29 +47,25 @@
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node\</OutDir>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\zlib-1.2.4;C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\include;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\zlib-1.2.4;C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3\projects\vstudio\Debug Library;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\objs\win32\vc2008;$(LibraryPath)</LibraryPath>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node</OutDir>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3\projects\vstudio\Release Library;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\objs\win32\vc2008;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_FT_CONST=const;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libpng14.lib;zlib.lib;freetype240_D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249_D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
@@ -78,14 +74,14 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_FT_CONST=const;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libpng14.lib;zlib.lib;freetype240.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>

Modified: trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj
===================================================================
--- trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-core/x3d-core.vcxproj
===================================================================
--- trunk/src/node/x3d-core/x3d-core.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-core/x3d-core.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -59,7 +59,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-dis/x3d-dis.vcxproj
===================================================================
--- trunk/src/node/x3d-dis/x3d-dis.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-dis/x3d-dis.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj
===================================================================
--- trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj
===================================================================
--- trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj
===================================================================
--- trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj
===================================================================
--- trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-grouping/x3d-grouping.vcxproj
===================================================================
--- trunk/src/node/x3d-grouping/x3d-grouping.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-grouping/x3d-grouping.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj
===================================================================
--- trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj
===================================================================
--- trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj
===================================================================
--- trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -72,7 +72,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/src/node/x3d-networking/x3d-networking.vcxproj
===================================================================
--- trunk/src/node/x3d-networking/x3d-networking.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-networking/x3d-networking.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>

Modified: trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj
===================================================================
--- trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>

Modified: trunk/src/node/x3d-rendering/x3d-rendering.vcxproj
===================================================================
--- trunk/src/node/x3d-rendering/x3d-rendering.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-rendering/x3d-rendering.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>

Modified: trunk/src/node/x3d-shape/x3d-shape.vcxproj
===================================================================
--- trunk/src/node/x3d-shape/x3d-shape.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-shape/x3d-shape.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>

Modified: trunk/src/node/x3d-texturing/x3d-texturing.vcxproj
===================================================================
--- trunk/src/node/x3d-texturing/x3d-texturing.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/node/x3d-texturing/x3d-texturing.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -59,7 +59,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -86,7 +86,6 @@
       <DisableSpecificWarnings>4226;4250;4251;4275;4290;4355;4661;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)bin\node\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>

Modified: trunk/src/script/javascript.vcxproj
===================================================================
--- trunk/src/script/javascript.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/src/script/javascript.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -47,29 +47,27 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\lib;$(LibraryPath)</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\lib;$(LibraryPath)</LibraryPath>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JSVAL_TO_DOUBLE_RETURNS_POINTER=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>XP_WIN;JS_THREADSAFE;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JS_HAS_TYPED_ROOT_FUNCTIONS=1;OPENVRML_JSPROPERTYOP_USES_JSID=1;OPENVRML_FAST_JSNATIVE=1;OPENVRML_JS_HAS_STRICTPROPERTYOP=1;OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO=1;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>js3250.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
     </Link>
@@ -79,18 +77,18 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JSVAL_TO_DOUBLE_RETURNS_POINTER=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>XP_WIN;JS_THREADSAFE;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JS_HAS_TYPED_ROOT_FUNCTIONS=1;OPENVRML_JSPROPERTYOP_USES_JSID=1;OPENVRML_FAST_JSNATIVE=1;OPENVRML_JS_HAS_STRICTPROPERTYOP=1;OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>js3250.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: trunk/tests/parse-vrml97.vcxproj
===================================================================
--- trunk/tests/parse-vrml97.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/tests/parse-vrml97.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -55,7 +55,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -72,7 +72,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: trunk/tests/parse-x3dvrml.vcxproj
===================================================================
--- trunk/tests/parse-x3dvrml.vcxproj	2012-04-29 20:09:10 UTC (rev 4279)
+++ trunk/tests/parse-x3dvrml.vcxproj	2012-05-01 04:59:34 UTC (rev 4280)
@@ -55,7 +55,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -72,7 +72,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

SF.net SVN: openvrml:[4283] trunk

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

Revision: 4283
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4283&view=rev
Author:   braden
Date:     2012-05-01 05:14:52 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Generate openvrml-gl.lib into arch-specific subdirectory.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml-gl/openvrml-gl.vcxproj

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-05-01 05:06:12 UTC (rev 4282)
+++ trunk/ChangeLog	2012-05-01 05:14:52 UTC (rev 4283)
@@ -1,5 +1,10 @@
 2012-05-01 Braden McDaniel  <br...@en...>
 
+	* src/libopenvrml-gl/openvrml-gl.vcxproj: Generate openvrml-gl.lib
+	into arch-specific subdirectory.
+
+2012-05-01 Braden McDaniel  <br...@en...>
+
 	Project file clean-up.  Remove references to site-specific library
 	directories; these should be set in user (site-specific)
 	properties.  Reorganize preprocessor symbol definitions to

Modified: trunk/src/libopenvrml-gl/openvrml-gl.vcxproj
===================================================================
--- trunk/src/libopenvrml-gl/openvrml-gl.vcxproj	2012-05-01 05:06:12 UTC (rev 4282)
+++ trunk/src/libopenvrml-gl/openvrml-gl.vcxproj	2012-05-01 05:14:52 UTC (rev 4283)
@@ -72,7 +72,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
+      <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -97,7 +97,7 @@
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
+      <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

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

SF.net SVN: openvrml:[4285] trunk

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

Revision: 4285
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4285&view=rev
Author:   braden
Date:     2012-05-01 05:29:53 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Boost.Filesystem 3 doesn't have path::external_file_string; use generic_string instead.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-05-01 05:16:04 UTC (rev 4284)
+++ trunk/ChangeLog	2012-05-01 05:29:53 UTC (rev 4285)
@@ -1,5 +1,13 @@
 2012-05-01 Braden McDaniel  <br...@en...>
 
+	* src/local/libopenvrml-dl/openvrml/local/dl.cpp
+	(foreachfile(const std::vector<boost::filesystem::path> &, int
+	(*)(const std::string &, void *), void *)): Boost.Filesystem 3
+	doesn't have path::external_file_string; use generic_string
+	instead.
+
+2012-05-01 Braden McDaniel  <br...@en...>
+
 	* src/libopenvrml-gl/openvrml-gl.vcxproj: Generate openvrml-gl.lib
 	into arch-specific subdirectory.
 

Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2012-05-01 05:16:04 UTC (rev 4284)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2012-05-01 05:29:53 UTC (rev 4285)
@@ -75,7 +75,7 @@
         for (directory_iterator entry(*dir);
              entry != directory_iterator();
              ++entry) {
-            result = (func)(entry->path().external_file_string(), data);
+            result = (func)(entry->path().generic_string(), data);
             if (result != 0) { return result; }
         }
     } catch (boost::filesystem::filesystem_error &) {}
@@ -144,7 +144,7 @@
                                           reinterpret_cast<LPSTR>(&buf),
                                           buf_size,
                                           args);
-    assert(buf_chars != 0); // If FormatMessage failed, just give up.
+    assert(buf_chars != DWORD(0)); // If FormatMessage failed, just give up.
     const std::string buf_str(buf ? buf : "");
     return buf_str;
 # else

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