Menu
▾
▴
openvrml-commit
|
From: <br...@us...> - 2010-01-24 03:05:55
|
Revision: 4071
http://openvrml.svn.sourceforge.net/openvrml/?rev=4071&view=rev
Author: braden
Date: 2010-01-24 03:05:49 +0000 (Sun, 24 Jan 2010)
Log Message:
-----------
Doxygen formatting improvements for tables.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/doxygen-header
trunk/doc/index.doc
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-01-24 02:57:30 UTC (rev 4070)
+++ trunk/ChangeLog 2010-01-24 03:05:49 UTC (rev 4071)
@@ -1,5 +1,12 @@
2010-01-23 Braden McDaniel <br...@en...>
+ Doxygen formatting improvements for tables.
+
+ * doc/doxygen-header
+ * doc/index.doc
+
+2010-01-23 Braden McDaniel <br...@en...>
+
* doc/doxygen-header: Just center the h3 text on the main
page (that is, the version text).
Modified: trunk/doc/doxygen-header
===================================================================
--- trunk/doc/doxygen-header 2010-01-24 02:57:30 UTC (rev 4070)
+++ trunk/doc/doxygen-header 2010-01-24 03:05:49 UTC (rev 4071)
@@ -220,13 +220,13 @@
text-align: center;
}
-.contents table {
+#toc {
width: 70%;
margin-left: auto;
margin-right: auto;
}
-.contents table p {
+#toc p {
font-size: medium;
margin: 0;
padding: 0;
Modified: trunk/doc/index.doc
===================================================================
--- trunk/doc/index.doc 2010-01-24 02:57:30 UTC (rev 4070)
+++ trunk/doc/index.doc 2010-01-24 03:05:49 UTC (rev 4071)
@@ -8,7 +8,7 @@
*
* @section contents Contents
*
- * <table border="0">
+ * <table id="toc" border="0">
* <tr><td>@subpage intro</td></tr>
* <tr><td>@ref license</td></tr>
* <tr><td>@ref history</td></tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-01 06:15:41
|
Revision: 4073
http://openvrml.svn.sourceforge.net/openvrml/?rev=4073&view=rev
Author: braden
Date: 2010-02-01 06:15:34 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
Add previous/up/next navigation to documentation pages.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/conformance.doc
trunk/doc/doxygen-header
trunk/doc/gpl.doc
trunk/doc/index.doc
trunk/doc/intro.doc
trunk/doc/lgpl.doc
trunk/doc/libopenvrml.doc
trunk/doc/parsing.doc
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-01-24 03:11:45 UTC (rev 4072)
+++ trunk/ChangeLog 2010-02-01 06:15:34 UTC (rev 4073)
@@ -1,3 +1,16 @@
+2010-02-01 Braden McDaniel <br...@en...>
+
+ Add previous/up/next navigation to documentation pages.
+
+ * doc/doxygen-header
+ * doc/conformance.doc
+ * doc/gpl.doc
+ * doc/index.doc
+ * doc/intro.doc
+ * doc/lgpl.doc
+ * doc/libopenvrml.doc
+ * doc/parsing.doc
+
2010-01-23 Braden McDaniel <br...@en...>
Doxygen formatting improvements for tables.
Modified: trunk/doc/conformance.doc
===================================================================
--- trunk/doc/conformance.doc 2010-01-24 03:11:45 UTC (rev 4072)
+++ trunk/doc/conformance.doc 2010-02-01 06:15:34 UTC (rev 4073)
@@ -1,6 +1,11 @@
+// -*- mode: c++; fill-column: 78 -*-
/**
@page conformance Conformance Test Results
+<table class="top seqnav">
+<tr><th>Previous: @ref lgpl</th><th>Up: @ref contents</th><th></th></tr>
+</table>
+
@note Due to time constraints and pending large changes that would signficantly
impact these results, this table has not been updated for the current
release of OpenVRML.
@@ -31,7 +36,7 @@
@subsection overall_summary Overall
-<table>
+<table class="conformance">
<tr>
<th>Total Number of Tests</td><td>796</td>
</tr>
@@ -48,7 +53,7 @@
@subsection group_summary By Group
-<table>
+<table class="conformance">
<tr>
<th>Node Group<th>Total<th>Pass<th>Fail<th>Invalid
<tr>
@@ -77,7 +82,7 @@
@subsection node_summary Summary By Node
-<table>
+<table class="conformance">
<tr>
<th>Node<th>Passed<th>Failed<th>Invalid
<tr>
@@ -200,7 +205,7 @@
@section results Results
-<table>
+<table class="conformance">
<tr>
<th>Node Group<th>Node<th>Test<br>Number<th>Result<th>Related Tasks<th>Related Bugs
<tr>
@@ -2217,4 +2222,8 @@
<tt>http://autumn.ncsl.nist.gov</tt> which no longer allows access. World
should be updated to point at the current location of the NIST tests.
+<table class="bottom seqnav">
+<tr><th>Previous: @ref lgpl</th><th>Up: @ref contents</th><th></th></tr>
+</table>
+
*/
Modified: trunk/doc/doxygen-header
===================================================================
--- trunk/doc/doxygen-header 2010-01-24 03:11:45 UTC (rev 4072)
+++ trunk/doc/doxygen-header 2010-02-01 06:15:34 UTC (rev 4073)
@@ -226,11 +226,39 @@
margin-right: auto;
}
-#toc p {
- font-size: medium;
+#toc p, .seqnav p, .conformance p {
margin: 0;
padding: 0;
}
+
+.top.seqnav {
+ margin-bottom: 1.5em;
+}
+
+.bottom.seqnav {
+ margin-top: 1.5em;
+}
+
+.seqnav {
+ table-layout: fixed;
+ width: 100%;
+ border-style: none;
+ background-color: rgb(90%, 90%, 90%);
+ border-color: rgb(65%, 65%, 65%);
+ -webkit-border-top-left-radius: 0.6em;
+ -webkit-border-top-right-radius: 0.6em;
+ -moz-border-radius-topleft: 0.6em;
+ -moz-border-radius-topright: 0.6em;
+ -webkit-border-bottom-left-radius: 0.6em;
+ -webkit-border-bottom-right-radius: 0.6em;
+ -moz-border-radius-bottomleft: 0.6em;
+ -moz-border-radius-bottomright: 0.6em;
+}
+
+.seqnav tr th {
+ background-color: transparent;
+ border-style: none;
+}
</style>
</head>
<body>
Modified: trunk/doc/gpl.doc
===================================================================
--- trunk/doc/gpl.doc 2010-01-24 03:11:45 UTC (rev 4072)
+++ trunk/doc/gpl.doc 2010-02-01 06:15:34 UTC (rev 4073)
@@ -2,6 +2,10 @@
/**
* @page gpl GNU General Public License
+ *
+ * <table class="top seqnav">
+ * <tr><th>Previous: @ref libopenvrml</th><th>Up: @ref contents</th><th>Next: @ref lgpl</th></tr>
+ * </table>
*
* Version 3, 29 June 2007
*
@@ -604,7 +608,7 @@
* warranty or assumption of liability accompanies a copy of the Program in
* return for a fee.
*
- * @section end_of_terms END OF TERMS AND CONDITIONS
+ * END OF TERMS AND CONDITIONS
*
* @section howto How to Apply These Terms to Your New Programs
*
@@ -664,4 +668,8 @@
* the library. If this is what you want to do, use the GNU Lesser General
* Public License instead of this License. But first, please read
* <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+ *
+ * <table class="bottom seqnav">
+ * <tr><th>Previous: @ref libopenvrml</th><th>Up: @ref contents</th><th>Next: @ref lgpl</th></tr>
+ * </table>
*/
Modified: trunk/doc/index.doc
===================================================================
--- trunk/doc/index.doc 2010-01-24 03:11:45 UTC (rev 4072)
+++ trunk/doc/index.doc 2010-02-01 06:15:34 UTC (rev 4073)
@@ -3,6 +3,10 @@
/**
* @mainpage OpenVRML User's Guide
*
+ * <table class="top seqnav">
+ * <tr><th></th><th></th><th>Next: @ref intro</th></tr>
+ * </table>
+ *
* OpenVRML comprises a runtime library for VRML97 along with an OpenGL
* renderer.
*
@@ -29,4 +33,8 @@
* <tr><td>@subpage lgpl</td></tr>
* <tr><td>@subpage conformance</td><td>NIST VRML Test Suite results</td></tr>
* </table>
+ *
+ * <table class="bottom seqnav">
+ * <tr><th></th><th></th><th>Next: @ref intro</th></tr>
+ * </table>
*/
Modified: trunk/doc/intro.doc
===================================================================
--- trunk/doc/intro.doc 2010-01-24 03:11:45 UTC (rev 4072)
+++ trunk/doc/intro.doc 2010-02-01 06:15:34 UTC (rev 4073)
@@ -3,6 +3,10 @@
/**
* @page intro 1. Introduction
*
+ * <table class="top seqnav">
+ * <tr><th>Previous: @ref contents</th><th>Up: @ref contents</th><th>Next: @ref parsing</th></tr>
+ * </table>
+ *
* The OpenVRML libraries provide an extensible run-time for rendering and
* playing VRML and X3D. OpenVRML includes two libraries:
*
@@ -32,4 +36,8 @@
*
* OpenVRML was started as LibVRML97 by Chris Morley. Since 2000 it has been
* maintained by Braden McDaniel.
+ *
+ * <table class="bottom seqnav">
+ * <tr><th>Previous: @ref contents</th><th>Up: @ref contents</th><th>Next: @ref parsing</th></tr>
+ * </table>
*/
Modified: trunk/doc/lgpl.doc
===================================================================
--- trunk/doc/lgpl.doc 2010-01-24 03:11:45 UTC (rev 4072)
+++ trunk/doc/lgpl.doc 2010-02-01 06:15:34 UTC (rev 4073)
@@ -3,6 +3,10 @@
/**
* @page lgpl GNU Lesser General Public License
*
+ * <table class="top seqnav">
+ * <tr><th>Previous: @ref gpl</th><th>Up: @ref contents</th><th>Next: @ref conformance</th></tr>
+ * </table>
+ *
* Version 3, 29 June 2007
*
* Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
@@ -152,4 +156,8 @@
* future versions of the GNU Lesser General Public License shall apply, that
* proxy's public statement of acceptance of any version is permanent
* authorization for you to choose that version for the Library.
+ *
+ * <table class="bottom seqnav">
+ * <tr><th>Previous: @ref gpl</th><th>Up: @ref contents</th><th>Next: @ref conformance</th></tr>
+ * </table>
*/
Modified: trunk/doc/libopenvrml.doc
===================================================================
--- trunk/doc/libopenvrml.doc 2010-01-24 03:11:45 UTC (rev 4072)
+++ trunk/doc/libopenvrml.doc 2010-02-01 06:15:34 UTC (rev 4073)
@@ -3,6 +3,10 @@
/**
* @page libopenvrml 3 libopenvrml - the run-time library
*
+ * <table class="top seqnav">
+ * <tr><th>Previous: @ref parsing</th><th>Up: @ref contents</th><th>Next: @ref gpl</th></tr>
+ * </table>
+ *
* @section resource_fetching 3.1 Fetching network resources
*
* @subsection resource_fetching_rationale 3.1.1 Rationale
@@ -107,4 +111,8 @@
* synchronization primitives, for writing incoming data. Data can then be
* moved from this buffer to the <code>streambuf</code>'s buffer in the
* implementation of @c std::streambuf::underflow.
+ *
+ * <table class="bottom seqnav">
+ * <tr><th>Previous: @ref parsing</th><th>Up: @ref contents</th><th>Next: @ref gpl</th></tr>
+ * </table>
*/
Modified: trunk/doc/parsing.doc
===================================================================
--- trunk/doc/parsing.doc 2010-01-24 03:11:45 UTC (rev 4072)
+++ trunk/doc/parsing.doc 2010-02-01 06:15:34 UTC (rev 4073)
@@ -3,6 +3,10 @@
/**
* @page parsing 2 Parsing VRML97 and VRML-encoded X3D
*
+ * <table class="top seqnav">
+ * <tr><th>Previous: @ref intro</th><th>Up: @ref contents</th><th>Next: @ref libopenvrml</th></tr>
+ * </table>
+ *
* OpenVRML includes parsers for reading VRML97 and VRML-encoded X3D. Prior
* to version 0.17.0, users wanting to use OpenVRML to load VRML or X3D had to
* load the file into an @c openvrml::browser and traverse the runtime's scene
@@ -302,4 +306,8 @@
* while exploring that is beyond the scope of this manual, the <a
* href="http://spirit.sourceforge.net/documentation.html">Spirit User's
* Guide</a> is an excellent resource.
+ *
+ * <table class="bottom seqnav">
+ * <tr><th>Previous: @ref intro</th><th>Up: @ref contents</th><th>Next: @ref libopenvrml</th></tr>
+ * </table>
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-04 02:53:10
|
Revision: 4075
http://openvrml.svn.sourceforge.net/openvrml/?rev=4075&view=rev
Author: braden
Date: 2010-02-04 02:52:56 +0000 (Thu, 04 Feb 2010)
Log Message:
-----------
Suppress generation of the bug, todo, and test list pages.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/Doxyfile
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-01 06:20:16 UTC (rev 4074)
+++ trunk/ChangeLog 2010-02-04 02:52:56 UTC (rev 4075)
@@ -1,3 +1,8 @@
+2010-02-03 Braden McDaniel <br...@en...>
+
+ * doc/Doxyfile: Suppress generation of the bug, todo, and test
+ list pages.
+
2010-02-01 Braden McDaniel <br...@en...>
Add previous/up/next navigation to documentation pages.
Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile 2010-02-01 06:20:16 UTC (rev 4074)
+++ trunk/doc/Doxyfile 2010-02-04 02:52:56 UTC (rev 4075)
@@ -61,9 +61,9 @@
SORT_MEMBERS_CTORS_1ST = NO
SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = YES
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
+GENERATE_TODOLIST = NO
+GENERATE_TESTLIST = NO
+GENERATE_BUGLIST = NO
GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-06 03:47:47
|
Revision: 4077
http://openvrml.svn.sourceforge.net/openvrml/?rev=4077&view=rev
Author: braden
Date: 2010-02-06 03:47:40 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Ensure that plugin_streambuf::set_get_url_result gets called if browser_host::get_url throws.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-04 03:00:35 UTC (rev 4076)
+++ trunk/ChangeLog 2010-02-06 03:47:40 UTC (rev 4077)
@@ -1,3 +1,10 @@
+2010-02-05 Braden McDaniel <br...@en...>
+
+ * src/local/libopenvrml-control/openvrml_control/browser.cpp
+ (openvrml_control::browser::resource_fetcher::do_get_resource(const
+ std::string &)): Ensure that plugin_streambuf::set_get_url_result
+ gets called if browser_host::get_url throws.
+
2010-02-03 Braden McDaniel <br...@en...>
* doc/Doxyfile: Suppress generation of the bug, todo, and test
Modified: trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp
===================================================================
--- trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp 2010-02-04 03:00:35 UTC (rev 4076)
+++ trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp 2010-02-06 03:47:40 UTC (rev 4077)
@@ -527,9 +527,17 @@
uri, this->streambuf_);
//
- // browser_host::get_url could throw; let it.
+ // If browser_host::get_url throws, we need to make sure that
+ // plugin_streambuf::set_get_url_result gets called. Otherwise,
+ // plugin_streambuf::init will block indefinitely.
//
- const int get_url_result = fetcher.control_host_.get_url(uri);
+ int get_url_result;
+ try {
+ get_url_result = fetcher.control_host_.get_url(uri);
+ } catch (...) {
+ this->streambuf_->set_get_url_result(-1);
+ throw;
+ }
if (get_url_result != 0) {
this->setstate(ios_base::badbit);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-06 04:22:04
|
Revision: 4079
http://openvrml.svn.sourceforge.net/openvrml/?rev=4079&view=rev
Author: braden
Date: 2010-02-06 04:21:57 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Terminating a variable argument list with plain 0 is not 64-bit-safe. Use static_cast<void *>(0) instead.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/openvrml-xembed/main.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-06 03:52:48 UTC (rev 4078)
+++ trunk/ChangeLog 2010-02-06 04:21:57 UTC (rev 4079)
@@ -1,5 +1,12 @@
2010-02-05 Braden McDaniel <br...@en...>
+ * src/openvrml-xembed/main.cpp
+ (dbus_thread_loop::operator()() const): Terminating a variable
+ argument list with plain 0 is not 64-bit-safe.
+ Use static_cast<void *>(0) instead.
+
+2010-02-05 Braden McDaniel <br...@en...>
+
* src/local/libopenvrml-control/openvrml_control/browser.cpp
(openvrml_control::browser::resource_fetcher::do_get_resource(const
std::string &)): Ensure that plugin_streambuf::set_get_url_result
Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp 2010-02-06 03:52:48 UTC (rev 4078)
+++ trunk/src/openvrml-xembed/main.cpp 2010-02-06 04:21:57 UTC (rev 4079)
@@ -2,7 +2,7 @@
//
// OpenVRML XEmbed Control
//
-// Copyright 2004, 2005, 2006, 2007, 2008 Braden McDaniel
+// Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010 Braden McDaniel
//
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the Free
@@ -46,10 +46,10 @@
G_GNUC_INTERNAL
gboolean
openvrml_xembed_name_owner_changed(DBusGProxy * proxy,
- const gchar * name,
- const gchar * old_owner,
- const gchar * new_owner,
- gpointer user_data);
+ const gchar * name,
+ const gchar * old_owner,
+ const gchar * new_owner,
+ gpointer user_data);
namespace {
@@ -108,7 +108,7 @@
OPENVRML_XEMBED_TYPE_BROWSER_FACTORY,
"connection", connection,
"main-thread-context", &this->main_thread_context_,
- 0));
+ static_cast<void *>(0)));
scope_guard browser_factory_guard =
make_guard(g_object_unref, browser_factory);
boost::ignore_unused_variable_warning(browser_factory_guard);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-06 04:39:58
|
Revision: 4081
http://openvrml.svn.sourceforge.net/openvrml/?rev=4081&view=rev
Author: braden
Date: 2010-02-06 04:39:52 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Don't add a reference when constructing the intrusive_ptr to put in the controls_map.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/openvrml-xembed/browserfactory.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-06 04:24:05 UTC (rev 4080)
+++ trunk/ChangeLog 2010-02-06 04:39:52 UTC (rev 4081)
@@ -1,5 +1,14 @@
2010-02-05 Braden McDaniel <br...@en...>
+ * src/openvrml-xembed/browserfactory.cpp
+ (openvrml_xembed_browser_factory_create_control(
+ OpenvrmlXembedBrowserFactory *, const char *, const char *,
+ guint64, gboolean, DBusGMethodInvocation *)): Don't add a
+ reference when constructing the intrusive_ptr to put in the
+ controls_map.
+
+2010-02-05 Braden McDaniel <br...@en...>
+
* src/openvrml-xembed/main.cpp
(dbus_thread_loop::operator()() const): Terminating a variable
argument list with plain 0 is not 64-bit-safe.
Modified: trunk/src/openvrml-xembed/browserfactory.cpp
===================================================================
--- trunk/src/openvrml-xembed/browserfactory.cpp 2010-02-06 04:24:05 UTC (rev 4080)
+++ trunk/src/openvrml-xembed/browserfactory.cpp 2010-02-06 04:39:52 UTC (rev 4081)
@@ -334,10 +334,12 @@
bool succeeded;
try {
using std::make_pair;
+ static const bool add_ref = false;
succeeded =
(*control_factory->priv->hosts)[sender].insert(
make_pair(control_obj_path,
- boost::intrusive_ptr<GObject>(G_OBJECT(browser))))
+ boost::intrusive_ptr<GObject>(G_OBJECT(browser),
+ add_ref)))
.second;
g_debug("inserted reference to %s", sender);
} catch (std::bad_alloc & ex) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-06 05:22:12
|
Revision: 4083
http://openvrml.svn.sourceforge.net/openvrml/?rev=4083&view=rev
Author: braden
Date: 2010-02-06 05:22:05 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Use a dedicated (private) D-Bus connection to call org.openvrml.BrowserHost.GetUrl. Multiple threads can call this function; and a connection should not be shared by multiple threads.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/openvrml-xembed/browser.cpp
trunk/src/openvrml-xembed/browser.h
trunk/src/openvrml-xembed/browserfactory.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-06 04:44:09 UTC (rev 4082)
+++ trunk/ChangeLog 2010-02-06 05:22:05 UTC (rev 4083)
@@ -1,3 +1,43 @@
+2010-02-06 Braden McDaniel <br...@en...>
+
+ Use a dedicated (private) D-Bus connection to call
+ org.openvrml.BrowserHost.GetUrl. Multiple threads can call this
+ function; and a connection should not be shared by multiple
+ threads.
+
+ * src/openvrml-xembed/browser.cpp
+ (browser_host_proxy): Store a reference to the
+ OpenvrmlXembedBrowser.
+ (browser_host_proxy::do_get_url(const std::string &)): Use a
+ private D-Bus connection to call org.openvrml.BrowserHost.GetUrl.
+ (OpenvrmlXembedBrowserPrivate_): Store the
+ org.openvrml.BrowserHost name.
+ (browser_property_id): Add enumerant for the control host name
+ property.
+ (openvrml_xembed_browser_class_init(OpenvrmlXembedBrowserClass *)):
+ Add control-host-name property.
+ (openvrml_xembed_browser_constructor(GType, guint,
+ GObjectConstructParam *)): Construct the browser_host_proxy with a
+ reference to the OpenvrmlXembedBrowser.
+ (openvrml_xembed_browser_finalize(GObject *)): g_free the
+ control_host_name.
+ (openvrml_xembed_browser_set_property(GObject *, guint, const
+ GValue *, GParamSpec *)): Set the control-host-name property.
+ (openvrml_xembed_browser_get_property(GObject *, guint, GValue *,
+ GParamSpec *)): Get the control-host-name property.
+ (openvrml_xembed_browser_new(DBusGProxy *, gboolean,
+ GMainContext *, const gchar *, GdkNativeWindow)): Create the
+ OpenvrmlXembedBrowser using the org.openvrml.BrowserHost name.
+ * src/openvrml-xembed/browser.h
+ (openvrml_xembed_browser_new(DBusGProxy *, gboolean,
+ GMainContext *, const gchar *, GdkNativeWindow)): Pass the
+ org.openvrml.BrowserHost name.
+ * src/openvrml-xembed/browserfactory.cpp
+ (openvrml_xembed_browser_factory_create_control(
+ OpenvrmlXembedBrowserFactory *, const char *, const char *,
+ guint64, gboolean, DBusGMethodInvocation *)): Create the
+ OpenvrmlXembedBrowser using the org.openvrml.BrowserHost name.
+
2010-02-05 Braden McDaniel <br...@en...>
* src/openvrml-xembed/browserfactory.cpp
Modified: trunk/src/openvrml-xembed/browser.cpp
===================================================================
--- trunk/src/openvrml-xembed/browser.cpp 2010-02-06 04:44:09 UTC (rev 4082)
+++ trunk/src/openvrml-xembed/browser.cpp 2010-02-06 05:22:05 UTC (rev 4083)
@@ -31,6 +31,7 @@
# include "browser-host-client-glue.h"
# include <gtk/gtkgl.h>
# include <gtk/gtkdrawingarea.h>
+# include <dbus/dbus.h>
using namespace boost::multi_index::detail; // for scope_guard
@@ -84,37 +85,21 @@
class G_GNUC_INTERNAL browser_host_proxy :
public openvrml_control::browser_host {
- DBusGProxy & host_;
+ OpenvrmlXembedBrowser & browser_;
public:
- explicit browser_host_proxy(DBusGProxy & host):
- host_(host)
+ explicit browser_host_proxy(OpenvrmlXembedBrowser & browser):
+ browser_(browser)
{}
private:
- virtual int do_get_url(const std::string & url)
- {
- GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
- gint result = -1;
- gboolean succeeded =
- org_openvrml_BrowserHost_get_url(&this->host_,
- url.c_str(),
- &result,
- &error);
- if (!succeeded) {
- throw std::invalid_argument(error->message);
- }
-
- error_guard.dismiss();
-
- return result;
- }
+ virtual int do_get_url(const std::string & url);
};
}
struct OpenvrmlXembedBrowserPrivate_ {
DBusGProxy * control_host;
+ const gchar * control_host_name;
browser_host_proxy * browser_control_host_proxy;
openvrml_control::browser * browser_control;
browser_listener * listener;
@@ -134,6 +119,7 @@
namespace {
enum browser_property_id {
control_host_proxy_id = 1,
+ control_host_name_id,
expect_initial_stream_id
};
@@ -190,13 +176,24 @@
pspec);
pspec =
+ g_param_spec_string(
+ "control-host-name",
+ "BrowserHost name",
+ "Well-known (nonunique) name for a BrowserHost",
+ "",
+ GParamFlags(G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+ g_object_class_install_property(g_object_class,
+ control_host_name_id,
+ pspec);
+
+ pspec =
g_param_spec_boolean(
"expect-initial-stream",
"expect an initial stream",
"The VrmlControl will be delivered an initial stream",
false,
GParamFlags(G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
- g_object_class_install_property(G_OBJECT_CLASS(klass),
+ g_object_class_install_property(g_object_class,
expect_initial_stream_id,
pspec);
@@ -229,7 +226,7 @@
try {
OpenvrmlXembedBrowser * const browser = OPENVRML_XEMBED_BROWSER(obj);
browser->priv->browser_control_host_proxy =
- new browser_host_proxy(*browser->priv->control_host);
+ new browser_host_proxy(*browser);
browser->priv->browser_control =
new openvrml_control::browser(
*browser->priv->browser_control_host_proxy,
@@ -255,6 +252,7 @@
OpenvrmlXembedBrowser * const browser = OPENVRML_XEMBED_BROWSER(obj);
g_cond_free(browser->priv->browser_plug_realized_cond);
g_mutex_free(browser->priv->browser_plug_mutex);
+ g_free(const_cast<gchar *>(browser->priv->control_host_name));
browser->priv->browser_control->remove_listener(*browser->priv->listener);
delete browser->priv->listener;
delete browser->priv->browser_control;
@@ -271,6 +269,9 @@
case control_host_proxy_id:
browser->priv->control_host = DBUS_G_PROXY(g_value_get_object(value));
break;
+ case control_host_name_id:
+ browser->priv->control_host_name = g_strdup(g_value_get_string(value));
+ break;
case expect_initial_stream_id:
browser->priv->expect_initial_stream = g_value_get_boolean(value);
break;
@@ -289,6 +290,9 @@
case control_host_proxy_id:
g_value_set_object(value, browser->priv->control_host);
break;
+ case control_host_name_id:
+ g_value_set_string(value, browser->priv->control_host_name);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, property_id, pspec);
}
@@ -314,14 +318,16 @@
openvrml_xembed_browser_new(DBusGProxy * const host_proxy,
const gboolean expect_initial_stream,
GMainContext * const gtk_thread_context,
+ const gchar * const host_name,
const GdkNativeWindow socket_id)
{
OpenvrmlXembedBrowser * const browser =
OPENVRML_XEMBED_BROWSER(
g_object_new(OPENVRML_XEMBED_TYPE_BROWSER,
"control-host-proxy", host_proxy,
+ "control-host-name", host_name,
"expect-initial-stream", expect_initial_stream,
- 0));
+ static_cast<void *>(0)));
if (!browser) { return 0; }
scope_guard browser_guard = make_guard(g_object_unref, browser);
@@ -353,7 +359,6 @@
OpenvrmlXembedBrowser * const browser =
OPENVRML_XEMBED_BROWSER(stream_client);
-
try {
browser->priv->browser_control->new_stream(stream_id, type, url);
} catch (const openvrml_control::unknown_stream & ex) {
@@ -1290,3 +1295,78 @@
void openvrml_xembed_browser_ready_finalize(GSource * /* source */)
{
}
+
+namespace {
+
+ void cleanup_private_connection(DBusConnection * const connection)
+ {
+ dbus_connection_close(connection);
+ dbus_connection_unref(connection);
+ }
+
+ int browser_host_proxy::do_get_url(const std::string & url)
+ {
+ //
+ // This function may be called from multiple threads. Because of
+ // this, we can't use the same D-Bus connection that we use for
+ // everything else.
+ //
+ DBusError error;
+ dbus_error_init(&error);
+ scope_guard error_guard = make_guard(dbus_error_free, &error);
+ DBusConnection * const connection =
+ dbus_bus_get_private(DBUS_BUS_SESSION, &error);
+ if (!connection) {
+ g_warning("failed to get session bus connection: %s",
+ error.message);
+ return -1;
+ }
+ scope_guard connection_guard =
+ make_guard(cleanup_private_connection, connection);
+
+ DBusMessage * const get_url_call =
+ dbus_message_new_method_call(
+ this->browser_.priv->control_host_name,
+ dbus_g_proxy_get_path(this->browser_.priv->control_host),
+ dbus_g_proxy_get_interface(this->browser_.priv->control_host),
+ "GetUrl");
+ scope_guard get_url_call_guard =
+ make_guard(dbus_message_unref, get_url_call);
+
+ const char * const url_c_str = url.c_str();
+ bool succeeded =
+ dbus_message_append_args(get_url_call,
+ DBUS_TYPE_STRING, &url_c_str,
+ DBUS_TYPE_INVALID);
+ if (!succeeded) {
+ g_warning("error appending arguments for method call");
+ return -1;
+ }
+
+ DBusMessage * const get_url_response =
+ dbus_connection_send_with_reply_and_block(connection,
+ get_url_call,
+ -1,
+ &error);
+ if (!get_url_response) {
+ g_warning("error fetching resource: %s", error.message);
+ return -1;
+ }
+ scope_guard get_url_response_guard =
+ make_guard(dbus_message_unref, get_url_response);
+
+ gint get_url_result = -1;
+ succeeded =
+ dbus_message_get_args(get_url_response,
+ &error,
+ DBUS_TYPE_INT32, &get_url_result,
+ DBUS_TYPE_INVALID);
+ if (!succeeded) {
+ g_warning("error getting arguments for method call result: %s",
+ error.message);
+ return -1;
+ }
+
+ return get_url_result;
+ }
+}
Modified: trunk/src/openvrml-xembed/browser.h
===================================================================
--- trunk/src/openvrml-xembed/browser.h 2010-02-06 04:44:09 UTC (rev 4082)
+++ trunk/src/openvrml-xembed/browser.h 2010-02-06 05:22:05 UTC (rev 4083)
@@ -61,6 +61,7 @@
openvrml_xembed_browser_new(DBusGProxy * host_proxy,
gboolean expect_initial_stream,
GMainContext * gtk_thread_context,
+ const gchar * host_name,
GdkNativeWindow socket_id);
GType openvrml_xembed_browser_get_type(void) G_GNUC_CONST;
Modified: trunk/src/openvrml-xembed/browserfactory.cpp
===================================================================
--- trunk/src/openvrml-xembed/browserfactory.cpp 2010-02-06 04:44:09 UTC (rev 4082)
+++ trunk/src/openvrml-xembed/browserfactory.cpp 2010-02-06 05:22:05 UTC (rev 4083)
@@ -310,6 +310,7 @@
openvrml_xembed_browser_new(host,
expect_initial_stream,
control_factory->priv->main_thread_context,
+ host_name,
host_id);
if (!browser) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-06 06:07:47
|
Revision: 4085
http://openvrml.svn.sourceforge.net/openvrml/?rev=4085&view=rev
Author: braden
Date: 2010-02-06 06:07:40 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Use C99 sized types instead of XULRunner-/NSPR-specific ones.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/mozilla-plugin/openvrml.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-06 05:24:34 UTC (rev 4084)
+++ trunk/ChangeLog 2010-02-06 06:07:40 UTC (rev 4085)
@@ -1,5 +1,10 @@
2010-02-06 Braden McDaniel <br...@en...>
+ * src/mozilla-plugin/openvrml.cpp: Use C99 sized types instead of
+ XULRunner-/NSPR-specific ones.
+
+2010-02-06 Braden McDaniel <br...@en...>
+
Use a dedicated (private) D-Bus connection to call
org.openvrml.BrowserHost.GetUrl. Multiple threads can call this
function; and a connection should not be shared by multiple
Modified: trunk/src/mozilla-plugin/openvrml.cpp
===================================================================
--- trunk/src/mozilla-plugin/openvrml.cpp 2010-02-06 05:24:34 UTC (rev 4084)
+++ trunk/src/mozilla-plugin/openvrml.cpp 2010-02-06 06:07:40 UTC (rev 4085)
@@ -123,7 +123,7 @@
NPError new_stream(NPMIMEType type, NPStream * stream);
NPError destroy_stream(NPStream * stream);
- int32 write(NPStream * stream, int32 len, void * buffer);
+ int32_t write(NPStream * stream, int32_t len, void * buffer);
//
// Scripting API method implementations.
@@ -445,8 +445,8 @@
*/
NPError NPP_New(const NPMIMEType,
const NPP instance,
- uint16 /* mode */,
- int16 /* argc */,
+ uint16_t /* mode */,
+ int16_t /* argc */,
char * /* argn */[],
char * /* argv */[],
NPSavedData *)
@@ -536,7 +536,7 @@
const NPMIMEType type,
NPStream * const stream,
NPBool /* seekable */,
- uint16 * const stype)
+ uint16_t * const stype)
{
if (!instance || !instance->pdata) { return NPERR_INVALID_INSTANCE_ERROR; }
@@ -572,23 +572,23 @@
*/
namespace {
- int32 STREAMBUFSIZE = 0X0FFFFFFF; /* If we are reading from a file in
- * NPAsFile mode so we can take any size
- * stream in our write call (since we
- * ignore it) */
+ int32_t STREAMBUFSIZE = 0X0FFFFFFF; /* If we are reading from a file in
+ * NPAsFile mode so we can take any
+ * size stream in our write call
+ * (since we ignore it) */
}
-int32 NPP_WriteReady(NPP, NPStream *)
+int32_t NPP_WriteReady(NPP, NPStream *)
{
return STREAMBUFSIZE;
}
-int32 NPP_Write(const NPP instance,
- NPStream * const stream,
- int32 /* offset */,
- const int32 len,
- void * const buffer)
+int32_t NPP_Write(const NPP instance,
+ NPStream * const stream,
+ int32_t /* offset */,
+ const int32_t len,
+ void * const buffer)
{
if (!instance || !instance->pdata) { return 0; }
@@ -654,7 +654,7 @@
}
}
-int16 NPP_HandleEvent(NPP, void * /* event */)
+int16_t NPP_HandleEvent(NPP, void * /* event */)
{
return true;
}
@@ -730,7 +730,7 @@
NPError NPN_PostURLNotify(NPP instance,
const char * url,
const char * window,
- uint32 len,
+ uint32_t len,
const char * buf,
NPBool file,
void * notifyData)
@@ -750,7 +750,7 @@
NPError NPN_PostURL(NPP instance,
const char * url,
const char * window,
- uint32 len,
+ uint32_t len,
const char * buf,
NPBool file)
{
@@ -773,7 +773,7 @@
: NPERR_INCOMPATIBLE_VERSION_ERROR;
}
-int32 NPN_Write(NPP instance, NPStream * stream, int32 len, void * buffer)
+int32_t NPN_Write(NPP instance, NPStream * stream, int32_t len, void * buffer)
{
const int navMinorVersion = mozillaFuncs.version & 0xFF;
return (navMinorVersion >= NPVERS_HAS_STREAMOUTPUT)
@@ -799,7 +799,7 @@
return mozillaFuncs.uagent(instance);
}
-void * NPN_MemAlloc(uint32 size)
+void * NPN_MemAlloc(uint32_t size)
{
return mozillaFuncs.memalloc(size);
}
@@ -809,7 +809,7 @@
mozillaFuncs.memfree(ptr);
}
-uint32 NPN_MemFlush(uint32 size)
+uint32_t NPN_MemFlush(uint32_t size)
{
return mozillaFuncs.memflush(size);
}
@@ -1211,9 +1211,9 @@
return NPERR_NO_ERROR;
}
- int32 plugin_instance::write(NPStream * const stream,
- const int32 len,
- void * const buffer)
+ int32_t plugin_instance::write(NPStream * const stream,
+ const int32_t len,
+ void * const buffer)
{
if (!this->browser) { return 0; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-06 06:17:22
|
Revision: 4087
http://openvrml.svn.sourceforge.net/openvrml/?rev=4087&view=rev
Author: braden
Date: 2010-02-06 06:17:16 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Use NPBool instead of PRBool.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/mozilla-plugin/openvrml.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-06 06:12:32 UTC (rev 4086)
+++ trunk/ChangeLog 2010-02-06 06:17:16 UTC (rev 4087)
@@ -1,5 +1,9 @@
2010-02-06 Braden McDaniel <br...@en...>
+ * src/mozilla-plugin/openvrml.cpp: Use NPBool instead of PRBool.
+
+2010-02-06 Braden McDaniel <br...@en...>
+
* src/mozilla-plugin/openvrml.cpp: Use C99 sized types instead of
XULRunner-/NSPR-specific ones.
Modified: trunk/src/mozilla-plugin/openvrml.cpp
===================================================================
--- trunk/src/mozilla-plugin/openvrml.cpp 2010-02-06 06:12:32 UTC (rev 4086)
+++ trunk/src/mozilla-plugin/openvrml.cpp 2010-02-06 06:17:16 UTC (rev 4087)
@@ -339,7 +339,7 @@
//
// Make sure the browser supports XEmbed plug-ins.
//
- PRBool supportsXEmbed = PR_FALSE;
+ NPBool supportsXEmbed = false;
err = NPN_GetValue(0, NPNVSupportsXEmbedBool, &supportsXEmbed);
if (err != NPERR_NO_ERROR || !supportsXEmbed) {
@@ -681,7 +681,7 @@
switch (variable) {
case NPPVpluginNeedsXEmbed:
- *static_cast<PRBool *>(value) = PR_TRUE;
+ *static_cast<NPBool *>(value) = true;
break;
case NPPVpluginScriptableNPObject:
assert(npp->pdata);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-06 06:27:03
|
Revision: 4089
http://openvrml.svn.sourceforge.net/openvrml/?rev=4089&view=rev
Author: braden
Date: 2010-02-06 06:26:57 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Remove Java-related function definitions. The signatures of these functions differ from XULRunner 1.9.1 to 1.9.2. We're not using them; so in the interest of working with both XULRunner versions, just delete them for now.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/mozilla-plugin/openvrml.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-06 06:19:27 UTC (rev 4088)
+++ trunk/ChangeLog 2010-02-06 06:26:57 UTC (rev 4089)
@@ -1,5 +1,17 @@
2010-02-06 Braden McDaniel <br...@en...>
+ Remove Java-related function definitions. The signatures of these
+ functions differ from XULRunner 1.9.1 to 1.9.2. We're not using
+ them; so in the interest of working with both XULRunner versions,
+ just delete them for now.
+
+ * src/mozilla-plugin/openvrml.cpp
+ (NPP_GetJavaClass()): Removed.
+ (NPN_GetJavaEnv()): Removed.
+ (NPN_GetJavaPeer(NPP)): Removed.
+
+2010-02-06 Braden McDaniel <br...@en...>
+
* src/mozilla-plugin/openvrml.cpp: Use NPBool instead of PRBool.
2010-02-06 Braden McDaniel <br...@en...>
Modified: trunk/src/mozilla-plugin/openvrml.cpp
===================================================================
--- trunk/src/mozilla-plugin/openvrml.cpp 2010-02-06 06:19:27 UTC (rev 4088)
+++ trunk/src/mozilla-plugin/openvrml.cpp 2010-02-06 06:26:57 UTC (rev 4089)
@@ -665,11 +665,6 @@
void * /* notifyData */)
{}
-jref NPP_GetJavaClass()
-{
- return 0;
-}
-
NPError NPP_GetValue(const NPP npp,
const NPPVariable variable,
void * const value)
@@ -819,16 +814,6 @@
mozillaFuncs.reloadplugins(reloadPages);
}
-JRIEnv * NPN_GetJavaEnv()
-{
- return static_cast<JRIEnv *>(mozillaFuncs.getJavaEnv());
-}
-
-jref NPN_GetJavaPeer(NPP instance)
-{
- return static_cast<jref>(mozillaFuncs.getJavaPeer(instance));
-}
-
NPError NPN_GetValue(NPP instance, NPNVariable variable, void * value)
{
return mozillaFuncs.getvalue(instance, variable, value);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-08 04:42:18
|
Revision: 4091
http://openvrml.svn.sourceforge.net/openvrml/?rev=4091&view=rev
Author: braden
Date: 2010-02-08 04:42:11 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
Modernize Boost.Thread usage: include <boost/thread.hpp> and use boost::condition_variable.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/browser.cpp
trunk/src/libopenvrml/openvrml/field_value.h
trunk/src/libopenvrml/openvrml/local/externproto.h
trunk/src/libopenvrml/openvrml/node.h
trunk/src/libopenvrml/openvrml/scene.h
trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp
trunk/src/openvrml-xembed/main.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/ChangeLog 2010-02-08 04:42:11 UTC (rev 4091)
@@ -1,3 +1,24 @@
+2010-02-07 Braden McDaniel <br...@en...>
+
+ Modernize Boost.Thread usage: include <boost/thread.hpp> and use
+ boost::condition_variable.
+
+ * src/Makefile.am
+ (local_libopenvrml_control_la_LDFLAGS): Link with libboost_thread.
+ * src/libopenvrml/openvrml/browser.cpp: Boost.Thread headers are
+ pulled in by scene.h.
+ * src/libopenvrml/openvrml/field_value.h: Include
+ <boost/thread.hpp>.
+ * src/libopenvrml/openvrml/local/externproto.h: Include
+ <boost/thread.hpp>.
+ * src/libopenvrml/openvrml/node.h: Boost.Thread headers are pulled
+ in by field_value.h.
+ * src/libopenvrml/openvrml/scene.h: Boost.Thread headers are
+ pulled in by node.h.
+ * src/local/libopenvrml-control/openvrml_control/browser.cpp:
+ Include <boost/thread.hpp>; use boost::condition_variable.
+ * src/openvrml-xembed/main.cpp: Include <boost/thread.hpp>.
+
2010-02-06 Braden McDaniel <br...@en...>
Remove Java-related function definitions. The signatures of these
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/Makefile.am 2010-02-08 04:42:11 UTC (rev 4091)
@@ -746,6 +746,8 @@
local_libopenvrml_control_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml
+local_libopenvrml_control_la_LDFLAGS = \
+ -lboost_thread$(BOOST_LIB_SUFFIX)
local_libopenvrml_control_la_LIBADD = \
libopenvrml/libopenvrml.la
Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp 2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/browser.cpp 2010-02-08 04:42:11 UTC (rev 4091)
@@ -33,7 +33,6 @@
# include <boost/functional.hpp>
# include <boost/lexical_cast.hpp>
# include <boost/multi_index/detail/scope_guard.hpp>
-# include <boost/thread/thread.hpp>
# include <algorithm>
# include <functional>
# include <cerrno>
Modified: trunk/src/libopenvrml/openvrml/field_value.h
===================================================================
--- trunk/src/libopenvrml/openvrml/field_value.h 2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/field_value.h 2010-02-08 04:42:11 UTC (rev 4091)
@@ -31,8 +31,7 @@
# include <boost/scoped_ptr.hpp>
# include <boost/shared_ptr.hpp>
# include <boost/utility.hpp>
-# include <boost/thread/locks.hpp>
-# include <boost/thread/shared_mutex.hpp>
+# include <boost/thread.hpp>
# include <openvrml/basetypes.h>
namespace openvrml {
Modified: trunk/src/libopenvrml/openvrml/local/externproto.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/externproto.h 2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/local/externproto.h 2010-02-08 04:42:11 UTC (rev 4091)
@@ -23,7 +23,7 @@
# include <openvrml/local/proto.h>
# include <boost/enable_shared_from_this.hpp>
-# include <boost/thread/thread.hpp>
+# include <boost/thread.hpp>
namespace openvrml {
Modified: trunk/src/libopenvrml/openvrml/node.h
===================================================================
--- trunk/src/libopenvrml/openvrml/node.h 2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/node.h 2010-02-08 04:42:11 UTC (rev 4091)
@@ -25,7 +25,6 @@
# include <openvrml/field_value.h>
# include <openvrml/rendering_context.h>
# include <boost/bind.hpp>
-# include <boost/thread/mutex.hpp>
# include <deque>
# include <map>
# include <set>
Modified: trunk/src/libopenvrml/openvrml/scene.h
===================================================================
--- trunk/src/libopenvrml/openvrml/scene.h 2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/scene.h 2010-02-08 04:42:11 UTC (rev 4091)
@@ -25,7 +25,6 @@
# include <openvrml-common.h>
# include <openvrml/bad_url.h>
# include <openvrml/node.h>
-# include <boost/thread.hpp>
namespace openvrml {
Modified: trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp
===================================================================
--- trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp 2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp 2010-02-08 04:42:11 UTC (rev 4091)
@@ -21,7 +21,7 @@
# include "browser.h"
# include <boost/enable_shared_from_this.hpp>
# include <boost/lexical_cast.hpp>
-# include <boost/thread/condition.hpp>
+# include <boost/thread.hpp>
# include <iostream>
openvrml_control::unknown_stream::unknown_stream(const std::string & uri):
@@ -84,7 +84,7 @@
template <typename CharT, size_t BufferSize>
class bounded_buffer {
mutable boost::mutex mutex_;
- boost::condition buffer_not_full_, buffer_not_empty_or_eof_;
+ boost::condition_variable buffer_not_full_, buffer_not_empty_or_eof_;
CharT buf_[BufferSize];
size_t begin_, end_, buffered_;
@@ -184,8 +184,8 @@
state_id state_;
mutable boost::mutex mutex_;
int get_url_result_;
- mutable boost::condition received_get_url_result_;
- mutable boost::condition streambuf_initialized_or_failed_;
+ mutable boost::condition_variable received_get_url_result_;
+ mutable boost::condition_variable streambuf_initialized_or_failed_;
std::string url_;
std::string type_;
bounded_buffer<char_type, 16384> buf_;
Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp 2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/openvrml-xembed/main.cpp 2010-02-08 04:42:11 UTC (rev 4091)
@@ -31,7 +31,7 @@
# include <boost/multi_index/detail/scope_guard.hpp>
# include <boost/ref.hpp>
# include <boost/scoped_ptr.hpp>
-# include <boost/thread/thread.hpp>
+# include <boost/thread.hpp>
# include <iostream>
# include <cstring>
# include <unistd.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-08 20:27:19
|
Revision: 4093
http://openvrml.svn.sourceforge.net/openvrml/?rev=4093&view=rev
Author: braden
Date: 2010-02-08 20:27:12 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
Remove dead code.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/openvrml-xembed/browser.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-08 04:46:17 UTC (rev 4092)
+++ trunk/ChangeLog 2010-02-08 20:27:12 UTC (rev 4093)
@@ -1,3 +1,15 @@
+2010-02-08 Braden McDaniel <br...@en...>
+
+ Remove dead code.
+
+ * src/openvrml-xembed/browser.cpp
+ (openvrml_xembed_browser_new_stream(OpenvrmlXembedBrowser *,
+ guint64, const char *, const char *, GError **)): Removed.
+ (openvrml_xembed_browser_destroy_stream(OpenvrmlXembedBrowser *,
+ guint64, GError **)): Removed.
+ (openvrml_xembed_browser_write(OpenvrmlXembedBrowser *, guint64,
+ const GArray *, GError **)): Removed.
+
2010-02-07 Braden McDaniel <br...@en...>
Modernize Boost.Thread usage: include <boost/thread.hpp> and use
Modified: trunk/src/openvrml-xembed/browser.cpp
===================================================================
--- trunk/src/openvrml-xembed/browser.cpp 2010-02-08 04:46:17 UTC (rev 4092)
+++ trunk/src/openvrml-xembed/browser.cpp 2010-02-08 20:27:12 UTC (rev 4093)
@@ -466,44 +466,6 @@
return id;
}
-gboolean
-openvrml_xembed_browser_new_stream(OpenvrmlXembedBrowser * const browser,
- const guint64 stream_id,
- const char * const type,
- const char * const url,
- GError ** const error)
-{
- return openvrml_xembed_stream_client_new_stream(
- OPENVRML_XEMBED_STREAM_CLIENT(browser),
- stream_id,
- type,
- url,
- error);
-}
-
-gboolean
-openvrml_xembed_browser_destroy_stream(OpenvrmlXembedBrowser * const browser,
- const guint64 stream_id,
- GError ** const error)
-{
- return openvrml_xembed_stream_client_destroy_stream(
- OPENVRML_XEMBED_STREAM_CLIENT(browser),
- stream_id,
- error);
-}
-
-gboolean openvrml_xembed_browser_write(OpenvrmlXembedBrowser * const browser,
- const guint64 stream_id,
- const GArray * const data,
- GError ** const error)
-{
- return openvrml_xembed_stream_client_write(
- OPENVRML_XEMBED_STREAM_CLIENT(browser),
- stream_id,
- data,
- error);
-}
-
gchar *
openvrml_xembed_browser_get_world_url(
OpenvrmlXembedBrowser * const browser,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-13 20:12:41
|
Revision: 4095
http://openvrml.svn.sourceforge.net/openvrml/?rev=4095&view=rev
Author: braden
Date: 2010-02-13 20:12:35 +0000 (Sat, 13 Feb 2010)
Log Message:
-----------
Fixes for Windows.
Modified Paths:
--------------
trunk/ChangeLog
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
trunk/src/libopenvrml/openvrml/local/conf.cpp
trunk/src/libopenvrml/openvrml/local/error.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-08 20:30:27 UTC (rev 4094)
+++ trunk/ChangeLog 2010-02-13 20:12:35 UTC (rev 4095)
@@ -1,3 +1,20 @@
+2010-02-13 Braden McDaniel <br...@en...>
+
+ Fixes for Windows.
+
+ * src/libopenvrml/openvrml/local/conf.cpp
+ (const std::string query_registry_value(HKEY, const
+ std::string&)): Bring
+ openvrml::local::throw_runtime_error_from_win32_system_error into
+ scope.
+ (const std::string get_registry_setting(const std::string &)):
+ Bring openvrml::local::throw_runtime_error_from_win32_system_error
+ into scope.
+ * src/libopenvrml/openvrml/local/error.cpp: Include
+ <boost/multi_index/detail/scope_guard.hpp>.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj:
+ Add src/libopenvrml/openvrml/local/error.{cpp,h} to the project.
+
2010-02-08 Braden McDaniel <br...@en...>
Remove dead code.
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2010-02-08 20:30:27 UTC (rev 4094)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2010-02-13 20:12:35 UTC (rev 4095)
@@ -232,6 +232,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\error.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.cpp"
>
</File>
@@ -337,6 +341,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\error.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.h"
>
</File>
Modified: trunk/src/libopenvrml/openvrml/local/conf.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/conf.cpp 2010-02-08 20:30:27 UTC (rev 4094)
+++ trunk/src/libopenvrml/openvrml/local/conf.cpp 2010-02-13 20:12:35 UTC (rev 4095)
@@ -68,6 +68,8 @@
const std::string query_registry_value(HKEY key, const std::string & name)
OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
{
+ using openvrml::local::throw_runtime_error_from_win32_system_error;
+
LONG result;
static DWORD * const reserved;
DWORD type;
@@ -100,6 +102,8 @@
const std::string get_registry_setting(const std::string & name)
OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
{
+ using openvrml::local::throw_runtime_error_from_win32_system_error;
+
static const ULONG options = 0;
HKEY key;
LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
Modified: trunk/src/libopenvrml/openvrml/local/error.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/error.cpp 2010-02-08 20:30:27 UTC (rev 4094)
+++ trunk/src/libopenvrml/openvrml/local/error.cpp 2010-02-13 20:12:35 UTC (rev 4095)
@@ -19,7 +19,12 @@
//
# include "error.h"
+# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/ref.hpp>
+using namespace boost::multi_index::detail; // for scope_guard
+
+
# ifdef _WIN32
void openvrml::local::throw_runtime_error_from_win32_system_error(LONG result)
OPENVRML_THROW1(std::runtime_error)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-13 22:03:22
|
Revision: 4097
http://openvrml.svn.sourceforge.net/openvrml/?rev=4097&view=rev
Author: braden
Date: 2010-02-13 22:03:15 +0000 (Sat, 13 Feb 2010)
Log Message:
-----------
Link with libboost_system.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tests/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-13 20:16:59 UTC (rev 4096)
+++ trunk/ChangeLog 2010-02-13 22:03:15 UTC (rev 4097)
@@ -1,5 +1,9 @@
2010-02-13 Braden McDaniel <br...@en...>
+ * tests/Makefile.am (browser_LDADD): Link with libboost_system.
+
+2010-02-13 Braden McDaniel <br...@en...>
+
Fixes for Windows.
* src/libopenvrml/openvrml/local/conf.cpp
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2010-02-13 20:16:59 UTC (rev 4096)
+++ trunk/tests/Makefile.am 2010-02-13 22:03:15 UTC (rev 4097)
@@ -50,7 +50,8 @@
browser_LDADD = \
libtest-openvrml.la \
-lboost_unit_test_framework$(BOOST_LIB_SUFFIX) \
- -lboost_filesystem$(BOOST_LIB_SUFFIX)
+ -lboost_filesystem$(BOOST_LIB_SUFFIX) \
+ -lboost_system$(BOOST_LIB_SUFFIX)
parse_anchor_SOURCES = parse_anchor.cpp
parse_anchor_LDADD = \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-13 23:47:46
|
Revision: 4099
http://openvrml.svn.sourceforge.net/openvrml/?rev=4099&view=rev
Author: braden
Date: 2010-02-13 23:47:40 +0000 (Sat, 13 Feb 2010)
Log Message:
-----------
Update FreeType library name for 2.3.12.
Modified Paths:
--------------
trunk/ChangeLog
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-13 22:08:33 UTC (rev 4098)
+++ trunk/ChangeLog 2010-02-13 23:47:40 UTC (rev 4099)
@@ -1,5 +1,10 @@
2010-02-13 Braden McDaniel <br...@en...>
+ * ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj:
+ Update FreeType library name for 2.3.12.
+
+2010-02-13 Braden McDaniel <br...@en...>
+
* tests/Makefile.am (browser_LDADD): Link with libboost_system.
2010-02-13 Braden McDaniel <br...@en...>
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj 2010-02-13 22:08:33 UTC (rev 4098)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj 2010-02-13 23:47:40 UTC (rev 4099)
@@ -63,7 +63,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- AdditionalDependencies="libpngd.lib zlibd.lib freetype239_D.lib"
+ AdditionalDependencies="libpngd.lib zlibd.lib freetype2312_D.lib"
OutputFile="$(OutDir)\bin\node\$(ProjectName).dll"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -138,7 +138,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- AdditionalDependencies="libpng.lib zlib.lib freetype239.lib"
+ AdditionalDependencies="libpng.lib zlib.lib freetype2312.lib"
OutputFile="$(OutDir)\bin\node\$(ProjectName).dll"
GenerateDebugInformation="true"
/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-14 01:28:09
|
Revision: 4101
http://openvrml.svn.sourceforge.net/openvrml/?rev=4101&view=rev
Author: braden
Date: 2010-02-14 01:28:03 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
Modernize Boost.Thread usage: include <boost/thread.hpp> and use boost::condition_variable.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tests/browser.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-13 23:49:46 UTC (rev 4100)
+++ trunk/ChangeLog 2010-02-14 01:28:03 UTC (rev 4101)
@@ -1,5 +1,10 @@
2010-02-13 Braden McDaniel <br...@en...>
+ * tests/browser.cpp: Modernize Boost.Thread usage: include
+ <boost/thread.hpp> and use boost::condition_variable.
+
+2010-02-13 Braden McDaniel <br...@en...>
+
* ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj:
Update FreeType library name for 2.3.12.
Modified: trunk/tests/browser.cpp
===================================================================
--- trunk/tests/browser.cpp 2010-02-13 23:49:46 UTC (rev 4100)
+++ trunk/tests/browser.cpp 2010-02-14 01:28:03 UTC (rev 4101)
@@ -24,7 +24,7 @@
# include <sstream>
# include <boost/filesystem/operations.hpp>
# include <boost/multi_index/detail/scope_guard.hpp>
-# include <boost/thread/condition.hpp>
+# include <boost/thread.hpp>
# include <boost/test/unit_test.hpp>
# include "test_resource_fetcher.h"
@@ -80,10 +80,11 @@
class children_listener : public openvrml::mfnode_listener {
bool received_event_;
boost::mutex & mutex_;
- boost::condition & condition_;
+ boost::condition_variable & condition_;
public:
- children_listener(boost::mutex & mutex, boost::condition & condition):
+ children_listener(boost::mutex & mutex,
+ boost::condition_variable & condition):
received_event_(false),
mutex_(mutex),
condition_(condition)
@@ -122,7 +123,7 @@
b.create_vrml_from_stream(vrmlstream);
boost::mutex mutex;
- boost::condition listener_received_event;
+ boost::condition_variable listener_received_event;
children_listener listener(mutex, listener_received_event);
mfnode_emitter & emitter =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-14 04:51:40
|
Revision: 4106
http://openvrml.svn.sourceforge.net/openvrml/?rev=4106&view=rev
Author: braden
Date: 2010-02-14 04:51:31 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
Updates for 0.18.4 release.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/doc/Doxyfile
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
trunk/src/Makefile.am
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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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 2010-02-14 03:52:47 UTC (rev 4105)
+++ trunk/ChangeLog 2010-02-14 04:51:31 UTC (rev 4106)
@@ -1,5 +1,18 @@
2010-02-13 Braden McDaniel <br...@en...>
+ Updates for 0.18.4 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: Updated libopenvrml library version to 9:3:0.
+
+2010-02-13 Braden McDaniel <br...@en...>
+
* tests/browser.cpp: Modernize Boost.Thread usage: include
<boost/thread.hpp> and use boost::condition_variable.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2010-02-14 03:52:47 UTC (rev 4105)
+++ trunk/NEWS 2010-02-14 04:51:31 UTC (rev 4106)
@@ -1,3 +1,16 @@
+Changes new in version 0.18.4, 13 February, 2010
+========================================================================
+
+- Added missing Visual C++ project file for openvrml-dl.
+
+- Fixes for building with Boost 1.41.0.
+
+- Fixes to build with XULRunner 1.9.2.
+
+- Fixed crashes associated with concurrently downloading resources in
+ openvrml-xembed.
+
+
Changes new in version 0.18.3, 13 August, 2009
========================================================================
Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile 2010-02-14 03:52:47 UTC (rev 4105)
+++ trunk/doc/Doxyfile 2010-02-14 04:51:31 UTC (rev 4106)
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = OpenVRML
-PROJECT_NUMBER = 0.18.3
+PROJECT_NUMBER = 0.18.4
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2010-02-14 03:52:47 UTC (rev 4105)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2010-02-14 04:51:31 UTC (rev 4106)
@@ -28,9 +28,9 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OpenVRML Library"
- VALUE "FileVersion", "9, 2, 0, 0"
+ VALUE "FileVersion", "9, 3, 0, 0"
VALUE "InternalName", "openvrml"
- VALUE "LegalCopyright", "Copyright (C) 2009"
+ VALUE "LegalCopyright", "Copyright (C) 2010"
VALUE "OriginalFilename", "openvrml.dll"
VALUE "ProductName", "OpenVRML Library"
VALUE "ProductVersion", "0.18.99"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2010-02-14 03:52:47 UTC (rev 4105)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2010-02-14 04:51:31 UTC (rev 4106)
@@ -30,7 +30,7 @@
VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
VALUE "FileVersion", "8, 0, 0, 0"
VALUE "InternalName", "openvrml-gl"
- VALUE "LegalCopyright", "Copyright (C) 2009"
+ VALUE "LegalCopyright", "Copyright (C) 2010"
VALUE "OriginalFilename", "openvrml-gl.dll"
VALUE "ProductName", "OpenVRML Library"
VALUE "ProductVersion", "0.18.99"
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-02-14 03:52:47 UTC (rev 4105)
+++ trunk/src/Makefile.am 2010-02-14 04:51:31 UTC (rev 4106)
@@ -47,7 +47,7 @@
libopenvrml/private.h \
openvrml-player/filechooserdialog.h
-LIBOPENVRML_LIBRARY_VERSION = 9:2:0
+LIBOPENVRML_LIBRARY_VERSION = 9:3:0
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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
Property changes on: trunk/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/mozilla-plugin:3951,3953,3955,3960,3994
+ /branches/0.18/src/mozilla-plugin:3951,3953,3955,3960,3994,4104
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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994
/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_event_utilities.cpp:3401-3630
+ /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3953,3955,3960,3994,4104
/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_event_utilities.cpp:3401-3630
Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/time_trigger.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/time_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/time_trigger.h:3951,3953,3955,3960,3994,4104
/branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/time_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-geometry2d/arc2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3953,3955,3960,3994,4104
/branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-geometry2d/arc2d.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/0.18/src/node/x3d-geometry2d/arc2d.h:3951,3953,3955,3960,3994,4104
/branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/l...
[truncated message content] |
|
From: <br...@us...> - 2010-02-14 06:28:25
|
Revision: 4107
http://openvrml.svn.sourceforge.net/openvrml/?rev=4107&view=rev
Author: braden
Date: 2010-02-14 06:28:17 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
Use Boost.ScopeExit instead of ScopeGuard.
Modified Paths:
--------------
trunk/ChangeLog
trunk/README
trunk/configure-gcc-dbg
trunk/src/libopenvrml/openvrml/browser.cpp
trunk/src/libopenvrml/openvrml/local/conf.cpp
trunk/src/libopenvrml/openvrml/local/error.cpp
trunk/src/libopenvrml/openvrml/local/externproto.cpp
trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
trunk/src/libopenvrml/openvrml/local/uri.cpp
trunk/src/libopenvrml/openvrml/local/xml_reader.cpp
trunk/src/libopenvrml/openvrml/script.cpp
trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
trunk/src/mozilla-plugin/openvrml.cpp
trunk/src/node/vrml97/grouping_node_base.h
trunk/src/node/vrml97/image_stream_listener.cpp
trunk/src/node/vrml97/text.cpp
trunk/src/openvrml-player/curlbrowserhost.cpp
trunk/src/openvrml-player/filechooserdialog.cpp
trunk/src/openvrml-player/player.cpp
trunk/src/openvrml-xembed/browser.cpp
trunk/src/openvrml-xembed/browserfactory.cpp
trunk/src/openvrml-xembed/main.cpp
trunk/src/script/java.cpp
trunk/src/script/javascript.cpp
trunk/tests/browser.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/ChangeLog 2010-02-14 06:28:17 UTC (rev 4107)
@@ -1,3 +1,31 @@
+2010-02-14 Braden McDaniel <br...@en...>
+
+ Use Boost.ScopeExit instead of ScopeGuard.
+
+ * README: Note Boost 1.38 requirement.
+ * src/libopenvrml/openvrml/browser.cpp
+ * src/libopenvrml/openvrml/local/conf.cpp
+ * src/libopenvrml/openvrml/local/error.cpp
+ * src/libopenvrml/openvrml/local/externproto.cpp
+ * src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
+ * src/libopenvrml/openvrml/local/uri.cpp
+ * src/libopenvrml/openvrml/local/xml_reader.cpp
+ * src/libopenvrml/openvrml/script.cpp
+ * src/local/libopenvrml-dl/openvrml/local/dl.cpp
+ * src/mozilla-plugin/openvrml.cpp
+ * src/node/vrml97/grouping_node_base.h
+ * src/node/vrml97/image_stream_listener.cpp
+ * src/node/vrml97/text.cpp
+ * src/openvrml-player/curlbrowserhost.cpp
+ * src/openvrml-player/filechooserdialog.cpp
+ * src/openvrml-player/player.cpp
+ * src/openvrml-xembed/browser.cpp
+ * src/openvrml-xembed/browserfactory.cpp
+ * src/openvrml-xembed/main.cpp
+ * src/script/java.cpp
+ * src/script/javascript.cpp
+ * tests/browser.cpp
+
2010-02-13 Braden McDaniel <br...@en...>
Updates for 0.18.4 release.
Modified: trunk/README
===================================================================
--- trunk/README 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/README 2010-02-14 06:28:17 UTC (rev 4107)
@@ -136,7 +136,7 @@
At a minimum, OpenVRML requires these libraries to build:
- Boost (at least 1.37) <http://boost.org>
+ Boost (at least 1.38) <http://boost.org>
libxml (non-Windows only) <http://xmlsoft.org>
These libraries are packaged for many systems; so you should
Modified: trunk/configure-gcc-dbg
===================================================================
--- trunk/configure-gcc-dbg 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/configure-gcc-dbg 2010-02-14 06:28:17 UTC (rev 4107)
@@ -1,3 +1,3 @@
#!/bin/bash
-$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_CONCEPT_CHECKS -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -pedantic-errors -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JRE_HOME=/usr/lib/jvm/jre "$*"
+$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_CONCEPT_CHECKS -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JRE_HOME=/usr/lib/jvm/jre "$*"
Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/libopenvrml/openvrml/browser.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -3,7 +3,8 @@
// OpenVRML
//
// Copyright 1998 Chris Morley
-// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 Braden McDaniel
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+// Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -32,7 +33,6 @@
# include <boost/function.hpp>
# include <boost/functional.hpp>
# include <boost/lexical_cast.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
# include <algorithm>
# include <functional>
# include <cerrno>
@@ -48,8 +48,6 @@
# include <config.h>
# endif
-using namespace boost::multi_index::detail; // for scope_guard
-
/**
* @file openvrml/browser.h
*
Modified: trunk/src/libopenvrml/openvrml/local/conf.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/conf.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/libopenvrml/openvrml/local/conf.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2009 Braden McDaniel
+// Copyright 2009, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -20,7 +20,6 @@
# include "conf.h"
# include "error.h"
-# include <boost/multi_index/detail/scope_guard.hpp>
# include <boost/ref.hpp>
# include <boost/tokenizer.hpp>
# ifdef _WIN32
@@ -30,8 +29,6 @@
# include <cstdlib>
# endif
-using namespace boost::multi_index::detail; // for scope_guard
-
namespace {
class OPENVRML_LOCAL no_environment_var : public std::runtime_error {
Modified: trunk/src/libopenvrml/openvrml/local/error.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/error.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/libopenvrml/openvrml/local/error.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2009 Braden McDaniel
+// Copyright 2009, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -19,21 +19,17 @@
//
# include "error.h"
-# include <boost/multi_index/detail/scope_guard.hpp>
-# include <boost/ref.hpp>
+# include <boost/scope_exit.hpp>
-using namespace boost::multi_index::detail; // for scope_guard
-
-
# ifdef _WIN32
void openvrml::local::throw_runtime_error_from_win32_system_error(LONG result)
OPENVRML_THROW1(std::runtime_error)
{
- using boost::ref;
-
static const LPCVOID source;
LPTSTR buf = 0;
- scope_guard buf_guard = make_guard(LocalFree, ref(buf));
+ BOOST_SCOPE_EXIT((&buf)) {
+ LocalFree(buf);
+ } BOOST_SCOPE_EXIT_END
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
| FORMAT_MESSAGE_ALLOCATE_BUFFER,
source,
Modified: trunk/src/libopenvrml/openvrml/local/externproto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/externproto.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/libopenvrml/openvrml/local/externproto.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2009 Braden McDaniel
+// Copyright 2009, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -25,10 +25,8 @@
# include <openvrml/scene.h>
# include <boost/function.hpp>
# include <boost/mpl/for_each.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
-using namespace boost::multi_index::detail; // for scope_guard
-
struct OPENVRML_LOCAL openvrml::local::externproto_node_metatype::load_proto {
load_proto(externproto_node_metatype & externproto_class,
const openvrml::scene & scene,
@@ -52,12 +50,9 @@
using boost::shared_ptr;
using local::uri;
- scope_guard guard =
- make_obj_guard(
- *this->externproto_node_metatype_,
- &externproto_node_metatype::
- clear_externproto_node_types);
- boost::ignore_unused_variable_warning(guard);
+ BOOST_SCOPE_EXIT((&externproto_node_metatype_)) {
+ externproto_node_metatype_->clear_externproto_node_types();
+ } BOOST_SCOPE_EXIT_END
auto_ptr<resource_istream> in =
this->scene_->get_resource(this->alt_uris_);
Modified: trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -21,12 +21,10 @@
# include "node_metatype_registry_impl.h"
# include "conf.h"
# include <openvrml/browser.h>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <iostream>
# include <sstream>
-using namespace boost::multi_index::detail; // for scope_guard
-
const std::string openvrml::local::node_metatype_registry_impl::sym =
"openvrml_register_node_metatypes";
@@ -43,7 +41,10 @@
std::cerr << dl::error() << std::endl;
return 0;
}
- scope_guard handle_guard = make_guard(dl::close, handle);
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT((&succeeded)(handle)) {
+ if (!succeeded) { dl::close(handle); }
+ } BOOST_SCOPE_EXIT_END
//
// Make sure the module has what we're looking for.
@@ -52,9 +53,8 @@
dl::sym(handle, openvrml::local::node_metatype_registry_impl::sym);
if (!sym) { return 0; } // handle_guard will close the module.
- const bool succeeded = registry.module_handles_.insert(handle).second;
+ succeeded = registry.module_handles_.insert(handle).second;
assert(succeeded);
- handle_guard.dismiss();
return 0;
}
Modified: trunk/src/libopenvrml/openvrml/local/uri.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/uri.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/libopenvrml/openvrml/local/uri.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -23,8 +23,7 @@
# include <cerrno>
# include <cstring>
# ifdef _WIN32
-# include <boost/multi_index/detail/scope_guard.hpp>
-using namespace boost::multi_index::detail; // for scope_guard
+# include <boost/scope_exit.hpp>
# endif
openvrml::local::uri::uri() OPENVRML_THROW1(std::bad_alloc):
@@ -549,7 +548,9 @@
using boost::ref;
DWORD error = GetLastError();
void * msgBuf = 0;
- scope_guard msgBuf_guard = make_guard(LocalFree, ref(msgBuf));
+ BOOST_SCOPE_EXIT((&msgBuf)) {
+ LocalFree(msgBuf);
+ } BOOST_SCOPE_EXIT_END
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
| FORMAT_MESSAGE_FROM_SYSTEM
| FORMAT_MESSAGE_IGNORE_INSERTS,
@@ -575,7 +576,9 @@
using boost::ref;
DWORD error = GetLastError();
void * msgBuf = 0;
- scope_guard msgBuf_guard = make_guard(LocalFree, ref(msgBuf));
+ BOOST_SCOPE_EXIT((&msgBuf)) {
+ LocalFree(msgBuf);
+ } BOOST_SCOPE_EXIT_END
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
| FORMAT_MESSAGE_FROM_SYSTEM
| FORMAT_MESSAGE_IGNORE_INSERTS,
Modified: trunk/src/libopenvrml/openvrml/local/xml_reader.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/xml_reader.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/libopenvrml/openvrml/local/xml_reader.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -21,8 +21,7 @@
# include "xml_reader.h"
# ifdef _WIN32
# include <shlwapi.h>
-# include <boost/multi_index/detail/scope_guard.hpp>
-using namespace boost::multi_index::detail; // for scope_guard
+# include <boost/scope_exit.hpp>
# endif
/**
@@ -125,31 +124,33 @@
{
# ifdef _WIN32
HRESULT hr;
+ bool succeeded = false;
hr = SHCreateStreamOnFile(filename.c_str(), STGM_READ, &this->input);
+ BOOST_SCOPE_EXIT((&succeeded)(&input)) {
+ if (!succeeded && input) { input->Release(); }
+ } BOOST_SCOPE_EXIT_END
if (FAILED(hr)) {
throw std::runtime_error("failed to open file \"" + filename
+ '\"');
}
- scope_guard input_guard =
- make_obj_guard(*this->input, &IStream::Release);
hr = CreateXmlReader(__uuidof(IXmlReader),
reinterpret_cast<void **>(&this->reader),
0);
+ BOOST_SCOPE_EXIT((&succeeded)(&reader)) {
+ if (!succeeded && reader) { reader->Release(); }
+ } BOOST_SCOPE_EXIT_END
if (FAILED(hr)) {
throw std::runtime_error("failed to create XML reader");
}
- scope_guard reader_guard =
- make_obj_guard(*this->reader, &IXmlReader::Release);
hr = this->reader->SetInput(this->input);
if (FAILED(hr)) {
throw std::runtime_error("failed to set input for XML reader");
}
- input_guard.dismiss();
- reader_guard.dismiss();
+ succeeded = true;
# else
static const char * const encoding = 0;
static const int options = 0;
Modified: trunk/src/libopenvrml/openvrml/script.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/script.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/libopenvrml/openvrml/script.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -3,7 +3,8 @@
// OpenVRML
//
// Copyright 1998 Chris Morley
-// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 Braden McDaniel
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+// Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -31,7 +32,7 @@
# include <boost/functional.hpp>
# include <boost/lexical_cast.hpp>
# include <boost/mpl/for_each.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/utility.hpp>
# include <algorithm>
# include <functional>
@@ -40,9 +41,6 @@
# include <config.h>
# endif
-
-using namespace boost::multi_index::detail; // for scope_guard
-
/**
* @file openvrml/script.h
*
@@ -415,7 +413,10 @@
const dl::handle handle = dl::open(filename);
if (!handle) { return 0; } // Ignore things we can't open.
- scope_guard handle_guard = make_guard(dl::close, handle);
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT((&succeeded)(handle)) {
+ if (!succeeded) { dl::close(handle); }
+ } BOOST_SCOPE_EXIT_END
//
// Make sure the module has what we're looking for.
@@ -423,9 +424,8 @@
const void * sym = dl::sym(handle, "openvrml_script_LTX_register_factory");
if (!sym) { return 0; } // handle_guard will close the module.
- const bool succeeded = registry.module_handles_.insert(handle).second;
+ succeeded = registry.module_handles_.insert(handle).second;
assert(succeeded);
- handle_guard.dismiss();
return 0;
}
@@ -1938,8 +1938,10 @@
// nodes.
//
this->add_ref();
- scope_guard guard = make_obj_guard(*this, &script_node::remove_ref);
- boost::ignore_unused_variable_warning(guard);
+ script_node & self = *this;
+ BOOST_SCOPE_EXIT((&self)) {
+ self.remove_ref();
+ } BOOST_SCOPE_EXIT_END
for (node_interface_set::const_iterator interface_ = interfaces.begin();
interface_ != interfaces.end();
Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2009, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -21,12 +21,10 @@
# include "dl.h"
# include <boost/filesystem.hpp>
# include <boost/ref.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/tokenizer.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
# include <sstream>
-using namespace boost::multi_index::detail; // for scope_guard
-
int openvrml::local::dl::init()
{
# ifdef _WIN32
@@ -130,7 +128,9 @@
# ifdef _WIN32
const DWORD err = GetLastError();
char * buf = 0;
- scope_guard buf_guard = make_guard(LocalFree, boost::ref(buf));
+ BOOST_SCOPE_EXIT((buf)) {
+ LocalFree(buf);
+ } BOOST_SCOPE_EXIT_END
static const LPCVOID source = 0;
static const DWORD buf_size = 0;
static va_list * const args = 0;
Modified: trunk/src/mozilla-plugin/openvrml.cpp
===================================================================
--- trunk/src/mozilla-plugin/openvrml.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/mozilla-plugin/openvrml.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML Mozilla plug-in
//
-// Copyright 2004, 2005, 2006, 2007, 2008 Braden McDaniel
+// Copyright 2004, 2005, 2006, 2007, 2008, 2010 Braden McDaniel
//
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the Free
@@ -25,9 +25,8 @@
# include <vector>
# include <sys/socket.h>
# include <sys/wait.h>
-# include <boost/concept_check.hpp>
# include <boost/lexical_cast.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/noncopyable.hpp>
# include <boost/ref.hpp>
# include <boost/scoped_ptr.hpp>
@@ -75,8 +74,6 @@
# include "browser-factory-client-glue.h"
# include "browser-client-glue.h"
-using namespace boost::multi_index::detail; // for scope_guard
-
namespace {
void printerr(const char * str);
@@ -169,7 +166,9 @@
G_TYPE_NONE, 0);
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
klass->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
if (!klass->connection) {
g_critical("Failed to open connection to bus: %s", error->message);
@@ -184,8 +183,9 @@
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
- scope_guard driver_proxy_guard = make_guard(g_object_unref, driver_proxy);
- boost::ignore_unused_variable_warning(driver_proxy_guard);
+ BOOST_SCOPE_EXIT((driver_proxy)) {
+ g_object_unref(driver_proxy);
+ } BOOST_SCOPE_EXIT_END
guint request_ret;
if (!org_freedesktop_DBus_request_name(driver_proxy,
@@ -200,7 +200,6 @@
dbus_g_object_type_install_info(
OPENVRML_NP_TYPE_BROWSER_HOST,
&dbus_glib_openvrml_np_browser_host_object_info);
- error_guard.dismiss();
}
int openvrml_np_browser_host_get_url(OpenvrmlNpBrowserHost * const host,
@@ -598,12 +597,10 @@
return pluginInstance.write(stream, len, buffer);
}
-void NPP_StreamAsFile(const NPP instance,
+void NPP_StreamAsFile(NPP,
NPStream *,
const char * /* fname */)
{
- boost::ignore_unused_variable_warning(instance);
- assert(instance);
}
void NPP_Print(const NPP instance, NPPrint * const printInfo)
@@ -1104,9 +1101,9 @@
"/org/openvrml/BrowserFactory",
"org.openvrml.BrowserFactory");
g_return_val_if_fail(browser_factory, 0);
- scope_guard browser_factory_guard =
- make_guard(g_object_unref, G_OBJECT(browser_factory));
- boost::ignore_unused_variable_warning(browser_factory_guard);
+ BOOST_SCOPE_EXIT((browser_factory)) {
+ g_object_unref(browser_factory);
+ } BOOST_SCOPE_EXIT_END
char * browser_path = 0;
if (!org_openvrml_BrowserFactory_create_control(browser_factory,
@@ -1149,7 +1146,9 @@
OPENVRML_NP_BROWSER_HOST_GET_CLASS(this->browser_host);
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
this->browser = get_browser(browser_host_class->connection,
browser_host_class->host_name,
@@ -1160,8 +1159,6 @@
g_critical("Browser creation failed: %s", error->message);
return;
}
-
- error_guard.dismiss();
}
NPError plugin_instance::new_stream(const NPMIMEType type,
@@ -1170,7 +1167,9 @@
if (!this->browser) { return NPERR_INVALID_INSTANCE_ERROR; }
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
gboolean result = org_openvrml_Browser_new_stream(this->browser,
guint64(stream),
type,
@@ -1181,7 +1180,6 @@
error->message);
return NPERR_GENERIC_ERROR;
}
- error_guard.dismiss();
return NPERR_NO_ERROR;
}
Modified: trunk/src/node/vrml97/grouping_node_base.h
===================================================================
--- trunk/src/node/vrml97/grouping_node_base.h 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/node/vrml97/grouping_node_base.h 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 Braden McDaniel
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -23,7 +23,7 @@
# include <openvrml/node_impl_util.h>
# include <openvrml/viewer.h>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
namespace openvrml_node_vrml97 {
@@ -167,12 +167,11 @@
OPENVRML_THROW1(std::bad_alloc)
{
using namespace openvrml;
- using namespace boost::multi_index::detail; // for scope_guard
Derived & group = dynamic_cast<Derived &>(this->node());
- typedef std::vector<boost::intrusive_ptr<openvrml::node> > children_t;
- children_t children = group.children_.mfnode::value();
+ typedef std::vector<boost::intrusive_ptr<node> > children_t;
+ children_t children = group.children_.value();
for (children_t::const_iterator n = value.value().begin();
n != value.value().end();
@@ -190,19 +189,21 @@
// Throws std::bad_alloc.
//
children.push_back(*n);
- scope_guard guard =
- make_obj_guard(children, &children_t::pop_back);
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT_TPL((&succeeded)(&children)) {
+ if (!succeeded) { children.pop_back(); }
+ } BOOST_SCOPE_EXIT_END
child_node * const child =
node_cast<child_node *>(n->get());
if (child) {
child->relocate(); // Throws std::bad_alloc.
}
- guard.dismiss();
+ succeeded = true;
}
}
}
- group.children_.mfnode::value(children);
+ group.children_.value(children);
group.node::modified(true);
group.bounding_volume_dirty(true);
@@ -353,7 +354,6 @@
OPENVRML_THROW1(std::bad_alloc)
{
using namespace openvrml;
- using namespace boost::multi_index::detail; // for scope_guard
typedef std::vector<boost::intrusive_ptr<openvrml::node> > children_t;
children_t children;
@@ -367,12 +367,14 @@
// least.
//
children.push_back(*n); // Throws std::bad_alloc.
- scope_guard guard =
- make_obj_guard(children, &children_t::pop_back);
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT_TPL((&succeeded)(&children)) {
+ if (!succeeded) { children.pop_back(); }
+ } BOOST_SCOPE_EXIT_END
child_node * const child =
node_cast<child_node *>(n->get());
if (child) { child->relocate(); } // Throws std::bad_alloc.
- guard.dismiss();
+ succeeded = true;
}
this->children_.mfnode::value(children);
Modified: trunk/src/node/vrml97/image_stream_listener.cpp
===================================================================
--- trunk/src/node/vrml97/image_stream_listener.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/node/vrml97/image_stream_listener.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 Braden McDaniel
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -24,7 +24,7 @@
# include <sstream>
# include <boost/algorithm/string/predicate.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include "image_stream_listener.h"
openvrml_node_vrml97::image_stream_listener::image_reader::~image_reader()
@@ -204,14 +204,15 @@
stream_listener(stream_listener),
gray_palette(false)
{
- using namespace boost::multi_index::detail; // for scope_guard
this->png_ptr_ =
png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
if (!this->png_ptr_) { throw std::bad_alloc(); }
- scope_guard guard = make_guard(&png_destroy_read_struct,
- &this->png_ptr_,
- &this->info_ptr_,
- png_infopp(0));
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT((&succeeded)(&png_ptr_)(&info_ptr_)) {
+ if (!succeeded) {
+ png_destroy_read_struct(&png_ptr_, &info_ptr_, png_infopp(0));
+ }
+ } BOOST_SCOPE_EXIT_END
this->info_ptr_ = png_create_info_struct(this->png_ptr_);
if (!this->info_ptr_) { throw std::bad_alloc(); }
@@ -221,7 +222,7 @@
openvrml_png_info_callback,
openvrml_png_row_callback,
openvrml_png_end_callback);
- guard.dismiss();
+ succeeded = true;
}
openvrml_node_vrml97::image_stream_listener::png_reader::~png_reader()
Modified: trunk/src/node/vrml97/text.cpp
===================================================================
--- trunk/src/node/vrml97/text.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/node/vrml97/text.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -3,7 +3,8 @@
// OpenVRML
//
// Copyright 1998 Chris Morley
-// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Braden McDaniel
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+// Braden McDaniel
// Copyright 2002 S. K. Bose
//
// This library is free software; you can redistribute it and/or modify it
@@ -43,7 +44,7 @@
# endif
# endif
# include <boost/array.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# ifdef HAVE_CONFIG_H
# include <config.h>
@@ -1467,8 +1468,6 @@
{
using std::vector;
# ifdef _WIN32
- using namespace boost::multi_index::detail; // for scope_guard
-
LOGFONT lf;
lf.lfHeight = 0;
lf.lfWidth = 0;
@@ -1485,7 +1484,9 @@
lf.lfPitchAndFamily = VARIABLE_PITCH | FF_ROMAN;
HDC hdc = CreateCompatibleDC(0);
- scope_guard hdc_guard = make_guard(&DeleteDC, hdc);
+ BOOST_SCOPE_EXIT((hdc)) {
+ DeleteDC(hdc);
+ } BOOST_SCOPE_EXIT_END
HFONT hfont = CreateFontIndirect(&lf);
SelectObject(hdc, hfont);
TCHAR faceName[256] = {};
@@ -1513,7 +1514,9 @@
KEY_READ,
&fontsKey);
if (result != ERROR_SUCCESS) { /* bail */ }
- scope_guard fontsKey_guard = make_guard(&RegCloseKey, fontsKey);
+ BOOST_SCOPE_EXIT((fontsKey)) {
+ RegCloseKey(fontsKey);
+ } BOOST_SCOPE_EXIT_END
DWORD maxValueNameLen, maxValueLen;
result = RegQueryInfoKey(fontsKey,
@@ -1578,7 +1581,6 @@
face_index = 0;
# else
using std::string;
- using namespace boost::multi_index::detail; // for scope_guard
string fontName;
//
@@ -1621,9 +1623,9 @@
FcNameParse(unsigned_char_string(fontName.begin(),
fontName.end()).c_str());
if (!initialPattern) { throw std::bad_alloc(); }
- scope_guard initialPattern_guard =
- make_guard(&FcPatternDestroy, initialPattern);
- boost::ignore_unused_variable_warning(initialPattern_guard);
+ BOOST_SCOPE_EXIT((initialPattern)) {
+ FcPatternDestroy(initialPattern);
+ } BOOST_SCOPE_EXIT_END
//
// Set the language.
@@ -1642,9 +1644,9 @@
FcFontMatch(0, initialPattern, &result);
if (result != FcResultMatch) { throw FontconfigError(result); }
assert(matchedPattern);
- scope_guard matchedPattern_guard =
- make_guard(&FcPatternDestroy, matchedPattern);
- boost::ignore_unused_variable_warning(matchedPattern_guard);
+ BOOST_SCOPE_EXIT((matchedPattern)) {
+ FcPatternDestroy(matchedPattern);
+ } BOOST_SCOPE_EXIT_END
FcChar8 * filename_c_str = 0;
result = FcPatternGetString(matchedPattern,
Modified: trunk/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- trunk/src/openvrml-player/curlbrowserhost.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/openvrml-player/curlbrowserhost.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -1,7 +1,7 @@
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
//
// OpenVRML Player
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2010 Braden McDaniel
//
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the Free
@@ -25,15 +25,12 @@
# include <browser-client-glue.h>
# include <dbus/dbus-glib-bindings.h>
# include <dbus/dbus-protocol.h>
-# include <boost/concept_check.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/ref.hpp>
# include <list>
# include <vector>
# include <string.h>
-using namespace boost::multi_index::detail; // for scope_guard
-
# define OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR \
openvrml_player_curl_browser_host_error_quark()
@@ -153,7 +150,9 @@
G_TYPE_NONE, 0);
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
klass->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
if (!klass->connection) {
g_critical("Failed to open connection to bus: %s", error->message);
@@ -168,8 +167,9 @@
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
- scope_guard driver_proxy_guard = make_guard(g_object_unref, driver_proxy);
- boost::ignore_unused_variable_warning(driver_proxy_guard);
+ BOOST_SCOPE_EXIT((driver_proxy)) {
+ g_object_unref(G_OBJECT(driver_proxy));
+ } BOOST_SCOPE_EXIT_END
guint request_ret;
if (!org_freedesktop_DBus_request_name(driver_proxy,
@@ -196,7 +196,6 @@
dbus_g_object_type_install_info(
OPENVRML_PLAYER_TYPE_CURL_BROWSER_HOST,
&dbus_glib_openvrml_player_curl_browser_host_object_info);
- error_guard.dismiss();
}
void openvrml_player_curl_browser_host_get_property(GObject * const obj,
@@ -258,7 +257,9 @@
OPENVRML_PLAYER_CURL_BROWSER_HOST_CLASS(klass);
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
g_assert(browser_host->priv->path);
browser_host->priv->browser = get_browser(browser_host_class->connection,
@@ -283,14 +284,24 @@
browser_host->priv->multi_handle = curl_multi_init();
g_return_if_fail(browser_host->priv->multi_handle);
- scope_guard multi_handle_guard =
- make_guard(curl_multi_cleanup, browser_host->priv->multi_handle);
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT((&succeeded)(&browser_host)) {
+ if (!succeeded) {
+ curl_multi_cleanup(browser_host->priv->multi_handle);
+ }
+ } BOOST_SCOPE_EXIT_END
try {
+ bool succeeded = false;
+
browser_host->priv->curl_source =
curl_source_new(browser_host->priv->multi_handle);
- scope_guard curl_source_guard =
- make_guard(g_source_unref, browser_host->priv->curl_source);
+ BOOST_SCOPE_EXIT((&succeeded)(&browser_host)) {
+ if (!succeeded && browser_host->priv->curl_source) {
+ g_source_unref(browser_host->priv->curl_source);
+ browser_host->priv->curl_source = 0;
+ }
+ } BOOST_SCOPE_EXIT_END
g_source_set_callback(
browser_host->priv->curl_source,
@@ -298,8 +309,9 @@
browser_host,
0);
guint source_id = g_source_attach(browser_host->priv->curl_source, 0);
- scope_guard source_attach_guard =
- make_guard(g_source_remove, source_id);
+ BOOST_SCOPE_EXIT((&succeeded)(source_id)) {
+ if (!succeeded && source_id != 0) { g_source_remove(source_id); }
+ } BOOST_SCOPE_EXIT_END
browser_host->priv->stream_data =
g_hash_table_new_full(
@@ -309,14 +321,12 @@
openvrml_player_curl_browser_host_delete_curl_stream_data);
g_return_if_fail(browser_host->priv->stream_data);
- source_attach_guard.dismiss();
- curl_source_guard.dismiss();
+ succeeded = true;
} catch (std::bad_alloc & ex) {
g_critical("%s", ex.what());
}
- multi_handle_guard.dismiss();
- error_guard.dismiss();
+ succeeded = true;
}
void openvrml_player_curl_browser_host_unrealize(GtkWidget * const widget)
@@ -459,14 +469,20 @@
{
CURL * const handle = curl_easy_init();
try {
- curl_stream_data * const stream_data =
- new curl_stream_data(handle, url, host->priv->browser);
- scope_guard stream_data_guard =
- make_guard(
- openvrml_player_curl_browser_host_delete_curl_stream_data,
- stream_data);
- g_hash_table_insert(host->priv->stream_data, handle, stream_data);
- stream_data_guard.dismiss();
+ curl_stream_data * stream_data = 0;
+ {
+ bool succeeded = false;
+ stream_data =
+ new curl_stream_data(handle, url, host->priv->browser);
+ BOOST_SCOPE_EXIT((&succeeded)(stream_data)) {
+ if (!succeeded) {
+ openvrml_player_curl_browser_host_delete_curl_stream_data(
+ stream_data);
+ }
+ } BOOST_SCOPE_EXIT_END
+ g_hash_table_insert(host->priv->stream_data, handle, stream_data);
+ succeeded = true;
+ }
CURLcode setopt_result;
setopt_result = curl_easy_setopt(handle,
@@ -860,35 +876,38 @@
CURL_BROWSER_HOST_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, 0);
GError * error = 0;
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
+
GFile * file = 0;
- scope_guard file_guard = make_guard(g_object_unref, ref(file));
GFileInfo * info = 0;
- scope_guard info_guard = make_guard(g_object_unref, ref(info));
- if (!type) {
- file = g_file_new_for_uri(stream_data.url());
- static GCancellable * const cancellable = 0;
- info = g_file_query_info(file,
- G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
- G_FILE_QUERY_INFO_NONE,
- cancellable,
- &error);
- if (error) {
- g_warning(error->message);
- g_error_free(error);
- error = 0;
+ BOOST_SCOPE_EXIT((&type)(&file)(&info)) {
+ if (type) {
+ if (file) { g_object_unref(file); }
+ if (info) { g_object_unref(info); }
}
- if (info) {
- type =
- g_file_info_get_attribute_string(
- info,
- G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
- }
- } else {
- info_guard.dismiss();
- file_guard.dismiss();
+ } BOOST_SCOPE_EXIT_END
+
+ file = g_file_new_for_uri(stream_data.url());
+ static GCancellable * const cancellable = 0;
+ info = g_file_query_info(file,
+ G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+ G_FILE_QUERY_INFO_NONE,
+ cancellable,
+ &error);
+ if (error) {
+ g_warning(error->message);
+ g_error_free(error);
+ error = 0;
}
+ if (info) {
+ type =
+ g_file_info_get_attribute_string(
+ info,
+ G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
+ }
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
gboolean new_stream_result =
org_openvrml_Browser_new_stream(
stream_data.browser(),
@@ -903,8 +922,6 @@
}
stream_data.initialize();
-
- error_guard.dismiss();
}
//
@@ -950,9 +967,9 @@
"/org/openvrml/BrowserFactory",
"org.openvrml.BrowserFactory");
g_return_val_if_fail(browser_factory, 0);
- scope_guard browser_factory_guard =
- make_guard(g_object_unref, G_OBJECT(browser_factory));
- boost::ignore_unused_variable_warning(browser_factory_guard);
+ BOOST_SCOPE_EXIT((browser_factory)) {
+ g_object_unref(G_OBJECT(browser_factory));
+ } BOOST_SCOPE_EXIT_END
char * browser_path = 0;
if (!org_openvrml_BrowserFactory_create_control(
Modified: trunk/src/openvrml-player/filechooserdialog.cpp
===================================================================
--- trunk/src/openvrml-player/filechooserdialog.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/openvrml-player/filechooserdialog.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -1,6 +1,6 @@
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
//
-// Copyright 2007 Braden McDaniel
+// Copyright 2007, 2010 Braden McDaniel
//
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the Free
@@ -17,12 +17,8 @@
//
# include <gtk/gtk.h>
-# include <boost/concept_check.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
# include "filechooserdialog.h"
-using namespace boost::multi_index::detail; // for scope_guard
-
G_DEFINE_TYPE(OpenvrmlPlayerFileChooserDialog,
openvrml_player_file_chooser_dialog,
GTK_TYPE_FILE_CHOOSER_DIALOG)
@@ -67,26 +63,19 @@
GtkFileFilter * const world_filter = gtk_file_filter_new();
g_return_val_if_fail(world_filter, 0);
- scope_guard world_filter_guard = make_guard(g_object_unref,
- world_filter);
- boost::ignore_unused_variable_warning(world_filter_guard);
gtk_file_filter_set_name(world_filter, "VRML/X3D worlds");
gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml");
gtk_file_filter_add_mime_type(world_filter, "model/vrml");
gtk_file_filter_add_mime_type(world_filter, "model/x3d-vrml");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(obj), world_filter);
- world_filter_guard.dismiss();
GtkFileFilter * const all_filter = gtk_file_filter_new();
g_return_val_if_fail(all_filter, 0);
- scope_guard all_filter_guard = make_guard(g_object_unref, all_filter);
- boost::ignore_unused_variable_warning(all_filter_guard);
gtk_file_filter_set_name(all_filter, "All files");
gtk_file_filter_add_pattern(all_filter, "*");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(obj), all_filter);
- all_filter_guard.dismiss();
return obj;
}
Modified: trunk/src/openvrml-player/player.cpp
===================================================================
--- trunk/src/openvrml-player/player.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/openvrml-player/player.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -1,6 +1,6 @@
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
//
-// Copyright 2006, 2007, 2008 Braden McDaniel
+// Copyright 2006, 2007, 2008, 2010 Braden McDaniel
//
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the Free
@@ -19,9 +19,8 @@
# include <curl/curl.h>
# include <string>
# include <vector>
-# include <boost/concept_check.hpp>
# include <boost/lexical_cast.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/ref.hpp>
# include <dbus/dbus-glib.h>
# include <libgnomeui/libgnomeui.h>
@@ -35,8 +34,6 @@
# include <config.h>
# endif
-using namespace boost::multi_index::detail; // for scope_guard
-
extern "C" {
//
// GTK+ signal handlers; GtkBuilder needs them to have external linkage in
@@ -87,8 +84,9 @@
g_critical("libcurl initialization failed");
return EXIT_FAILURE;
}
- scope_guard curl_global_guard = make_guard(curl_global_cleanup);
- boost::ignore_unused_variable_warning(curl_global_guard);
+ BOOST_SCOPE_EXIT() {
+ curl_global_cleanup();
+ } BOOST_SCOPE_EXIT_END
gchar ** remaining_args = 0;
GOptionEntry option_entries[] = {
@@ -123,7 +121,9 @@
GNOME_PARAM_NONE);
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
GtkBuilder * const builder = builder_new(*program, &error);
if (!builder) {
g_critical("Failed to create UI builder: %s", error->message);
@@ -167,8 +167,6 @@
gtk_widget_show_all(app_window);
gtk_main();
-
- error_guard.dismiss();
}
namespace {
@@ -251,8 +249,9 @@
gchar * uri =
gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(data->file_chooser));
g_return_if_fail(uri);
- scope_guard uri_guard = make_guard(g_free, uri);
- boost::ignore_unused_variable_warning(uri_guard);
+ BOOST_SCOPE_EXIT((uri)) {
+ g_free(uri);
+ } BOOST_SCOPE_EXIT_END
openvrml_player_curl_browser_host_load_url(data->browser_host, uri);
}
@@ -277,8 +276,9 @@
gchar * uri = 0;
uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
g_return_if_fail(uri);
- scope_guard uri_guard = make_guard(g_free, uri);
- boost::ignore_unused_variable_warning(uri_guard);
+ BOOST_SCOPE_EXIT((uri)) {
+ g_free(uri);
+ } BOOST_SCOPE_EXIT_END
gtk_entry_set_text(location_entry, uri);
}
}
Modified: trunk/src/openvrml-xembed/browser.cpp
===================================================================
--- trunk/src/openvrml-xembed/browser.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/openvrml-xembed/browser.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML XEmbed Control
//
-// Copyright 2004, 2005, 2006, 2007, 2008 Braden N. McDaniel
+// Copyright 2004, 2005, 2006, 2007, 2008, 2010 Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the Free
@@ -18,7 +18,7 @@
// with this library; if not, see <http://www.gnu.org/licenses/>.
//
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
// Must include before X11 headers.
# include <boost/numeric/conversion/converter.hpp>
# include <X11/keysym.h>
@@ -33,8 +33,6 @@
# include <gtk/gtkdrawingarea.h>
# include <dbus/dbus.h>
-using namespace boost::multi_index::detail; // for scope_guard
-
GQuark openvrml_xembed_error_quark()
{
return g_quark_from_static_string("openvrml-xembed-error-quark");
@@ -321,6 +319,7 @@
const gchar * const host_name,
const GdkNativeWindow socket_id)
{
+ bool succeeded = false;
OpenvrmlXembedBrowser * const browser =
OPENVRML_XEMBED_BROWSER(
g_object_new(OPENVRML_XEMBED_TYPE_BROWSER,
@@ -329,21 +328,22 @@
"expect-initial-stream", expect_initial_stream,
static_cast<void *>(0)));
if (!browser) { return 0; }
- scope_guard browser_guard = make_guard(g_object_unref, browser);
+ BOOST_SCOPE_EXIT((&succeeded)(browser)) {
+ if (!succeeded) { g_object_unref(browser); }
+ } BOOST_SCOPE_EXIT_END
GSource * const browser_ready_source =
openvrml_xembed_browser_ready_source_new(browser, socket_id);
if (!browser_ready_source) { return 0; }
- scope_guard browser_ready_source_guard =
- make_guard(g_object_unref, browser_ready_source);
+ BOOST_SCOPE_EXIT((&succeeded)(browser_ready_source)) {
+ if (!succeeded) { g_object_unref(browser_ready_source); }
+ } BOOST_SCOPE_EXIT_END
gdk_threads_enter();
g_source_attach(browser_ready_source, gtk_thread_context);
gdk_threads_leave();
- browser_ready_source_guard.dismiss();
- browser_guard.dismiss();
-
+ succeeded = true;
return browser;
}
@@ -733,8 +733,9 @@
NULL);
g_assert(browser);
- scope_guard browser_guard = make_guard(g_object_unref, browser);
- boost::ignore_unused_variable_warning(browser_guard);
+ BOOST_SCOPE_EXIT((browser)) {
+ g_object_unref(browser);
+ } BOOST_SCOPE_EXIT_END
browser_plug->priv->drawing_area =
GTK_DRAWING_AREA(g_object_new(GTK_TYPE_DRAWING_AREA, 0));
@@ -1260,12 +1261,6 @@
namespace {
- void cleanup_private_connection(DBusConnection * const connection)
- {
- dbus_connection_close(connection);
- dbus_connection_unref(connection);
- }
-
int browser_host_proxy::do_get_url(const std::string & url)
{
//
@@ -1275,7 +1270,9 @@
//
DBusError error;
dbus_error_init(&error);
- scope_guard error_guard = make_guard(dbus_error_free, &error);
+ BOOST_SCOPE_EXIT((&error)) {
+ dbus_error_free(&error);
+ } BOOST_SCOPE_EXIT_END
DBusConnection * const connection =
dbus_bus_get_private(DBUS_BUS_SESSION, &error);
if (!connection) {
@@ -1283,8 +1280,10 @@
error.message);
return -1;
}
- scope_guard connection_guard =
- make_guard(cleanup_private_connection, connection);
+ BOOST_SCOPE_EXIT((connection)) {
+ dbus_connection_close(connection);
+ dbus_connection_unref(connection);
+ } BOOST_SCOPE_EXIT_END
DBusMessage * const get_url_call =
dbus_message_new_method_call(
@@ -1292,8 +1291,9 @@
dbus_g_proxy_get_path(this->browser_.priv->control_host),
dbus_g_proxy_get_interface(this->browser_.priv->control_host),
"GetUrl");
- scope_guard get_url_call_guard =
- make_guard(dbus_message_unref, get_url_call);
+ BOOST_SCOPE_EXIT((get_url_call)) {
+ dbus_message_unref(get_url_call);
+ } BOOST_SCOPE_EXIT_END
const char * const url_c_str = url.c_str();
bool succeeded =
@@ -1314,8 +1314,9 @@
g_warning("error fetching resource: %s", error.message);
return -1;
}
- scope_guard get_url_response_guard =
- make_guard(dbus_message_unref, get_url_response);
+ BOOST_SCOPE_EXIT((get_url_response)) {
+ dbus_message_unref(get_url_response);
+ } BOOST_SCOPE_EXIT_END
gint get_url_result = -1;
succeeded =
Modified: trunk/src/openvrml-xembed/browserfactory.cpp
===================================================================
--- trunk/src/openvrml-xembed/browserfactory.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/openvrml-xembed/browserfactory.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -2,7 +2,7 @@
//
// OpenVRML XEmbed Control
//
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2010 Braden McDaniel
//
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the Free
@@ -18,15 +18,15 @@
// with this library; if not, see <http://www.gnu.org/licenses/>.
//
-# include <boost/concept_check.hpp>
# include <boost/intrusive_ptr.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/ref.hpp>
# include <gtk/gtk.h>
# include <dbus/dbus-glib-bindings.h>
# include <dbus/dbus-glib-lowlevel.h>
# include <map>
# include <memory>
+# include <string>
# include <cstring>
# include <cstdlib>
@@ -34,8 +34,6 @@
# include "browser-factory-server-glue.h"
# include "browser.h"
-using namespace boost::multi_index::detail; // for scope_guard
-
G_DEFINE_TYPE(OpenvrmlXembedBrowserFactory,
openvrml_xembed_browser_factory,
G_TYPE_OBJECT)
@@ -119,12 +117,14 @@
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
- scope_guard driver_proxy_guard =
- make_guard(g_object_unref, driver_proxy);
- boost::ignore_unused_variable_warning(driver_proxy_guard);
+ BOOST_SCOPE_EXIT((driver_proxy)) {
+ g_object_unref(driver_proxy);
+ } BOOST_SCOPE_EXIT_END
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
guint request_ret;
if (!org_freedesktop_DBus_request_name(
driver_proxy,
@@ -135,7 +135,6 @@
"failed: %s", error->message);
return 0;
}
- error_guard.dismiss();
} catch (std::bad_alloc &) {
return 0;
}
@@ -292,7 +291,9 @@
DBusGMethodInvocation * const context)
{
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
DBusGProxy * host =
dbus_g_proxy_new_for_name_owner(
@@ -330,8 +331,9 @@
G_OBJECT(browser));
char * const sender = dbus_g_method_get_sender(context);
- scope_guard sender_guard = make_guard(g_free, sender);
- boost::ignore_unused_variable_warning(sender_guard);
+ BOOST_SCOPE_EXIT((sender)) {
+ g_free(sender);
+ } BOOST_SCOPE_EXIT_END
bool succeeded;
try {
using std::make_pair;
@@ -373,8 +375,6 @@
dbus_g_method_return(context, control_obj_path);
- error_guard.dismiss();
-
return true;
}
Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/openvrml-xembed/main.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -25,10 +25,9 @@
# include <gtk/gtk.h>
# include <dbus/dbus-glib-bindings.h>
# include <dbus/dbus-glib-lowlevel.h>
-# include <boost/concept_check.hpp>
# include <boost/function.hpp>
# include <boost/lexical_cast.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/ref.hpp>
# include <boost/scoped_ptr.hpp>
# include <boost/thread.hpp>
@@ -40,8 +39,6 @@
# include "config.h"
# endif
-using namespace boost::multi_index::detail; // for scope_guard
-
extern "C"
G_GNUC_INTERNAL
gboolean
@@ -87,8 +84,9 @@
void operator()() const
{
GError * error = 0;
- scope_guard error_guard =
- make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
DBusGConnection * const connection =
bus_get(g_main_loop_get_context(&this->dbus_thread_main_),
@@ -98,9 +96,9 @@
g_critical("Failed to get session bus: %s", error->message);
return;
}
- scope_guard connection_guard =
- make_guard(dbus_g_connection_unref, connection);
- boost::ignore_unused_variable_warning(connection_guard);
+ BOOST_SCOPE_EXIT((connection)) {
+ dbus_g_connection_unref(connection);
+ } BOOST_SCOPE_EXIT_END
OpenvrmlXembedBrowserFactory * const browser_factory =
OPENVRML_XEMBED_BROWSER_FACTORY(
@@ -109,18 +107,18 @@
"connection", connection,
"main-thread-context", &this->main_thread_context_,
static_cast<void *>(0)));
- scope_guard browser_factory_guard =
- make_guard(g_object_unref, browser_factory);
- boost::ignore_unused_variable_warning(browser_factory_guard);
+ BOOST_SCOPE_EXIT((browser_factory)) {
+ g_object_unref(browser_factory);
+ } BOOST_SCOPE_EXIT_END
DBusGProxy * driver_proxy =
dbus_g_proxy_new_for_name(connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
- scope_guard driver_proxy_guard =
- make_guard(g_object_unref, driver_proxy);
- boost::ignore_unused_variable_warning(driver_proxy_guard);
+ BOOST_SCOPE_EXIT((driver_proxy)) {
+ g_object_unref(driver_proxy);
+ } BOOST_SCOPE_EXIT_END
dbus_g_proxy_add_signal(driver_proxy,
"NameOwnerChanged",
@@ -139,8 +137,6 @@
0);
g_main_loop_run(&this->dbus_thread_main_);
-
- error_guard.dismiss();
}
private:
@@ -179,7 +175,9 @@
};
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
GOptionContext * const context =
g_option_context_new("- render VRML/X3D worlds");
@@ -194,7 +192,6 @@
if (version) {
cout << application_name << ' ' << PACKAGE_VERSION << endl;
- error_guard.dismiss();
return EXIT_SUCCESS;
}
@@ -206,13 +203,13 @@
using boost::thread;
GMainContext * dbus_thread_context = g_main_context_new();
- scope_guard dbus_thread_context_guard =
- make_guard(g_main_context_unref, dbus_thread_context);
- boost::ignore_unused_variable_warning(dbus_thread_context_guard);
+ BOOST_SCOPE_EXIT((dbus_thread_context)) {
+ g_main_context_unref(dbus_thread_context);
+ } BOOST_SCOPE_EXIT_END
GMainLoop * dbus_thread_main = g_main_loop_new(dbus_thread_context, false);
- scope_guard dbus_thread_main_guard =
- make_guard(g_main_loop_unref, dbus_thread_main);
- boost::ignore_unused_variable_warning(dbus_thread_main_guard);
+ BOOST_SCOPE_EXIT((dbus_thread_main)) {
+ g_main_loop_unref(dbus_thread_main);
+ } BOOST_SCOPE_EXIT_END
function<void ()> dbus_thread_func = dbus_thread_loop(*main_context,
*dbus_thread_main);
@@ -227,8 +224,6 @@
// quit in openvrml_xembed_name_owner_changed.
//
dbus_thread->join();
-
- error_guard.dismiss();
}
//
Modified: trunk/src/script/java.cpp
===================================================================
--- trunk/src/script/java.cpp 2010-02-14 04:51:31 UTC (rev 4106)
+++ trunk/src/script/java.cpp 2010-02-14 06:28:17 UTC (rev 4107)
@@ -5,7 +5,7 @@
// Copyright 1998 Chris Morley
// Copyright 2001 Henri Manson
// Copyright 2002 Thomas Flynn
-// Copyright 2007, 2008 Braden McDaniel
+// Copyright 2007, 2008, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU...
[truncated message content] |
|
From: <br...@us...> - 2010-02-15 21:42:36
|
Revision: 4108
http://openvrml.svn.sourceforge.net/openvrml/?rev=4108&view=rev
Author: braden
Date: 2010-02-15 21:42:29 +0000 (Mon, 15 Feb 2010)
Log Message:
-----------
Update AX_CHECK_GL and AX_CHECK_GLU to the 2010-01-25 release.
Modified Paths:
--------------
trunk/ChangeLog
trunk/m4/ax_check_gl.m4
trunk/m4/ax_check_glu.m4
Added Paths:
-----------
trunk/m4/ax_pthread.m4
Removed Paths:
-------------
trunk/m4/acx_pthread.m4
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-14 06:28:17 UTC (rev 4107)
+++ trunk/ChangeLog 2010-02-15 21:42:29 UTC (rev 4108)
@@ -1,3 +1,15 @@
+2010-02-15 Braden McDaniel <br...@en...>
+
+ Update AX_CHECK_GL and AX_CHECK_GLU to the 2010-01-25 release.
+
+ This addresses a problem with correctly detecting and using the
+ Apple OpenGL framework.
+
+ * m4/acx_pthread.m4: Removed; replaced by ax_pthread.m4.
+ * m4/ax_check_gl.m4
+ * m4/ax_check_glu.m4
+ * m4/ax_pthread.m4: Added.
+
2010-02-14 Braden McDaniel <br...@en...>
Use Boost.ScopeExit instead of ScopeGuard.
Deleted: trunk/m4/acx_pthread.m4
===================================================================
--- trunk/m4/acx_pthread.m4 2010-02-14 06:28:17 UTC (rev 4107)
+++ trunk/m4/acx_pthread.m4 2010-02-15 21:42:29 UTC (rev 4108)
@@ -1,275 +0,0 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/acx_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-# This macro figures out how to build C programs using POSIX threads. It
-# sets the PTHREAD_LIBS output variable to the threads library and linker
-# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-# flags that are needed. (The user can also force certain compiler
-# flags/libs to be tested by setting these environment variables.)
-#
-# Also sets PTHREAD_CC to any special C compiler that is needed for
-# multi-threaded programs (defaults to the value of CC otherwise). (This
-# is necessary on AIX to use the special cc_r compiler alias.)
-#
-# NOTE: You are assumed to not only compile your program with these flags,
-# but also link it with them as well. e.g. you should link with
-# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-# If you are only building threads programs, you may wish to use these
-# variables in your default LIBS, CFLAGS, and CC:
-#
-# LIBS="$PTHREAD_LIBS $LIBS"
-# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-# CC="$PTHREAD_CC"
-#
-# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-# ACTION-IF-FOUND is a list of shell commands to run if a threads library
-# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-# is not found. If ACTION-IF-FOUND is not specified, the default action
-# will define HAVE_PTHREAD.
-#
-# Please let the authors know if this macro fails on any platform, or if
-# you have any other suggestions or comments. This macro was based on work
-# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-# Alejandro Forero Cuervo to the autoconf macro repository. We are also
-# grateful for the helpful feedback of numerous users.
-#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
-# COPYLEFT
-#
-# Copyright (c) 2008 Steven G. Johnson <st...@al...>
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Macro Archive. When you make and
-# distribute a modified version of the Autoconf Macro, you may extend this
-# special exception to the GPL to apply to your modified version as well.
-
-AC_DEFUN([ACX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_SAVE
-AC_LANG_C
-acx_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- save_LIBS="$LIBS"
- LIBS="$PTHREAD_LIBS $LIBS"
- AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
- AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
- AC_MSG_RESULT($acx_pthread_ok)
- if test x"$acx_pthread_ok" = xno; then
- PTHREAD_LIBS=""
- PTHREAD_CFLAGS=""
- fi
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try. Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important. Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-# other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-# doesn't hurt to check since this sometimes defines pthreads too;
-# also defines -D_REENTRANT)
-# ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case "${host_cpu}-${host_os}" in
- *solaris*)
-
- # On Solaris (at least, for some versions), libc contains stubbed
- # (non-functional) versions of the pthreads routines, so link-based
- # tests will erroneously succeed. (We need to link with -pthreads/-mt/
- # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
- # a function called by this macro, so we could check for that, but
- # who knows whether they'll stub that too in a future libc.) So,
- # we'll just look for -pthreads and -lpthread first:
-
- acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
- ;;
-esac
-
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
-
- case $flag in
- none)
- AC_MSG_CHECKING([whether pthreads work without any flags])
- ;;
-
- -*)
- AC_MSG_CHECKING([whether pthreads work with $flag])
- PTHREAD_CFLAGS="$flag"
- ;;
-
- pthread-config)
- AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
- if test x"$acx_pthread_config" = xno; then continue; fi
- PTHREAD_CFLAGS="`pthread-config --cflags`"
- PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
- ;;
-
- *)
- AC_MSG_CHECKING([for the pthreads library -l$flag])
- PTHREAD_LIBS="-l$flag"
- ;;
- esac
-
- save_LIBS="$LIBS"
- save_CFLAGS="$CFLAGS"
- LIBS="$PTHREAD_LIBS $LIBS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
- # Check for various functions. We must include pthread.h,
- # since some functions may be macros. (On the Sequent, we
- # need a special flag -Kthread to make this header compile.)
- # We check for pthread_join because it is in -lpthread on IRIX
- # while pthread_create is in libc. We check for pthread_attr_init
- # due to DEC craziness with -lpthreads. We check for
- # pthread_cleanup_push because it is one of the few pthread
- # functions on Solaris that doesn't have a non-functional libc stub.
- # We try pthread_create on general principles.
- AC_TRY_LINK([#include <pthread.h>],
- [pthread_t th; pthread_join(th, 0);
- pthread_attr_init(0); pthread_cleanup_push(0, 0);
- pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
- [acx_pthread_ok=yes])
-
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-
- AC_MSG_RESULT($acx_pthread_ok)
- if test "x$acx_pthread_ok" = xyes; then
- break;
- fi
-
- PTHREAD_LIBS=""
- PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
- save_LIBS="$LIBS"
- LIBS="$PTHREAD_LIBS $LIBS"
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
- # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
- AC_MSG_CHECKING([for joinable pthread attribute])
- attr_name=unknown
- for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
- AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
- [attr_name=$attr; break])
- done
- AC_MSG_RESULT($attr_name)
- if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
- AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
- [Define to necessary symbol if this constant
- uses a non-standard name on your system.])
- fi
-
- AC_MSG_CHECKING([if more special flags are required for pthreads])
- flag=no
- case "${host_cpu}-${host_os}" in
- *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
- *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
- esac
- AC_MSG_RESULT(${flag})
- if test "x$flag" != xno; then
- PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
- fi
-
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-
- # More AIX lossage: must compile with xlc_r or cc_r
- if test x"$GCC" != xyes; then
- AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
- else
- PTHREAD_CC=$CC
- fi
-else
- PTHREAD_CC="$CC"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_CC)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
- ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
- :
-else
- acx_pthread_ok=no
- $2
-fi
-AC_LANG_RESTORE
-])dnl ACX_PTHREAD
Modified: trunk/m4/ax_check_gl.m4
===================================================================
--- trunk/m4/ax_check_gl.m4 2010-02-14 06:28:17 UTC (rev 4107)
+++ trunk/m4/ax_check_gl.m4 2010-02-15 21:42:29 UTC (rev 4108)
@@ -11,7 +11,7 @@
# "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined. These preprocessor
# definitions may not be mutually exclusive.
#
-# version: 2.4
+# version: 2.5
# author: Braden McDaniel <br...@en...>
#
# This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PATH_X])dnl
AC_REQUIRE([AC_PROG_SED])dnl
-AC_REQUIRE([ACX_PTHREAD])dnl
+AC_REQUIRE([AX_PTHREAD])dnl
AC_LANG_PUSH([C])
AX_LANG_COMPILER_MS
@@ -55,13 +55,17 @@
AS_IF([test -n "$x_libraries"],
[GL_LIBS="-L$x_libraries -lX11 $GL_LIBS"]))
+AC_CHECK_HEADERS([windows.h])
+
ax_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
-AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h])
+AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], , , [
+# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
+# include <windows.h>
+# endif
+])
CPPFLAGS=$ax_save_CPPFLAGS
-AC_CHECK_HEADERS([windows.h])
-
m4_define([AX_CHECK_GL_PROGRAM],
[AC_LANG_PROGRAM([[
# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
Modified: trunk/m4/ax_check_glu.m4
===================================================================
--- trunk/m4/ax_check_glu.m4 2010-02-14 06:28:17 UTC (rev 4107)
+++ trunk/m4/ax_check_glu.m4 2010-02-15 21:42:29 UTC (rev 4108)
@@ -15,7 +15,7 @@
# rather than the standard "GLvoid (*)()". If the former condition is
# detected, this macro defines "HAVE_VARARGS_GLU_TESSCB".
#
-# version: 2.2
+# version: 2.3
# author: Braden McDaniel <br...@en...>
#
# This program is free software; you can redistribute it and/or modify
@@ -45,7 +45,11 @@
ax_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
-AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h])
+AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h], , , [
+# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
+# include <windows.h>
+# endif
+])
CPPFLAGS=$ax_save_CPPFLAGS
m4_define([AX_CHECK_GLU_PROGRAM],
Copied: trunk/m4/ax_pthread.m4 (from rev 4107, trunk/m4/acx_pthread.m4)
===================================================================
--- trunk/m4/ax_pthread.m4 (rev 0)
+++ trunk/m4/ax_pthread.m4 2010-02-15 21:42:29 UTC (rev 4108)
@@ -0,0 +1,277 @@
+# ===========================================================================
+# http://www.nongnu.org/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+# This macro figures out how to build C programs using POSIX threads. It
+# sets the PTHREAD_LIBS output variable to the threads library and linker
+# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+# flags that are needed. (The user can also force certain compiler
+# flags/libs to be tested by setting these environment variables.)
+#
+# Also sets PTHREAD_CC to any special C compiler that is needed for
+# multi-threaded programs (defaults to the value of CC otherwise). (This
+# is necessary on AIX to use the special cc_r compiler alias.)
+#
+# NOTE: You are assumed to not only compile your program with these flags,
+# but also link it with them as well. e.g. you should link with
+# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+# If you are only building threads programs, you may wish to use these
+# variables in your default LIBS, CFLAGS, and CC:
+#
+# LIBS="$PTHREAD_LIBS $LIBS"
+# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+# CC="$PTHREAD_CC"
+#
+# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+# ACTION-IF-FOUND is a list of shell commands to run if a threads library
+# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+# is not found. If ACTION-IF-FOUND is not specified, the default action
+# will define HAVE_PTHREAD.
+#
+# Please let the authors know if this macro fails on any platform, or if
+# you have any other suggestions or comments. This macro was based on work
+# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+# Alejandro Forero Cuervo to the autoconf macro repository. We are also
+# grateful for the helpful feedback of numerous users.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Steven G. Johnson <st...@al...>
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+ AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
+ AC_MSG_RESULT($ax_pthread_ok)
+ if test x"$ax_pthread_ok" = xno; then
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+ fi
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try. Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important. Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+# other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+# doesn't hurt to check since this sometimes defines pthreads too;
+# also defines -D_REENTRANT)
+# ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case "${host_cpu}-${host_os}" in
+ *solaris*)
+
+ # On Solaris (at least, for some versions), libc contains stubbed
+ # (non-functional) versions of the pthreads routines, so link-based
+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
+ # a function called by this macro, so we could check for that, but
+ # who knows whether they'll stub that too in a future libc.) So,
+ # we'll just look for -pthreads and -lpthread first:
+
+ ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+ ;;
+esac
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
+
+ case $flag in
+ none)
+ AC_MSG_CHECKING([whether pthreads work without any flags])
+ ;;
+
+ -*)
+ AC_MSG_CHECKING([whether pthreads work with $flag])
+ PTHREAD_CFLAGS="$flag"
+ ;;
+
+ pthread-config)
+ AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
+ if test x"$ax_pthread_config" = xno; then continue; fi
+ PTHREAD_CFLAGS="`pthread-config --cflags`"
+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+ ;;
+
+ *)
+ AC_MSG_CHECKING([for the pthreads library -l$flag])
+ PTHREAD_LIBS="-l$flag"
+ ;;
+ esac
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Check for various functions. We must include pthread.h,
+ # since some functions may be macros. (On the Sequent, we
+ # need a special flag -Kthread to make this header compile.)
+ # We check for pthread_join because it is in -lpthread on IRIX
+ # while pthread_create is in libc. We check for pthread_attr_init
+ # due to DEC craziness with -lpthreads. We check for
+ # pthread_cleanup_push because it is one of the few pthread
+ # functions on Solaris that doesn't have a non-functional libc stub.
+ # We try pthread_create on general principles.
+ AC_TRY_LINK([#include <pthread.h>
+ static void routine(void* a) {a=0;}
+ static void* start_routine(void* a) {return a;}],
+ [pthread_t th; pthread_attr_t attr;
+ pthread_join(th, 0);
+ pthread_attr_init(&attr);
+ pthread_cleanup_push(routine, 0);
+ pthread_create(&th,0,start_routine,0);
+ pthread_cleanup_pop(0); ],
+ [ax_pthread_ok=yes])
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ AC_MSG_RESULT($ax_pthread_ok)
+ if test "x$ax_pthread_ok" = xyes; then
+ break;
+ fi
+
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = xyes; then
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+ AC_MSG_CHECKING([for joinable pthread attribute])
+ attr_name=unknown
+ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+ AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
+ [attr_name=$attr; break])
+ done
+ AC_MSG_RESULT($attr_name)
+ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+ AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+ [Define to necessary symbol if this constant
+ uses a non-standard name on your system.])
+ fi
+
+ AC_MSG_CHECKING([if more special flags are required for pthreads])
+ flag=no
+ case "${host_cpu}-${host_os}" in
+ *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ esac
+ AC_MSG_RESULT(${flag})
+ if test "x$flag" != xno; then
+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+ fi
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ # More AIX lossage: must compile with xlc_r or cc_r
+ if test x"$GCC" != xyes; then
+ AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
+ else
+ PTHREAD_CC=$CC
+ fi
+else
+ PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_pthread_ok" = xyes; then
+ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+ :
+else
+ ax_pthread_ok=no
+ $2
+fi
+AC_LANG_RESTORE
+])dnl AX_PTHREAD
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-02-18 05:55:45
|
Revision: 4112
http://openvrml.svn.sourceforge.net/openvrml/?rev=4112&view=rev
Author: braden
Date: 2010-02-18 05:55:34 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
Updates for 0.18.5 release.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/doc/Doxyfile
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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 2010-02-16 01:47:18 UTC (rev 4111)
+++ trunk/ChangeLog 2010-02-18 05:55:34 UTC (rev 4112)
@@ -1,5 +1,17 @@
2010-02-15 Braden McDaniel <br...@en...>
+ Updates for 0.18.5 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
+
+2010-02-15 Braden McDaniel <br...@en...>
+
Update AX_CHECK_GL and AX_CHECK_GLU to the 2010-01-25 release.
This addresses a problem with correctly detecting and using the
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2010-02-16 01:47:18 UTC (rev 4111)
+++ trunk/NEWS 2010-02-18 05:55:34 UTC (rev 4112)
@@ -1,3 +1,9 @@
+Changes new in version 0.18.5, 15 February, 2010
+========================================================================
+
+- Fixed build configuration issues for Mac OS X and Cygwin.
+
+
Changes new in version 0.18.4, 13 February, 2010
========================================================================
Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile 2010-02-16 01:47:18 UTC (rev 4111)
+++ trunk/doc/Doxyfile 2010-02-18 05:55:34 UTC (rev 4112)
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = OpenVRML
-PROJECT_NUMBER = 0.18.4
+PROJECT_NUMBER = 0.18.5
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2010-02-16 01:47:18 UTC (rev 4111)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2010-02-18 05:55:34 UTC (rev 4112)
@@ -11,8 +11,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,2,0,0
- PRODUCTVERSION 0,18,3,0
+ FILEVERSION 9,3,0,0
+ PRODUCTVERSION 0,18,5,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2010-02-16 01:47:18 UTC (rev 4111)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2010-02-18 05:55:34 UTC (rev 4112)
@@ -12,7 +12,7 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION 8,0,0,0
- PRODUCTVERSION 0,18,3,0
+ PRODUCTVERSION 0,18,5,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
Property changes on: trunk/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/mozilla-plugin:3951,3953,3955,3960,3994,4104
+ /branches/0.18/src/mozilla-plugin:3951,3953,3955,3960,3994,4104,4110
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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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,3953,3955,3960,3994,4104,4110
/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,3953,3955,3960,3994,4104
/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_event_utilities.cpp:3401-3630
+ /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3953,3955,3960,3994,4104,4110
/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_event_utilities.cpp:3401-3630
Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/time_trigger.h:3951,3953,3955,3960,3994,4104
/branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/time_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/time_trigger.h:3951,3953,3955,3960,3994,4104,4110
/branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/time_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-geometry2d/arc2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3953,3955,3960,3994,4104
/branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3953,3955,3960,3994,4104,4110
/branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-geometry2d/arc2d.h:3951,3953,3955,3960,3994,4104
/branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/0.18/src/node/x3d-geometry2d/arc2d.h:3951,3953,3955,3960,3994,4104,4110
/branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp:3951,3953,3955,3960,3994,4104
/branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
+ /branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp:3951,3953,3955,3960,3994,4104,4110
/branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630
Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-geometry2d/arc_close2d.h:3951,3953,3955,3960,3994,4104
/branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689
/branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,365...
[truncated message content] |
|
From: <br...@us...> - 2010-03-21 06:47:03
|
Revision: 4113
http://openvrml.svn.sourceforge.net/openvrml/?rev=4113&view=rev
Author: braden
Date: 2010-03-21 06:46:57 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Update AX_CHECK_GL and AX_CHECK_GLU to the 2010-03-21 release.
Modified Paths:
--------------
trunk/ChangeLog
trunk/m4/ax_check_gl.m4
trunk/m4/ax_check_glu.m4
trunk/openvrml-gl.pc.in
trunk/src/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-18 05:55:34 UTC (rev 4112)
+++ trunk/ChangeLog 2010-03-21 06:46:57 UTC (rev 4113)
@@ -1,3 +1,13 @@
+2010-03-21 Braden McDaniel <br...@en...>
+
+ Update AX_CHECK_GL and AX_CHECK_GLU to the 2010-03-21 release.
+
+ * m4/ax_check_gl.m4
+ * m4/ax_check_glu.m4
+ * openvrml-gl.pc.in: Add GL_LIBS to Libs.private.
+ * src/Makefile.am (libopenvrml_gl_libopenvrml_gl_la_LIBADD): Apply
+ both GLU_LIBS and GL_LIBS.
+
2010-02-15 Braden McDaniel <br...@en...>
Updates for 0.18.5 release.
Modified: trunk/m4/ax_check_gl.m4
===================================================================
--- trunk/m4/ax_check_gl.m4 2010-02-18 05:55:34 UTC (rev 4112)
+++ trunk/m4/ax_check_gl.m4 2010-03-21 06:46:57 UTC (rev 4113)
@@ -11,7 +11,7 @@
# "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined. These preprocessor
# definitions may not be mutually exclusive.
#
-# version: 2.5
+# version: 2.6
# author: Braden McDaniel <br...@en...>
#
# This program is free software; you can redistribute it and/or modify
@@ -43,17 +43,14 @@
AC_LANG_PUSH([C])
AX_LANG_COMPILER_MS
AS_IF([test X$ax_compiler_ms = Xno],
- [GL_CFLAGS="${PTHREAD_CFLAGS}"; GL_LIBS="${PTHREAD_LIBS} -lm"])
+ [GL_CFLAGS="${PTHREAD_CFLAGS}"; GL_LIBS="${PTHREAD_LIBS}"])
#
# Use x_includes and x_libraries if they have been set (presumably by
# AC_PATH_X).
#
-AS_IF([test X$no_x != Xyes],
- [AS_IF([test -n "$x_includes"],
- [GL_CFLAGS="-I$x_includes $GL_CFLAGS"])]
- AS_IF([test -n "$x_libraries"],
- [GL_LIBS="-L$x_libraries -lX11 $GL_LIBS"]))
+AS_IF([test X$no_x != Xyes -a -n "$x_includes"],
+ [GL_CFLAGS="-I$x_includes $GL_CFLAGS"])
AC_CHECK_HEADERS([windows.h])
@@ -80,6 +77,20 @@
# endif]],
[[glBegin(0)]])])
+m4_define([AX_CHECK_GL_GLX_PROGRAM],
+ [AC_LANG_PROGRAM([[
+# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
+# include <windows.h>
+# endif
+# ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+# elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+# else
+# error no gl.h
+# endif]],
+ [[glXQueryVersion(0, 0, 0)]])])
+
AC_CACHE_CHECK([for OpenGL library], [ax_cv_check_gl_libgl],
[ax_cv_check_gl_libgl=no
case $host_cpu in
@@ -87,31 +98,51 @@
*) ax_check_gl_libdir=lib ;;
esac
ax_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
+ax_save_LDFLAGS=$LDFLAGS
+AS_IF([test X$no_x != Xyes -a -n "$x_libraries"],
+ [LDFLAGS="$LDFLAGS -L$x_libraries"])
ax_save_LIBS=$LIBS
-LIBS=""
ax_check_libs="-lopengl32 -lGL"
for ax_lib in $ax_check_libs; do
AS_IF([test X$ax_compiler_ms = Xyes],
[ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
[ax_try_lib=$ax_lib])
- LIBS="$ax_try_lib $GL_LIBS $ax_save_LIBS"
+ LDFLAGS="$ax_save_LDFLAGS $GL_LIBS"
+ LIBS="$ax_try_lib $ax_save_LIBS"
AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
[ax_cv_check_gl_libgl=$ax_try_lib; break],
- [ax_check_gl_nvidia_flags="-L/usr/$ax_check_gl_libdir/nvidia" LIBS="$ax_try_lib $ax_check_gl_nvidia_flags $GL_LIBS $ax_save_LIBS"
- AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="$ax_try_lib $ax_check_gl_nvidia_flags"; break],
- [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' LIBS="$ax_try_lib $ax_check_gl_dylib_flag $GL_LIBS $ax_save_LIBS"
- AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="$ax_try_lib $ax_check_gl_dylib_flag"; break])])])
+ [ax_check_gl_nvidia_flags="-L/usr/$ax_check_gl_libdir/nvidia"
+ LDFLAGS="$ax_save_LDFLAGS $GL_LIBS $ax_check_gl_nvidia_flags"
+ AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
+ [ax_cv_check_gl_libgl="$ax_check_gl_nvidia_flags $ax_try_lib"; break],
+ [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib'
+ LDFLAGS="$ax_save_LDFLAGS $GL_LIBS $ax_check_gl_dylib_flag"
+ AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
+ [ax_cv_check_gl_libgl="$ax_check_gl_dylib_flag $ax_try_lib"; break])])])
done
+#
+# If no_x is "yes", we don't want to wind up using a libGL that is
+# linked with X11. Test to see if the found libGL includes GLX
+# functions. If it does and no_x is "yes", we want to reset
+# ax_cv_check_gl_libgl back to "no".
+#
+# Note that LDFLAGS and LIBS should still have whatever values they
+# had when we broke out of the test loop above; use that.
+#
+AS_IF([test "X$ax_cv_check_gl_libgl" != Xno],
+ [AC_LINK_IFELSE([AX_CHECK_GL_GLX_PROGRAM],
+ [AS_IF([test X$no_x = Xyes],
+ [ax_cv_check_gl_libgl=no])])])
+
+LIBS=$ax_save_LIBS
AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a X$no_x = Xyes],
- [LIBS='-framework OpenGL'
+ [LDFLAGS="$ax_save_LDFLAGS -framework OpenGL"
AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl=$LIBS])])
+ [ax_cv_check_gl_libgl='-framework OpenGL'])])
-LIBS=$ax_save_LIBS
+LDFLAGS=$ax_save_LDFLAGS
CPPFLAGS=$ax_save_CPPFLAGS])
AS_IF([test "X$ax_cv_check_gl_libgl" = Xno],
Modified: trunk/m4/ax_check_glu.m4
===================================================================
--- trunk/m4/ax_check_glu.m4 2010-02-18 05:55:34 UTC (rev 4112)
+++ trunk/m4/ax_check_glu.m4 2010-03-21 06:46:57 UTC (rev 4113)
@@ -15,7 +15,7 @@
# rather than the standard "GLvoid (*)()". If the former condition is
# detected, this macro defines "HAVE_VARARGS_GLU_TESSCB".
#
-# version: 2.3
+# version: 2.4
# author: Braden McDaniel <br...@en...>
#
# This program is free software; you can redistribute it and/or modify
@@ -70,13 +70,14 @@
[ax_cv_check_glu_libglu=no
ax_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
+ax_save_LDFLAGS=$LDFLAGS
ax_save_LIBS=$LIBS
#
# First, check for the possibility that everything we need is already in
# GL_LIBS.
#
-LIBS="$GL_LIBS $ax_save_LIBS"
+LDFLAGS="$ax_save_LDFLAGS $GL_LIBS"
#
# libGLU typically links with libstdc++ on POSIX platforms.
# However, setting the language to C++ means that test program
@@ -89,26 +90,27 @@
AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM],
[ax_cv_check_glu_libglu=yes],
[LIBS=""
- ax_check_libs="-lglu32 -lGLU"
- for ax_lib in ${ax_check_libs}; do
- AS_IF([test X$ax_compiler_ms = Xyes],
- [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
- [ax_try_lib=$ax_lib])
- LIBS="$ax_try_lib $GL_LIBS $ax_save_LIBS"
- AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM],
- [ax_cv_check_glu_libglu=$ax_try_lib; break])
- done])
+ ax_check_libs="-lglu32 -lGLU"
+ for ax_lib in ${ax_check_libs}; do
+ AS_IF([test X$ax_compiler_ms = Xyes],
+ [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
+ [ax_try_lib=$ax_lib])
+ LIBS="$ax_try_lib $ax_save_LIBS"
+ AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM],
+ [ax_cv_check_glu_libglu=$ax_try_lib; break])
+ done])
AS_IF([test X$ax_compiler_ms = Xyes],
[AC_LANG_POP([C])])
AC_LANG_POP([C++])
LIBS=$ax_save_LIBS
+LDFLAGS=$ax_save_LDFLAGS
CPPFLAGS=$ax_save_CPPFLAGS])
AS_IF([test "X$ax_cv_check_glu_libglu" = Xno],
[no_glu=yes; GLU_CFLAGS=""; GLU_LIBS=""],
[AS_IF([test "X$ax_cv_check_glu_libglu" = Xyes],
- [GLU_LIBS=$GL_LIBS],
- [GLU_LIBS="$ax_cv_check_glu_libglu $GL_LIBS"])])
+ [GLU_LIBS=""],
+ [GLU_LIBS="$ax_cv_check_glu_libglu"])])
AC_SUBST([GLU_CFLAGS])
AC_SUBST([GLU_LIBS])
Modified: trunk/openvrml-gl.pc.in
===================================================================
--- trunk/openvrml-gl.pc.in 2010-02-18 05:55:34 UTC (rev 4112)
+++ trunk/openvrml-gl.pc.in 2010-03-21 06:46:57 UTC (rev 4113)
@@ -8,5 +8,5 @@
Version: @PACKAGE_VERSION@
Requires.private: openvrml = @PACKAGE_VERSION@
Libs: -L${libdir} -lopenvrml-gl
-Libs.private: @GLU_LIBS@
+Libs.private: @GLU_LIBS@ @GL_LIBS@
Cflags: -I${includedir} @GLU_CFLAGS@
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-02-18 05:55:34 UTC (rev 4112)
+++ trunk/src/Makefile.am 2010-03-21 06:46:57 UTC (rev 4113)
@@ -726,9 +726,11 @@
libopenvrml-gl/openvrml/gl/viewer.cpp
libopenvrml_gl_libopenvrml_gl_la_LDFLAGS = \
-version-info $(LIBOPENVRML_GL_LIBRARY_VERSION) \
- -no-undefined \
- $(GLU_LIBS)
-libopenvrml_gl_libopenvrml_gl_la_LIBADD = libopenvrml/libopenvrml.la
+ -no-undefined
+libopenvrml_gl_libopenvrml_gl_la_LIBADD = \
+ libopenvrml/libopenvrml.la \
+ $(GLU_LIBS) \
+ $(GL_LIBS)
if ENABLE_XEMBED
noinst_LTLIBRARIES += local/libopenvrml-control.la
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-03-21 07:01:50
|
Revision: 4115
http://openvrml.svn.sourceforge.net/openvrml/?rev=4115&view=rev
Author: braden
Date: 2010-03-21 07:01:41 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Fixed missing comma in --enable-jpeg-textures processing.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-21 06:56:39 UTC (rev 4114)
+++ trunk/ChangeLog 2010-03-21 07:01:41 UTC (rev 4115)
@@ -1,5 +1,10 @@
2010-03-21 Braden McDaniel <br...@en...>
+ * configure.ac: Fixed missing comma in --enable-jpeg-textures
+ processing.
+
+2010-03-21 Braden McDaniel <br...@en...>
+
Update AX_CHECK_GL and AX_CHECK_GLU to the 2010-03-21 release.
* m4/ax_check_gl.m4
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-03-21 06:56:39 UTC (rev 4114)
+++ trunk/configure.ac 2010-03-21 07:01:41 UTC (rev 4115)
@@ -248,7 +248,7 @@
[AC_HELP_STRING([--disable-jpeg-textures],
[disable support for rendering JPEG textures])])
AS_IF([test X$enable_jpeg_textures = Xno],
- [JPEG_LIBS=""]
+ [JPEG_LIBS=""],
[JPEG_LIBS="-ljpeg"
AC_DEFINE([OPENVRML_ENABLE_JPEG_TEXTURES], [1],
[Defined if support for rendering JPEG textures is enabled.])])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-03-21 07:15:48
|
Revision: 4117
http://openvrml.svn.sourceforge.net/openvrml/?rev=4117&view=rev
Author: braden
Date: 2010-03-21 07:15:42 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Note that OpenVRML must be installed to the same prefix as D-Bus in order for automatic activation of openvrml-xembed to work.
Modified Paths:
--------------
trunk/ChangeLog
trunk/README
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-21 07:04:38 UTC (rev 4116)
+++ trunk/ChangeLog 2010-03-21 07:15:42 UTC (rev 4117)
@@ -1,5 +1,11 @@
2010-03-21 Braden McDaniel <br...@en...>
+ * README: Note that OpenVRML must be installed to the same prefix
+ as D-Bus in order for automatic activation of openvrml-xembed to
+ work.
+
+2010-03-21 Braden McDaniel <br...@en...>
+
* configure.ac: Fixed missing comma in --enable-jpeg-textures
processing.
Modified: trunk/README
===================================================================
--- trunk/README 2010-03-21 07:04:38 UTC (rev 4116)
+++ trunk/README 2010-03-21 07:15:42 UTC (rev 4117)
@@ -354,14 +354,20 @@
OPENVRML_SCRIPT_PATH=$(pwd)/build/src/script \
./build/examples/sdl-viewer models/rotation_toy.wrl
- If OpenVRML is configured to be installed to the same prefix as a
-Mozilla-based browser is installed on the system, "make install" will
-install the Mozilla plug-in to the browser's plug-in directory. This
-should be sufficient to enable support for the "model/vrml" and
-"model/x3d-vrml" media types in the browser. Entering "about:plugins"
-in the URL entry bar of a Mozilla-based browser will show a listing of
-successfully installed plug-ins.
+ openvrml-xembed is installed as a D-Bus service, meaning that it
+can be activated on-demand by applications that need it (like
+openvrml-player and the Mozilla plug-in). In order for this to work,
+OpenVRML must be installed to the same prefix as the system's D-Bus
+installation.
+ Similarly, if OpenVRML is configured to be installed to the same
+prefix as a Mozilla-based browser is installed on the system, "make
+install" will install the Mozilla plug-in to the browser's plug-in
+directory. This should be sufficient to enable support for the
+"model/vrml" and "model/x3d-vrml" media types in the browser.
+Entering "about:plugins" in the URL entry bar of a Mozilla-based
+browser will show a listing of successfully installed plug-ins.
+
To run openvrml-player or the Mozilla plug-in from the build
directories, you must first start an openvrml-xembed process. Once
openvrml-xembed has been installed, D-Bus will start it automatically
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-03-21 07:40:53
|
Revision: 4119
http://openvrml.svn.sourceforge.net/openvrml/?rev=4119&view=rev
Author: braden
Date: 2010-03-21 07:40:46 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Note libltdl requirement.
Modified Paths:
--------------
trunk/ChangeLog
trunk/README
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-21 07:18:52 UTC (rev 4118)
+++ trunk/ChangeLog 2010-03-21 07:40:46 UTC (rev 4119)
@@ -1,5 +1,9 @@
2010-03-21 Braden McDaniel <br...@en...>
+ * README: Note libltdl requirement.
+
+2010-03-21 Braden McDaniel <br...@en...>
+
* README: Note that OpenVRML must be installed to the same prefix
as D-Bus in order for automatic activation of openvrml-xembed to
work.
Modified: trunk/README
===================================================================
--- trunk/README 2010-03-21 07:18:52 UTC (rev 4118)
+++ trunk/README 2010-03-21 07:40:46 UTC (rev 4119)
@@ -137,6 +137,7 @@
At a minimum, OpenVRML requires these libraries to build:
Boost (at least 1.38) <http://boost.org>
+ libltdl (non-Windows only) <http://www.gnu.org/software/libtool/>
libxml (non-Windows only) <http://xmlsoft.org>
These libraries are packaged for many systems; so you should
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2010-04-13 07:38:13
|
Revision: 4122
http://openvrml.svn.sourceforge.net/openvrml/?rev=4122&view=rev
Author: braden
Date: 2010-04-13 07:38:06 +0000 (Tue, 13 Apr 2010)
Log Message:
-----------
Acquire a unique_lock on the image_mutex_.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/node/vrml97/image_stream_listener.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-21 07:49:50 UTC (rev 4121)
+++ trunk/ChangeLog 2010-04-13 07:38:06 UTC (rev 4122)
@@ -1,3 +1,9 @@
+2010-04-13 Braden McDaniel <br...@en...>
+
+ * src/node/vrml97/image_stream_listener.cpp
+ (openvrml_png_info_callback(png_structp, png_infop)): Acquire a
+ unique_lock on the image_mutex_.
+
2010-03-21 Braden McDaniel <br...@en...>
* README: Note libltdl requirement.
Modified: trunk/src/node/vrml97/image_stream_listener.cpp
===================================================================
--- trunk/src/node/vrml97/image_stream_listener.cpp 2010-03-21 07:49:50 UTC (rev 4121)
+++ trunk/src/node/vrml97/image_stream_listener.cpp 2010-04-13 07:38:06 UTC (rev 4122)
@@ -49,7 +49,7 @@
png_reader_t & reader =
*static_cast<png_reader_t *>(png_get_progressive_ptr(png_ptr));
- shared_lock<shared_mutex> lock(reader.stream_listener.image_mutex_);
+ unique_lock<shared_mutex> lock(reader.stream_listener.image_mutex_);
openvrml::image & image = reader.stream_listener.image_;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X