Menu
▾
▴
openvrml-commit — Changes to OpenVRML's source revision repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
| 2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
| 2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
| 2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
| 2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
| 2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Braden M. <br...@us...> - 2007-04-15 16:36:53
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20211 Modified Files: ChangeLog Log Message: Set the request_channel encoding to none. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1470 retrieving revision 1.1471 diff -C2 -d -r1.1470 -r1.1471 *** ChangeLog 8 Apr 2007 16:27:26 -0000 1.1470 --- ChangeLog 15 Apr 2007 16:36:48 -0000 1.1471 *************** *** 1,2 **** --- 1,7 ---- + 2007-04-15 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp + (main(int, char *[])): Set the request_channel encoding to none. + 2007-04-08 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-04-15 16:36:36
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20183 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Set the request_channel encoding to none. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.145 retrieving revision 1.1310.2.146 diff -C2 -d -r1.1310.2.145 -r1.1310.2.146 *** ChangeLog 8 Apr 2007 16:27:15 -0000 1.1310.2.145 --- ChangeLog 15 Apr 2007 16:36:31 -0000 1.1310.2.146 *************** *** 1,2 **** --- 1,7 ---- + 2007-04-15 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp + (main(int, char *[])): Set the request_channel encoding to none. + 2007-04-08 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-04-15 16:36:36
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20183/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Set the request_channel encoding to none. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -C2 -d -r1.1.2.20 -r1.1.2.21 *** player.cpp 8 Apr 2007 16:27:16 -0000 1.1.2.20 --- player.cpp 15 Apr 2007 16:36:32 -0000 1.1.2.21 *************** *** 329,336 **** : "g_io_channel_set_encoding failure"); } - error_guard.dismiss(); ::request_channel = g_io_channel_unix_new(standard_output); if (!::request_channel) { throw std::bad_alloc(); } CURLM * const multi_handle = curl_multi_init(); --- 329,344 ---- : "g_io_channel_set_encoding failure"); } ::request_channel = g_io_channel_unix_new(standard_output); if (!::request_channel) { throw std::bad_alloc(); } + status = g_io_channel_set_encoding(::command_channel, + 0, // binary (no encoding) + &error); + if (status != G_IO_STATUS_NORMAL) { + throw std::runtime_error(error + ? error->message + : "g_io_channel_set_encoding failure"); + } + error_guard.dismiss(); CURLM * const multi_handle = curl_multi_init(); |
|
From: Braden M. <br...@us...> - 2007-04-08 16:27:27
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13015/src/openvrml-player Modified Files: player.cpp Log Message: Clear the request_line buffer. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** player.cpp 25 Mar 2007 07:35:40 -0000 1.20 --- player.cpp 8 Apr 2007 16:27:27 -0000 1.21 *************** *** 752,755 **** --- 752,756 ---- } + req_data.request_line.str(string()); req_data.request_line.clear(); } |
|
From: Braden M. <br...@us...> - 2007-04-08 16:27:27
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13015 Modified Files: ChangeLog Log Message: Clear the request_line buffer. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1469 retrieving revision 1.1470 diff -C2 -d -r1.1469 -r1.1470 *** ChangeLog 1 Apr 2007 19:29:17 -0000 1.1469 --- ChangeLog 8 Apr 2007 16:27:26 -0000 1.1470 *************** *** 1,2 **** --- 1,8 ---- + 2007-04-08 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp + (openvrml_player_request_data_available(GIOChannel *, + GIOCondition, gpointer)): Clear the request_line buffer. + 2007-04-01 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-04-08 16:27:16
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12985 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Clear the request_line buffer. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.144 retrieving revision 1.1310.2.145 diff -C2 -d -r1.1310.2.144 -r1.1310.2.145 *** ChangeLog 1 Apr 2007 19:29:01 -0000 1.1310.2.144 --- ChangeLog 8 Apr 2007 16:27:15 -0000 1.1310.2.145 *************** *** 1,2 **** --- 1,8 ---- + 2007-04-08 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp + (openvrml_player_request_data_available(GIOChannel *, + GIOCondition, gpointer)): Clear the request_line buffer. + 2007-04-01 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-04-08 16:27:16
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12985/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Clear the request_line buffer. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -C2 -d -r1.1.2.19 -r1.1.2.20 *** player.cpp 25 Mar 2007 07:35:28 -0000 1.1.2.19 --- player.cpp 8 Apr 2007 16:27:16 -0000 1.1.2.20 *************** *** 752,755 **** --- 752,756 ---- } + req_data.request_line.str(string()); req_data.request_line.clear(); } |
|
From: Braden M. <br...@us...> - 2007-04-01 19:29:48
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8020 Modified Files: ChangeLog Log Message: Replaced *Url exposedField implementations with a class template. This incurs some runtime expense in terms of bloating background_node instances a bit; but since there shouldn't be too many of those, this is probably worth the code savings. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1468 retrieving revision 1.1469 diff -C2 -d -r1.1468 -r1.1469 *** ChangeLog 25 Mar 2007 07:35:40 -0000 1.1468 --- ChangeLog 1 Apr 2007 19:29:17 -0000 1.1469 *************** *** 1,2 **** --- 1,25 ---- + 2007-04-01 Braden McDaniel <br...@en...> + + Replaced *Url exposedField implementations with a class template. + This incurs some runtime expense in terms of bloating + background_node instances a bit; but since there shouldn't be too + many of those, this is probably worth the code savings. + + * src/libopenvrml/openvrml/vrml97node.cpp + (background_node::back_url_exposedfield): Removed class. + (background_node::bottom_url_exposedfield): Removed class. + (background_node::front_url_exposedfield): Removed class. + (background_node::left_url_exposedfield): Removed class. + (background_node::right_url_exposedfield): Removed class. + (background_node::top_url_exposedfield): Removed class. + (background_node::texture_url_exposedfield): Added template. + (background_node): Use instances of texture_url_exposedfield for + types of back_url_, bottom_url_, front_url_, left_url_, + right_url_, and top_url_. + (background_metatype::do_create_type(const std::string &, const + node_interface_set &) const): Use instances of + texture_url_exposedfield for types of back_url_, bottom_url_, + front_url_, left_url_, right_url_, and top_url_. + 2007-03-25 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-04-01 19:29:22
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8020/src/libopenvrml/openvrml Modified Files: vrml97node.cpp Log Message: Replaced *Url exposedField implementations with a class template. This incurs some runtime expense in terms of bloating background_node instances a bit; but since there shouldn't be too many of those, this is probably worth the code savings. Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** vrml97node.cpp 12 Mar 2007 14:43:52 -0000 1.124 --- vrml97node.cpp 1 Apr 2007 19:29:17 -0000 1.125 *************** *** 2469,2559 **** }; ! class back_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit back_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! back_url_exposedfield(const back_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~back_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; ! ! class bottom_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit bottom_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! bottom_url_exposedfield(const bottom_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~bottom_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; ! ! class front_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit front_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! front_url_exposedfield(const front_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~front_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; ! ! class left_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit left_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! left_url_exposedfield(const left_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~left_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; ! ! class right_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit right_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! right_url_exposedfield(const right_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~right_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; - class top_url_exposedfield : public exposedfield<mfstring> { public: ! explicit top_url_exposedfield(background_node & node) OPENVRML_NOTHROW; ! top_url_exposedfield(const top_url_exposedfield & obj) OPENVRML_NOTHROW; ! virtual ~top_url_exposedfield() OPENVRML_NOTHROW; private: --- 2469,2483 ---- }; ! class texture_url_exposedfield : public exposedfield<mfstring> { ! bool background_node::* needs_update_; public: ! explicit texture_url_exposedfield( ! background_node & node, ! bool background_node::* needs_update) OPENVRML_NOTHROW; ! texture_url_exposedfield(const texture_url_exposedfield & obj) OPENVRML_NOTHROW; ! virtual ~texture_url_exposedfield() OPENVRML_NOTHROW; private: *************** *** 2568,2577 **** exposedfield<mffloat> ground_angle_; exposedfield<mfcolor> ground_color_; ! back_url_exposedfield back_url_; ! bottom_url_exposedfield bottom_url_; ! front_url_exposedfield front_url_; ! left_url_exposedfield left_url_; ! right_url_exposedfield right_url_; ! top_url_exposedfield top_url_; exposedfield<mffloat> sky_angle_; exposedfield<mfcolor> sky_color_; --- 2492,2497 ---- exposedfield<mffloat> ground_angle_; exposedfield<mfcolor> ground_color_; ! texture_url_exposedfield back_url_, bottom_url_, front_url_, left_url_, ! right_url_, top_url_; exposedfield<mffloat> sky_angle_; exposedfield<mfcolor> sky_color_; *************** *** 5784,5796 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::back_url_exposedfield>( &background_node::back_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::back_url_exposedfield>( &background_node::back_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::back_url_exposedfield>( &background_node::back_url_))); } else if (*interface == *++supported_interface) { --- 5704,5716 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::back_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::back_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::back_url_))); } else if (*interface == *++supported_interface) { *************** *** 5800,5812 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::bottom_url_exposedfield>( &background_node::bottom_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::bottom_url_exposedfield>( &background_node::bottom_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::bottom_url_exposedfield>( &background_node::bottom_url_))); } else if (*interface == *++supported_interface) { --- 5720,5732 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::bottom_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::bottom_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::bottom_url_))); } else if (*interface == *++supported_interface) { *************** *** 5816,5828 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::front_url_exposedfield>( &background_node::front_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::front_url_exposedfield>( &background_node::front_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::front_url_exposedfield>( &background_node::front_url_))); } else if (*interface == *++supported_interface) { --- 5736,5748 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::front_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::front_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::front_url_))); } else if (*interface == *++supported_interface) { *************** *** 5832,5844 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::left_url_exposedfield>( &background_node::left_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::left_url_exposedfield>( &background_node::left_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::left_url_exposedfield>( &background_node::left_url_))); } else if (*interface == *++supported_interface) { --- 5752,5764 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::left_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::left_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::left_url_))); } else if (*interface == *++supported_interface) { *************** *** 5848,5860 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::right_url_exposedfield>( &background_node::right_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::right_url_exposedfield>( &background_node::right_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::right_url_exposedfield>( &background_node::right_url_))); } else if (*interface == *++supported_interface) { --- 5768,5780 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::right_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::right_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::right_url_))); } else if (*interface == *++supported_interface) { *************** *** 5864,5876 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::top_url_exposedfield>( &background_node::top_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::top_url_exposedfield>( &background_node::top_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::top_url_exposedfield>( &background_node::top_url_))); } else if (*interface == *++supported_interface) { --- 5784,5796 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::top_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::top_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::top_url_))); } else if (*interface == *++supported_interface) { *************** *** 6017,6413 **** * @internal * ! * @class background_node::back_url_exposedfield ! * ! * @brief backUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::back_url_exposedfield:: ! back_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<openvrml::mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::back_url_exposedfield:: ! back_url_exposedfield(const back_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::back_url_exposedfield:: ! ~back_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! std::auto_ptr<openvrml::field_value> ! background_node::back_url_exposedfield::do_clone() const ! OPENVRML_THROW1(std::bad_alloc) ! { ! return std::auto_ptr<openvrml::field_value>( ! new back_url_exposedfield(*this)); ! } ! ! /** ! * @brief Process event. ! * ! * @param value new backUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::back_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .back_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::bottom_url_exposedfield ! * ! * @brief bottomUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::bottom_url_exposedfield:: ! bottom_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::bottom_url_exposedfield:: ! bottom_url_exposedfield(const bottom_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::bottom_url_exposedfield:: ! ~bottom_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! std::auto_ptr<openvrml::field_value> ! background_node::bottom_url_exposedfield::do_clone() const ! OPENVRML_THROW1(std::bad_alloc) ! { ! return std::auto_ptr<openvrml::field_value>( ! new bottom_url_exposedfield(*this)); ! } ! ! /** ! * @brief Process event. ! * ! * @param value new bottomUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::bottom_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .bottom_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::front_url_exposedfield ! * ! * @brief frontUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::front_url_exposedfield:: ! front_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::front_url_exposedfield:: ! front_url_exposedfield(const front_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::front_url_exposedfield:: ! ~front_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! std::auto_ptr<openvrml::field_value> ! background_node::front_url_exposedfield::do_clone() const ! OPENVRML_THROW1(std::bad_alloc) ! { ! return std::auto_ptr<openvrml::field_value>( ! new front_url_exposedfield(*this)); ! } ! ! /** ! * @brief Process event. ! * ! * @param value new frontUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::front_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .front_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::left_url_exposedfield ! * ! * @brief leftUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::left_url_exposedfield:: ! left_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::left_url_exposedfield:: ! left_url_exposedfield(const left_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::left_url_exposedfield:: ! ~left_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! std::auto_ptr<openvrml::field_value> ! background_node::left_url_exposedfield::do_clone() const ! OPENVRML_THROW1(std::bad_alloc) ! { ! return std::auto_ptr<openvrml::field_value>( ! new left_url_exposedfield(*this)); ! } ! ! /** ! * @brief Process event. ! * ! * @param value new leftUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::left_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .left_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::right_url_exposedfield ! * ! * @brief rightUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::right_url_exposedfield:: ! right_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::right_url_exposedfield:: ! right_url_exposedfield(const right_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::right_url_exposedfield:: ! ~right_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. * ! * @exception std::bad_alloc if memory allocation fails. */ - std::auto_ptr<openvrml::field_value> - background_node::right_url_exposedfield::do_clone() const - OPENVRML_THROW1(std::bad_alloc) - { - return std::auto_ptr<openvrml::field_value>( - new right_url_exposedfield(*this)); - } /** ! * @brief Process event. ! * ! * @param value new rightUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::right_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .right_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::top_url_exposedfield * ! * @brief topUrl exposedField implementation. */ --- 5937,5950 ---- * @internal * ! * @class background_node::texture_url_exposedfield * ! * @brief Texture URL @c exposedField implementation. */ /** ! * @var bool background_node::* texture_url_exposedfield::needs_update_ * ! * @brief Pointer to a @c bool member that serves as a flag to indicate ! * whether a texture needs to be updated. */ *************** *** 6417,6426 **** * @param node background_node. */ ! background_node::top_url_exposedfield:: ! top_url_exposedfield(background_node & node) OPENVRML_NOTHROW: node_event_listener(node), event_emitter(static_cast<const field_value &>(*this)), mfstring_listener(node), ! exposedfield<mfstring>(node) {} --- 5954,5966 ---- * @param node background_node. */ ! background_node::texture_url_exposedfield:: ! texture_url_exposedfield(background_node & node, ! bool background_node::* const needs_update) ! OPENVRML_NOTHROW: node_event_listener(node), event_emitter(static_cast<const field_value &>(*this)), mfstring_listener(node), ! exposedfield<openvrml::mfstring>(node), ! needs_update_(needs_update) {} *************** *** 6430,6440 **** * @param obj instance to copy. */ ! background_node::top_url_exposedfield:: ! top_url_exposedfield(const top_url_exposedfield & obj) OPENVRML_NOTHROW: openvrml::event_listener(), node_event_listener(obj.node_event_listener::node()), openvrml::event_emitter(static_cast<const field_value &>(*this)), mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) {} --- 5970,5981 ---- * @param obj instance to copy. */ ! background_node::texture_url_exposedfield:: ! texture_url_exposedfield(const texture_url_exposedfield & obj) OPENVRML_NOTHROW: openvrml::event_listener(), node_event_listener(obj.node_event_listener::node()), openvrml::event_emitter(static_cast<const field_value &>(*this)), mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj), ! needs_update_(obj.needs_update_) {} *************** *** 6442,6447 **** * @brief Destroy. */ ! background_node::top_url_exposedfield:: ! ~top_url_exposedfield() OPENVRML_NOTHROW {} --- 5983,5988 ---- * @brief Destroy. */ ! background_node::texture_url_exposedfield:: ! ~texture_url_exposedfield() OPENVRML_NOTHROW {} *************** *** 6454,6462 **** */ std::auto_ptr<openvrml::field_value> ! background_node::top_url_exposedfield::do_clone() const OPENVRML_THROW1(std::bad_alloc) { return std::auto_ptr<openvrml::field_value>( ! new top_url_exposedfield(*this)); } --- 5995,6003 ---- */ std::auto_ptr<openvrml::field_value> ! background_node::texture_url_exposedfield::do_clone() const OPENVRML_THROW1(std::bad_alloc) { return std::auto_ptr<openvrml::field_value>( ! new texture_url_exposedfield(*this)); } *************** *** 6464,6468 **** * @brief Process event. * ! * @param value new topUrl value. * @param timestamp the current time. * --- 6005,6009 ---- * @brief Process event. * ! * @param value new value. * @param timestamp the current time. * *************** *** 6470,6474 **** */ void ! background_node::top_url_exposedfield:: event_side_effect(const mfstring &, double) OPENVRML_THROW1(std::bad_alloc) --- 6011,6015 ---- */ void ! background_node::texture_url_exposedfield:: event_side_effect(const mfstring &, double) OPENVRML_THROW1(std::bad_alloc) *************** *** 6476,6480 **** try { dynamic_cast<background_node &>(this->node_event_listener::node()) ! .top_needs_update = true; } catch (std::bad_cast & ex) { OPENVRML_PRINT_EXCEPTION_(ex); --- 6017,6021 ---- try { dynamic_cast<background_node &>(this->node_event_listener::node()) ! .*this->needs_update_ = true; } catch (std::bad_cast & ex) { OPENVRML_PRINT_EXCEPTION_(ex); *************** *** 6501,6505 **** /** ! * @var background_node::back_url_exposedfield background_node::back_url_ * * @brief backUrl exposedField. --- 6042,6046 ---- /** ! * @var background_node::texture_url_exposedfield background_node::back_url_ * * @brief backUrl exposedField. *************** *** 6507,6511 **** /** ! * @var background_node::bottom_url_exposedfield background_node::bottom_url_ * * @brief bottomUrl exposedField. --- 6048,6052 ---- /** ! * @var background_node::texture_url_exposedfield background_node::bottom_url_ * * @brief bottomUrl exposedField. *************** *** 6513,6517 **** /** ! * @var background_node::front_url_exposedfield background_node::front_url_ * * @brief frontUrl exposedField. --- 6054,6058 ---- /** ! * @var background_node::texture_url_exposedfield background_node::front_url_ * * @brief frontUrl exposedField. *************** *** 6519,6523 **** /** ! * @var background_node::left_url_exposedfield background_node::left_url_ * * @brief leftUrl exposedField. --- 6060,6064 ---- /** ! * @var background_node::texture_url_exposedfield background_node::left_url_ * * @brief leftUrl exposedField. *************** *** 6525,6529 **** /** ! * @var background_node::right_url_exposedfield background_node::right_url_ * * @brief rightUrl exposedField. --- 6066,6070 ---- /** ! * @var background_node::texture_url_exposedfield background_node::right_url_ * * @brief rightUrl exposedField. *************** *** 6531,6535 **** /** ! * @var background_node::top_url_exposedfield background_node::top_url_ * * @brief topUrl exposedField. --- 6072,6076 ---- /** ! * @var background_node::texture_url_exposedfield background_node::top_url_ * * @brief topUrl exposedField. *************** *** 6654,6663 **** ground_angle_(*this), ground_color_(*this), ! back_url_(*this), ! bottom_url_(*this), ! front_url_(*this), ! left_url_(*this), ! right_url_(*this), ! top_url_(*this), sky_angle_(*this), sky_color_(*this, std::vector<color>(1, make_color(0.0, 0.0, 0.0))), --- 6195,6204 ---- ground_angle_(*this), ground_color_(*this), ! back_url_(*this, &background_node::back_needs_update), ! bottom_url_(*this, &background_node::bottom_needs_update), ! front_url_(*this, &background_node::front_needs_update), ! left_url_(*this, &background_node::left_needs_update), ! right_url_(*this, &background_node::right_needs_update), ! top_url_(*this, &background_node::top_needs_update), sky_angle_(*this), sky_color_(*this, std::vector<color>(1, make_color(0.0, 0.0, 0.0))), |
|
From: Braden M. <br...@us...> - 2007-04-01 19:29:04
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7624/src/libopenvrml/openvrml Modified Files: Tag: OpenVRML-0_16-BRANCH vrml97node.cpp Log Message: Replaced *Url exposedField implementations with a class template. This incurs some runtime expense in terms of bloating background_node instances a bit; but since there shouldn't be too many of those, this is probably worth the code savings. Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.108.2.12 retrieving revision 1.108.2.13 diff -C2 -d -r1.108.2.12 -r1.108.2.13 *** vrml97node.cpp 12 Mar 2007 14:43:39 -0000 1.108.2.12 --- vrml97node.cpp 1 Apr 2007 19:29:02 -0000 1.108.2.13 *************** *** 2469,2559 **** }; ! class back_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit back_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! back_url_exposedfield(const back_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~back_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; ! ! class bottom_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit bottom_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! bottom_url_exposedfield(const bottom_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~bottom_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; ! ! class front_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit front_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! front_url_exposedfield(const front_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~front_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; ! ! class left_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit left_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! left_url_exposedfield(const left_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~left_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; ! ! class right_url_exposedfield : public exposedfield<mfstring> { ! public: ! explicit right_url_exposedfield(background_node & node) ! OPENVRML_NOTHROW; ! right_url_exposedfield(const right_url_exposedfield & obj) ! OPENVRML_NOTHROW; ! virtual ~right_url_exposedfield() OPENVRML_NOTHROW; ! ! private: ! virtual std::auto_ptr<field_value> do_clone() const ! OPENVRML_THROW1(std::bad_alloc); ! virtual void event_side_effect(const mfstring & value, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); ! }; - class top_url_exposedfield : public exposedfield<mfstring> { public: ! explicit top_url_exposedfield(background_node & node) OPENVRML_NOTHROW; ! top_url_exposedfield(const top_url_exposedfield & obj) OPENVRML_NOTHROW; ! virtual ~top_url_exposedfield() OPENVRML_NOTHROW; private: --- 2469,2483 ---- }; ! class texture_url_exposedfield : public exposedfield<mfstring> { ! bool background_node::* needs_update_; public: ! explicit texture_url_exposedfield( ! background_node & node, ! bool background_node::* needs_update) OPENVRML_NOTHROW; ! texture_url_exposedfield(const texture_url_exposedfield & obj) OPENVRML_NOTHROW; ! virtual ~texture_url_exposedfield() OPENVRML_NOTHROW; private: *************** *** 2568,2577 **** exposedfield<mffloat> ground_angle_; exposedfield<mfcolor> ground_color_; ! back_url_exposedfield back_url_; ! bottom_url_exposedfield bottom_url_; ! front_url_exposedfield front_url_; ! left_url_exposedfield left_url_; ! right_url_exposedfield right_url_; ! top_url_exposedfield top_url_; exposedfield<mffloat> sky_angle_; exposedfield<mfcolor> sky_color_; --- 2492,2497 ---- exposedfield<mffloat> ground_angle_; exposedfield<mfcolor> ground_color_; ! texture_url_exposedfield back_url_, bottom_url_, front_url_, left_url_, ! right_url_, top_url_; exposedfield<mffloat> sky_angle_; exposedfield<mfcolor> sky_color_; *************** *** 5784,5796 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::back_url_exposedfield>( &background_node::back_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::back_url_exposedfield>( &background_node::back_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::back_url_exposedfield>( &background_node::back_url_))); } else if (*interface == *++supported_interface) { --- 5704,5716 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::back_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::back_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::back_url_))); } else if (*interface == *++supported_interface) { *************** *** 5800,5812 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::bottom_url_exposedfield>( &background_node::bottom_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::bottom_url_exposedfield>( &background_node::bottom_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::bottom_url_exposedfield>( &background_node::bottom_url_))); } else if (*interface == *++supported_interface) { --- 5720,5732 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::bottom_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::bottom_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::bottom_url_))); } else if (*interface == *++supported_interface) { *************** *** 5816,5828 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::front_url_exposedfield>( &background_node::front_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::front_url_exposedfield>( &background_node::front_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::front_url_exposedfield>( &background_node::front_url_))); } else if (*interface == *++supported_interface) { --- 5736,5748 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::front_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::front_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::front_url_))); } else if (*interface == *++supported_interface) { *************** *** 5832,5844 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::left_url_exposedfield>( &background_node::left_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::left_url_exposedfield>( &background_node::left_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::left_url_exposedfield>( &background_node::left_url_))); } else if (*interface == *++supported_interface) { --- 5752,5764 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::left_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::left_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::left_url_))); } else if (*interface == *++supported_interface) { *************** *** 5848,5860 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::right_url_exposedfield>( &background_node::right_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::right_url_exposedfield>( &background_node::right_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::right_url_exposedfield>( &background_node::right_url_))); } else if (*interface == *++supported_interface) { --- 5768,5780 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::right_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::right_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::right_url_))); } else if (*interface == *++supported_interface) { *************** *** 5864,5876 **** node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::top_url_exposedfield>( &background_node::top_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::top_url_exposedfield>( &background_node::top_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::top_url_exposedfield>( &background_node::top_url_))); } else if (*interface == *++supported_interface) { --- 5784,5796 ---- node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< ! background_node::texture_url_exposedfield>( &background_node::top_url_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< ! background_node::texture_url_exposedfield>( &background_node::top_url_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< ! background_node::texture_url_exposedfield>( &background_node::top_url_))); } else if (*interface == *++supported_interface) { *************** *** 6017,6413 **** * @internal * ! * @class background_node::back_url_exposedfield ! * ! * @brief backUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::back_url_exposedfield:: ! back_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<openvrml::mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::back_url_exposedfield:: ! back_url_exposedfield(const back_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::back_url_exposedfield:: ! ~back_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! std::auto_ptr<openvrml::field_value> ! background_node::back_url_exposedfield::do_clone() const ! OPENVRML_THROW1(std::bad_alloc) ! { ! return std::auto_ptr<openvrml::field_value>( ! new back_url_exposedfield(*this)); ! } ! ! /** ! * @brief Process event. ! * ! * @param value new backUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::back_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .back_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::bottom_url_exposedfield ! * ! * @brief bottomUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::bottom_url_exposedfield:: ! bottom_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::bottom_url_exposedfield:: ! bottom_url_exposedfield(const bottom_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::bottom_url_exposedfield:: ! ~bottom_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! std::auto_ptr<openvrml::field_value> ! background_node::bottom_url_exposedfield::do_clone() const ! OPENVRML_THROW1(std::bad_alloc) ! { ! return std::auto_ptr<openvrml::field_value>( ! new bottom_url_exposedfield(*this)); ! } ! ! /** ! * @brief Process event. ! * ! * @param value new bottomUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::bottom_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .bottom_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::front_url_exposedfield ! * ! * @brief frontUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::front_url_exposedfield:: ! front_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::front_url_exposedfield:: ! front_url_exposedfield(const front_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::front_url_exposedfield:: ! ~front_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! std::auto_ptr<openvrml::field_value> ! background_node::front_url_exposedfield::do_clone() const ! OPENVRML_THROW1(std::bad_alloc) ! { ! return std::auto_ptr<openvrml::field_value>( ! new front_url_exposedfield(*this)); ! } ! ! /** ! * @brief Process event. ! * ! * @param value new frontUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::front_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .front_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::left_url_exposedfield ! * ! * @brief leftUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::left_url_exposedfield:: ! left_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::left_url_exposedfield:: ! left_url_exposedfield(const left_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::left_url_exposedfield:: ! ~left_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! std::auto_ptr<openvrml::field_value> ! background_node::left_url_exposedfield::do_clone() const ! OPENVRML_THROW1(std::bad_alloc) ! { ! return std::auto_ptr<openvrml::field_value>( ! new left_url_exposedfield(*this)); ! } ! ! /** ! * @brief Process event. ! * ! * @param value new leftUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::left_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .left_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::right_url_exposedfield ! * ! * @brief rightUrl exposedField implementation. ! */ ! ! /** ! * @brief Construct. ! * ! * @param node background_node. ! */ ! background_node::right_url_exposedfield:: ! right_url_exposedfield(background_node & node) OPENVRML_NOTHROW: ! node_event_listener(node), ! event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(node), ! exposedfield<mfstring>(node) ! {} ! ! /** ! * @brief Construct a copy. ! * ! * @param obj instance to copy. ! */ ! background_node::right_url_exposedfield:: ! right_url_exposedfield(const right_url_exposedfield & obj) OPENVRML_NOTHROW: ! openvrml::event_listener(), ! node_event_listener(obj.node_event_listener::node()), ! openvrml::event_emitter(static_cast<const field_value &>(*this)), ! mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) ! {} ! ! /** ! * @brief Destroy. ! */ ! background_node::right_url_exposedfield:: ! ~right_url_exposedfield() OPENVRML_NOTHROW ! {} ! ! /** ! * @brief Polymorphically construct a copy. ! * ! * @return a copy of the instance. * ! * @exception std::bad_alloc if memory allocation fails. */ - std::auto_ptr<openvrml::field_value> - background_node::right_url_exposedfield::do_clone() const - OPENVRML_THROW1(std::bad_alloc) - { - return std::auto_ptr<openvrml::field_value>( - new right_url_exposedfield(*this)); - } /** ! * @brief Process event. ! * ! * @param value new rightUrl value. ! * @param timestamp the current time. ! * ! * @exception std::bad_alloc if memory allocation fails. ! */ ! void ! background_node::right_url_exposedfield:: ! event_side_effect(const mfstring &, double) ! OPENVRML_THROW1(std::bad_alloc) ! { ! try { ! dynamic_cast<background_node &>(this->node_event_listener::node()) ! .right_needs_update = true; ! } catch (std::bad_cast & ex) { ! OPENVRML_PRINT_EXCEPTION_(ex); ! } ! } ! ! /** ! * @internal ! * ! * @class background_node::top_url_exposedfield * ! * @brief topUrl exposedField implementation. */ --- 5937,5950 ---- * @internal * ! * @class background_node::texture_url_exposedfield * ! * @brief Texture URL @c exposedField implementation. */ /** ! * @var bool background_node::* texture_url_exposedfield::needs_update_ * ! * @brief Pointer to a @c bool member that serves as a flag to indicate ! * whether a texture needs to be updated. */ *************** *** 6417,6426 **** * @param node background_node. */ ! background_node::top_url_exposedfield:: ! top_url_exposedfield(background_node & node) OPENVRML_NOTHROW: node_event_listener(node), event_emitter(static_cast<const field_value &>(*this)), mfstring_listener(node), ! exposedfield<mfstring>(node) {} --- 5954,5966 ---- * @param node background_node. */ ! background_node::texture_url_exposedfield:: ! texture_url_exposedfield(background_node & node, ! bool background_node::* const needs_update) ! OPENVRML_NOTHROW: node_event_listener(node), event_emitter(static_cast<const field_value &>(*this)), mfstring_listener(node), ! exposedfield<openvrml::mfstring>(node), ! needs_update_(needs_update) {} *************** *** 6430,6440 **** * @param obj instance to copy. */ ! background_node::top_url_exposedfield:: ! top_url_exposedfield(const top_url_exposedfield & obj) OPENVRML_NOTHROW: openvrml::event_listener(), node_event_listener(obj.node_event_listener::node()), openvrml::event_emitter(static_cast<const field_value &>(*this)), mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj) {} --- 5970,5981 ---- * @param obj instance to copy. */ ! background_node::texture_url_exposedfield:: ! texture_url_exposedfield(const texture_url_exposedfield & obj) OPENVRML_NOTHROW: openvrml::event_listener(), node_event_listener(obj.node_event_listener::node()), openvrml::event_emitter(static_cast<const field_value &>(*this)), mfstring_listener(obj.node_event_listener::node()), ! exposedfield<openvrml::mfstring>(obj), ! needs_update_(obj.needs_update_) {} *************** *** 6442,6447 **** * @brief Destroy. */ ! background_node::top_url_exposedfield:: ! ~top_url_exposedfield() OPENVRML_NOTHROW {} --- 5983,5988 ---- * @brief Destroy. */ ! background_node::texture_url_exposedfield:: ! ~texture_url_exposedfield() OPENVRML_NOTHROW {} *************** *** 6454,6462 **** */ std::auto_ptr<openvrml::field_value> ! background_node::top_url_exposedfield::do_clone() const OPENVRML_THROW1(std::bad_alloc) { return std::auto_ptr<openvrml::field_value>( ! new top_url_exposedfield(*this)); } --- 5995,6003 ---- */ std::auto_ptr<openvrml::field_value> ! background_node::texture_url_exposedfield::do_clone() const OPENVRML_THROW1(std::bad_alloc) { return std::auto_ptr<openvrml::field_value>( ! new texture_url_exposedfield(*this)); } *************** *** 6464,6468 **** * @brief Process event. * ! * @param value new topUrl value. * @param timestamp the current time. * --- 6005,6009 ---- * @brief Process event. * ! * @param value new value. * @param timestamp the current time. * *************** *** 6470,6474 **** */ void ! background_node::top_url_exposedfield:: event_side_effect(const mfstring &, double) OPENVRML_THROW1(std::bad_alloc) --- 6011,6015 ---- */ void ! background_node::texture_url_exposedfield:: event_side_effect(const mfstring &, double) OPENVRML_THROW1(std::bad_alloc) *************** *** 6476,6480 **** try { dynamic_cast<background_node &>(this->node_event_listener::node()) ! .top_needs_update = true; } catch (std::bad_cast & ex) { OPENVRML_PRINT_EXCEPTION_(ex); --- 6017,6021 ---- try { dynamic_cast<background_node &>(this->node_event_listener::node()) ! .*this->needs_update_ = true; } catch (std::bad_cast & ex) { OPENVRML_PRINT_EXCEPTION_(ex); *************** *** 6501,6505 **** /** ! * @var background_node::back_url_exposedfield background_node::back_url_ * * @brief backUrl exposedField. --- 6042,6046 ---- /** ! * @var background_node::texture_url_exposedfield background_node::back_url_ * * @brief backUrl exposedField. *************** *** 6507,6511 **** /** ! * @var background_node::bottom_url_exposedfield background_node::bottom_url_ * * @brief bottomUrl exposedField. --- 6048,6052 ---- /** ! * @var background_node::texture_url_exposedfield background_node::bottom_url_ * * @brief bottomUrl exposedField. *************** *** 6513,6517 **** /** ! * @var background_node::front_url_exposedfield background_node::front_url_ * * @brief frontUrl exposedField. --- 6054,6058 ---- /** ! * @var background_node::texture_url_exposedfield background_node::front_url_ * * @brief frontUrl exposedField. *************** *** 6519,6523 **** /** ! * @var background_node::left_url_exposedfield background_node::left_url_ * * @brief leftUrl exposedField. --- 6060,6064 ---- /** ! * @var background_node::texture_url_exposedfield background_node::left_url_ * * @brief leftUrl exposedField. *************** *** 6525,6529 **** /** ! * @var background_node::right_url_exposedfield background_node::right_url_ * * @brief rightUrl exposedField. --- 6066,6070 ---- /** ! * @var background_node::texture_url_exposedfield background_node::right_url_ * * @brief rightUrl exposedField. *************** *** 6531,6535 **** /** ! * @var background_node::top_url_exposedfield background_node::top_url_ * * @brief topUrl exposedField. --- 6072,6076 ---- /** ! * @var background_node::texture_url_exposedfield background_node::top_url_ * * @brief topUrl exposedField. *************** *** 6654,6663 **** ground_angle_(*this), ground_color_(*this), ! back_url_(*this), ! bottom_url_(*this), ! front_url_(*this), ! left_url_(*this), ! right_url_(*this), ! top_url_(*this), sky_angle_(*this), sky_color_(*this, std::vector<color>(1, color(0.0, 0.0, 0.0))), --- 6195,6204 ---- ground_angle_(*this), ground_color_(*this), ! back_url_(*this, &background_node::back_needs_update), ! bottom_url_(*this, &background_node::bottom_needs_update), ! front_url_(*this, &background_node::front_needs_update), ! left_url_(*this, &background_node::left_needs_update), ! right_url_(*this, &background_node::right_needs_update), ! top_url_(*this, &background_node::top_needs_update), sky_angle_(*this), sky_color_(*this, std::vector<color>(1, color(0.0, 0.0, 0.0))), |
|
From: Braden M. <br...@us...> - 2007-04-01 19:29:04
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7624 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Replaced *Url exposedField implementations with a class template. This incurs some runtime expense in terms of bloating background_node instances a bit; but since there shouldn't be too many of those, this is probably worth the code savings. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.143 retrieving revision 1.1310.2.144 diff -C2 -d -r1.1310.2.143 -r1.1310.2.144 *** ChangeLog 25 Mar 2007 07:35:27 -0000 1.1310.2.143 --- ChangeLog 1 Apr 2007 19:29:01 -0000 1.1310.2.144 *************** *** 1,2 **** --- 1,25 ---- + 2007-04-01 Braden McDaniel <br...@en...> + + Replaced *Url exposedField implementations with a class template. + This incurs some runtime expense in terms of bloating + background_node instances a bit; but since there shouldn't be too + many of those, this is probably worth the code savings. + + * src/libopenvrml/openvrml/vrml97node.cpp + (background_node::back_url_exposedfield): Removed class. + (background_node::bottom_url_exposedfield): Removed class. + (background_node::front_url_exposedfield): Removed class. + (background_node::left_url_exposedfield): Removed class. + (background_node::right_url_exposedfield): Removed class. + (background_node::top_url_exposedfield): Removed class. + (background_node::texture_url_exposedfield): Added template. + (background_node): Use instances of texture_url_exposedfield for + types of back_url_, bottom_url_, front_url_, left_url_, + right_url_, and top_url_. + (background_metatype::do_create_type(const std::string &, const + node_interface_set &) const): Use instances of + texture_url_exposedfield for types of back_url_, bottom_url_, + front_url_, left_url_, right_url_, and top_url_. + 2007-03-25 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-03-25 07:35:41
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29609 Modified Files: ChangeLog Log Message: Don't send destroy-stream for requested streams for which new-stream was never sent. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1467 retrieving revision 1.1468 diff -C2 -d -r1.1467 -r1.1468 *** ChangeLog 15 Mar 2007 22:41:57 -0000 1.1467 --- ChangeLog 25 Mar 2007 07:35:40 -0000 1.1468 *************** *** 1,2 **** --- 1,18 ---- + 2007-03-25 Braden McDaniel <br...@en...> + + Don't send destroy-stream for requested streams for which + new-stream was never sent. + + * src/openvrml-player/player.cpp + (openvrml_player_curl_source_callback(gpointer)): Only send + destroy-stream for streams that have been initialized; otherwise, + send get-url-result with a value indicating failure. + (openvrml_player_request_data_available(GIOChannel *, + GIOCondition, gpointer)): Don't send a successful get-url-result + immediately after dispatching the get-url request. + (openvrml_player_curl_write(void *, size_t, size_t, void *)): If + the stream hasn't been initialized yet, send a value for + get-url-result indicating success. + 2007-03-15 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-03-25 07:35:41
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29609/src/openvrml-player Modified Files: player.cpp Log Message: Don't send destroy-stream for requested streams for which new-stream was never sent. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** player.cpp 15 Mar 2007 22:07:29 -0000 1.19 --- player.cpp 25 Mar 2007 07:35:40 -0000 1.20 *************** *** 605,620 **** &msgs_in_queue))) { if (msg->msg == CURLMSG_DONE) { ! const stream_data_map_t::size_type num_erased = ! callback_data->stream_data_map.erase(msg->easy_handle); ! g_assert(num_erased == 1); g_assert(curl_source->outstanding_handles > 0); --curl_source->outstanding_handles; - std::ostringstream command; - command << "destroy-stream " << ptrdiff_t(msg->easy_handle) - << '\n'; - const ssize_t bytes_written = ::write_command(command.str()); - g_return_val_if_fail( - bytes_written == ssize_t(command.str().length()), - false); // --- 605,642 ---- &msgs_in_queue))) { if (msg->msg == CURLMSG_DONE) { ! const stream_data_map_t::iterator entry = ! callback_data->stream_data_map.find(msg->easy_handle); ! g_assert(entry != callback_data->stream_data_map.end()); ! // ! // If the stream data was never initialized, then new-stream was ! // never sent for it. In that case, we shouldn't send ! // destroy-stream. ! // ! if (entry->second.initialized()) { ! std::ostringstream command; ! command << "destroy-stream " << ptrdiff_t(msg->easy_handle) ! << '\n'; ! const ssize_t bytes_written = ::write_command(command.str()); ! g_return_val_if_fail( ! bytes_written == ssize_t(command.str().length()), ! false); ! } else { ! const char * url = 0; ! const CURLcode getinfo_result = ! curl_easy_getinfo(msg->easy_handle, ! CURLINFO_EFFECTIVE_URL, &url); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, ! false); ! std::ostringstream command; ! command << "get-url-result " << url << ' ' << 1 << '\n'; ! const ssize_t bytes_written = write_command(command.str()); ! g_return_val_if_fail( ! bytes_written == ssize_t(command.str().length()), ! false); ! } ! ! callback_data->stream_data_map.erase(entry); g_assert(curl_source->outstanding_handles > 0); --curl_source->outstanding_handles; // *************** *** 719,728 **** false); ++curl_source->outstanding_handles; - std::ostringstream command; - command << "get-url-result " << url << ' ' << 0 << '\n'; - const ssize_t bytes_written = write_command(command.str()); - g_return_val_if_fail( - bytes_written == ssize_t(command.str().length()), - false); if (req_data.source_callback_data->stream_data_map.size() == 1) { int running_handles; --- 741,744 ---- *************** *** 752,759 **** using boost::ref; ! const char * type = 0; CURLcode getinfo_result = curl_easy_getinfo(stream_data.handle(), ! CURLINFO_CONTENT_TYPE, &type); OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, 0); --- 768,791 ---- using boost::ref; ! // ! // If we're writing data, we send 0 for get-url-result. ! // ! const char * url = 0; CURLcode getinfo_result = curl_easy_getinfo(stream_data.handle(), ! CURLINFO_EFFECTIVE_URL, &url); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, 0); ! ! std::ostringstream get_url_result_command; ! get_url_result_command << "get-url-result " << url << ' ' << 0 << '\n'; ! const ssize_t bytes_written = ! ::write_command(get_url_result_command.str()); ! g_return_val_if_fail( ! bytes_written == ssize_t(get_url_result_command.str().length()), ! false); ! ! const char * type = 0; ! getinfo_result = curl_easy_getinfo(stream_data.handle(), ! CURLINFO_CONTENT_TYPE, &type); OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, 0); *************** *** 776,798 **** } ! std::ostringstream command; ! command << "new-stream " << ptrdiff_t(stream_data.handle()) << ' ' ! << (type ? type : "application/octet-stream") << ' ' ! << stream_data.url() << '\n'; ! write_command(command.str()); stream_data.initialize(); } ! std::ostringstream command; ! command << "write " << ptrdiff_t(stream_data.handle()) << ' ' ! << size * nmemb << '\n'; const char * data = static_cast<char *>(ptr); for (; data != static_cast<char *>(ptr) + size * nmemb; ++data) { ! command.put(*data); } ! const ssize_t bytes_written = ::write_command(command.str()); ! g_assert(bytes_written == ssize_t(command.str().length())); return size_t(data - static_cast<char *>(ptr)); --- 808,831 ---- } ! std::ostringstream new_stream_command; ! new_stream_command ! << "new-stream " << ptrdiff_t(stream_data.handle()) << ' ' ! << (type ? type : "application/octet-stream") << ' ' ! << stream_data.url() << '\n'; ! ::write_command(new_stream_command.str()); stream_data.initialize(); } ! std::ostringstream write_command; ! write_command << "write " << ptrdiff_t(stream_data.handle()) << ' ' ! << size * nmemb << '\n'; const char * data = static_cast<char *>(ptr); for (; data != static_cast<char *>(ptr) + size * nmemb; ++data) { ! write_command.put(*data); } ! const ssize_t bytes_written = ::write_command(write_command.str()); ! g_assert(bytes_written == ssize_t(write_command.str().length())); return size_t(data - static_cast<char *>(ptr)); |
|
From: Braden M. <br...@us...> - 2007-03-25 07:35:30
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29548 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Don't send destroy-stream for requested streams for which new-stream was never sent. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.142 retrieving revision 1.1310.2.143 diff -C2 -d -r1.1310.2.142 -r1.1310.2.143 *** ChangeLog 15 Mar 2007 22:41:41 -0000 1.1310.2.142 --- ChangeLog 25 Mar 2007 07:35:27 -0000 1.1310.2.143 *************** *** 1,2 **** --- 1,18 ---- + 2007-03-25 Braden McDaniel <br...@en...> + + Don't send destroy-stream for requested streams for which + new-stream was never sent. + + * src/openvrml-player/player.cpp + (openvrml_player_curl_source_callback(gpointer)): Only send + destroy-stream for streams that have been initialized; otherwise, + send get-url-result with a value indicating failure. + (openvrml_player_request_data_available(GIOChannel *, + GIOCondition, gpointer)): Don't send a successful get-url-result + immediately after dispatching the get-url request. + (openvrml_player_curl_write(void *, size_t, size_t, void *)): If + the stream hasn't been initialized yet, send a value for + get-url-result indicating success. + 2007-03-15 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-03-25 07:35:29
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29548/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Don't send destroy-stream for requested streams for which new-stream was never sent. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -C2 -d -r1.1.2.18 -r1.1.2.19 *** player.cpp 15 Mar 2007 22:07:14 -0000 1.1.2.18 --- player.cpp 25 Mar 2007 07:35:28 -0000 1.1.2.19 *************** *** 605,620 **** &msgs_in_queue))) { if (msg->msg == CURLMSG_DONE) { ! const stream_data_map_t::size_type num_erased = ! callback_data->stream_data_map.erase(msg->easy_handle); ! g_assert(num_erased == 1); g_assert(curl_source->outstanding_handles > 0); --curl_source->outstanding_handles; - std::ostringstream command; - command << "destroy-stream " << ptrdiff_t(msg->easy_handle) - << '\n'; - const ssize_t bytes_written = ::write_command(command.str()); - g_return_val_if_fail( - bytes_written == ssize_t(command.str().length()), - false); // --- 605,642 ---- &msgs_in_queue))) { if (msg->msg == CURLMSG_DONE) { ! const stream_data_map_t::iterator entry = ! callback_data->stream_data_map.find(msg->easy_handle); ! g_assert(entry != callback_data->stream_data_map.end()); ! // ! // If the stream data was never initialized, then new-stream was ! // never sent for it. In that case, we shouldn't send ! // destroy-stream. ! // ! if (entry->second.initialized()) { ! std::ostringstream command; ! command << "destroy-stream " << ptrdiff_t(msg->easy_handle) ! << '\n'; ! const ssize_t bytes_written = ::write_command(command.str()); ! g_return_val_if_fail( ! bytes_written == ssize_t(command.str().length()), ! false); ! } else { ! const char * url = 0; ! const CURLcode getinfo_result = ! curl_easy_getinfo(msg->easy_handle, ! CURLINFO_EFFECTIVE_URL, &url); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, ! false); ! std::ostringstream command; ! command << "get-url-result " << url << ' ' << 1 << '\n'; ! const ssize_t bytes_written = write_command(command.str()); ! g_return_val_if_fail( ! bytes_written == ssize_t(command.str().length()), ! false); ! } ! ! callback_data->stream_data_map.erase(entry); g_assert(curl_source->outstanding_handles > 0); --curl_source->outstanding_handles; // *************** *** 719,728 **** false); ++curl_source->outstanding_handles; - std::ostringstream command; - command << "get-url-result " << url << ' ' << 0 << '\n'; - const ssize_t bytes_written = write_command(command.str()); - g_return_val_if_fail( - bytes_written == ssize_t(command.str().length()), - false); if (req_data.source_callback_data->stream_data_map.size() == 1) { int running_handles; --- 741,744 ---- *************** *** 752,759 **** using boost::ref; ! const char * type = 0; CURLcode getinfo_result = curl_easy_getinfo(stream_data.handle(), ! CURLINFO_CONTENT_TYPE, &type); OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, 0); --- 768,791 ---- using boost::ref; ! // ! // If we're writing data, we send 0 for get-url-result. ! // ! const char * url = 0; CURLcode getinfo_result = curl_easy_getinfo(stream_data.handle(), ! CURLINFO_EFFECTIVE_URL, &url); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, 0); ! ! std::ostringstream get_url_result_command; ! get_url_result_command << "get-url-result " << url << ' ' << 0 << '\n'; ! const ssize_t bytes_written = ! ::write_command(get_url_result_command.str()); ! g_return_val_if_fail( ! bytes_written == ssize_t(get_url_result_command.str().length()), ! false); ! ! const char * type = 0; ! getinfo_result = curl_easy_getinfo(stream_data.handle(), ! CURLINFO_CONTENT_TYPE, &type); OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, 0); *************** *** 776,798 **** } ! std::ostringstream command; ! command << "new-stream " << ptrdiff_t(stream_data.handle()) << ' ' ! << (type ? type : "application/octet-stream") << ' ' ! << stream_data.url() << '\n'; ! write_command(command.str()); stream_data.initialize(); } ! std::ostringstream command; ! command << "write " << ptrdiff_t(stream_data.handle()) << ' ' ! << size * nmemb << '\n'; const char * data = static_cast<char *>(ptr); for (; data != static_cast<char *>(ptr) + size * nmemb; ++data) { ! command.put(*data); } ! const ssize_t bytes_written = ::write_command(command.str()); ! g_assert(bytes_written == ssize_t(command.str().length())); return size_t(data - static_cast<char *>(ptr)); --- 808,831 ---- } ! std::ostringstream new_stream_command; ! new_stream_command ! << "new-stream " << ptrdiff_t(stream_data.handle()) << ' ' ! << (type ? type : "application/octet-stream") << ' ' ! << stream_data.url() << '\n'; ! ::write_command(new_stream_command.str()); stream_data.initialize(); } ! std::ostringstream write_command; ! write_command << "write " << ptrdiff_t(stream_data.handle()) << ' ' ! << size * nmemb << '\n'; const char * data = static_cast<char *>(ptr); for (; data != static_cast<char *>(ptr) + size * nmemb; ++data) { ! write_command.put(*data); } ! const ssize_t bytes_written = ::write_command(write_command.str()); ! g_assert(bytes_written == ssize_t(write_command.str().length())); return size_t(data - static_cast<char *>(ptr)); |
|
From: Braden M. <br...@us...> - 2007-03-15 22:41:58
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14672 Modified Files: ChangeLog Log Message: Prefer GLib's g_assert to assert everywhere except bounded_buffer. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1466 retrieving revision 1.1467 diff -C2 -d -r1.1466 -r1.1467 *** ChangeLog 15 Mar 2007 22:07:29 -0000 1.1466 --- ChangeLog 15 Mar 2007 22:41:57 -0000 1.1467 *************** *** 1,4 **** --- 1,20 ---- 2007-03-15 Braden McDaniel <br...@en...> + Prefer GLib's g_assert to assert everywhere except bounded_buffer. + + * src/openvrml-xembed/bounded_buffer.h: Include <cassert>. + * src/openvrml-xembed/command_istream.cpp: Don't include <cassert>. + * src/openvrml-xembed/gtkvrmlbrowser.cpp + (gtk_vrml_browser_timeout_callback(gpointer)): Use g_assert + instead of assert. + * src/openvrml-xembed/main.cpp + (openvrml_xembed::command_istream_reader::operator() const): Use + g_assert instead of assert. + * src/openvrml-xembed/plugin_streambuf.cpp + (openvrml_xembed::plugin_streambuf::set_get_url_result(int)): Use + g_assert instead of assert. + + 2007-03-15 Braden McDaniel <br...@en...> + * src/openvrml-player/player.cpp (openvrml_player_curl_write(void *, size_t, size_t, void *)): |
|
From: Braden M. <br...@us...> - 2007-03-15 22:41:58
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14672/src/openvrml-xembed Modified Files: bounded_buffer.h command_istream.cpp gtkvrmlbrowser.cpp main.cpp plugin_streambuf.cpp Log Message: Prefer GLib's g_assert to assert everywhere except bounded_buffer. Index: plugin_streambuf.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/plugin_streambuf.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** plugin_streambuf.cpp 12 Feb 2007 02:19:30 -0000 1.3 --- plugin_streambuf.cpp 15 Mar 2007 22:41:57 -0000 1.4 *************** *** 44,48 **** { boost::mutex::scoped_lock lock(this->mutex_); ! assert(this->get_url_result_ == -1); this->get_url_result_ = result; this->received_get_url_result_.notify_all(); --- 44,48 ---- { boost::mutex::scoped_lock lock(this->mutex_); ! g_assert(this->get_url_result_ == -1); this->get_url_result_ = result; this->received_get_url_result_.notify_all(); Index: bounded_buffer.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/bounded_buffer.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** bounded_buffer.h 12 Feb 2007 02:19:30 -0000 1.5 --- bounded_buffer.h 15 Mar 2007 22:41:57 -0000 1.6 *************** *** 22,25 **** --- 22,26 ---- # define OPENVRML_XEMBED_BOUNDED_BUFFER_H + # include <cassert> # include <string> # include <boost/thread/mutex.hpp> Index: main.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/main.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** main.cpp 12 Feb 2007 02:19:30 -0000 1.5 --- main.cpp 15 Mar 2007 22:41:57 -0000 1.6 *************** *** 85,89 **** shared_ptr<plugin_streambuf> streambuf = uninitialized_plugin_streambuf_map_.find(url); ! assert(streambuf); streambuf->set_get_url_result(result); } else if (command == "new-stream") { --- 85,89 ---- shared_ptr<plugin_streambuf> streambuf = uninitialized_plugin_streambuf_map_.find(url); ! g_assert(streambuf); streambuf->set_get_url_result(result); } else if (command == "new-stream") { Index: gtkvrmlbrowser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/gtkvrmlbrowser.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gtkvrmlbrowser.cpp 12 Feb 2007 02:19:30 -0000 1.4 --- gtkvrmlbrowser.cpp 15 Mar 2007 22:41:57 -0000 1.5 *************** *** 516,520 **** gint gtk_vrml_browser_timeout_callback(const gpointer ptr) { ! assert(ptr); GtkGLViewer & viewer = *static_cast<GtkGLViewer *>(ptr); --- 516,520 ---- gint gtk_vrml_browser_timeout_callback(const gpointer ptr) { ! g_assert(ptr); GtkGLViewer & viewer = *static_cast<GtkGLViewer *>(ptr); Index: command_istream.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/command_istream.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** command_istream.cpp 12 Feb 2007 02:19:30 -0000 1.3 --- command_istream.cpp 15 Mar 2007 22:41:57 -0000 1.4 *************** *** 19,23 **** // - # include <cassert> # include <cerrno> # include "command_istream.h" --- 19,22 ---- |
Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14622/src/openvrml-xembed Modified Files: Tag: OpenVRML-0_16-BRANCH bounded_buffer.h command_istream.cpp gtkvrmlbrowser.cpp main.cpp plugin_streambuf.cpp Log Message: Prefer GLib's g_assert to assert everywhere except bounded_buffer. Index: plugin_streambuf.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/plugin_streambuf.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** plugin_streambuf.cpp 12 Feb 2007 02:19:13 -0000 1.1.2.2 --- plugin_streambuf.cpp 15 Mar 2007 22:41:42 -0000 1.1.2.3 *************** *** 44,48 **** { boost::mutex::scoped_lock lock(this->mutex_); ! assert(this->get_url_result_ == -1); this->get_url_result_ = result; this->received_get_url_result_.notify_all(); --- 44,48 ---- { boost::mutex::scoped_lock lock(this->mutex_); ! g_assert(this->get_url_result_ == -1); this->get_url_result_ = result; this->received_get_url_result_.notify_all(); Index: bounded_buffer.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/bounded_buffer.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** bounded_buffer.h 12 Feb 2007 02:19:13 -0000 1.1.2.2 --- bounded_buffer.h 15 Mar 2007 22:41:42 -0000 1.1.2.3 *************** *** 22,25 **** --- 22,26 ---- # define OPENVRML_XEMBED_BOUNDED_BUFFER_H + # include <cassert> # include <string> # include <boost/thread/mutex.hpp> Index: main.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/main.cpp,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** main.cpp 12 Feb 2007 02:19:13 -0000 1.1.2.4 --- main.cpp 15 Mar 2007 22:41:42 -0000 1.1.2.5 *************** *** 85,89 **** shared_ptr<plugin_streambuf> streambuf = uninitialized_plugin_streambuf_map_.find(url); ! assert(streambuf); streambuf->set_get_url_result(result); } else if (command == "new-stream") { --- 85,89 ---- shared_ptr<plugin_streambuf> streambuf = uninitialized_plugin_streambuf_map_.find(url); ! g_assert(streambuf); streambuf->set_get_url_result(result); } else if (command == "new-stream") { Index: gtkvrmlbrowser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/gtkvrmlbrowser.cpp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** gtkvrmlbrowser.cpp 12 Feb 2007 02:19:13 -0000 1.1.2.3 --- gtkvrmlbrowser.cpp 15 Mar 2007 22:41:42 -0000 1.1.2.4 *************** *** 515,519 **** gint gtk_vrml_browser_timeout_callback(const gpointer ptr) { ! assert(ptr); GtkGLViewer & viewer = *static_cast<GtkGLViewer *>(ptr); --- 515,519 ---- gint gtk_vrml_browser_timeout_callback(const gpointer ptr) { ! g_assert(ptr); GtkGLViewer & viewer = *static_cast<GtkGLViewer *>(ptr); Index: command_istream.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/command_istream.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** command_istream.cpp 12 Feb 2007 02:19:13 -0000 1.1.2.2 --- command_istream.cpp 15 Mar 2007 22:41:42 -0000 1.1.2.3 *************** *** 19,23 **** // - # include <cassert> # include <cerrno> # include "command_istream.h" --- 19,22 ---- |
|
From: Braden M. <br...@us...> - 2007-03-15 22:41:43
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14622 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Prefer GLib's g_assert to assert everywhere except bounded_buffer. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.141 retrieving revision 1.1310.2.142 diff -C2 -d -r1.1310.2.141 -r1.1310.2.142 *** ChangeLog 15 Mar 2007 22:07:13 -0000 1.1310.2.141 --- ChangeLog 15 Mar 2007 22:41:41 -0000 1.1310.2.142 *************** *** 1,4 **** --- 1,20 ---- 2007-03-15 Braden McDaniel <br...@en...> + Prefer GLib's g_assert to assert everywhere except bounded_buffer. + + * src/openvrml-xembed/bounded_buffer.h: Include <cassert>. + * src/openvrml-xembed/command_istream.cpp: Don't include <cassert>. + * src/openvrml-xembed/gtkvrmlbrowser.cpp + (gtk_vrml_browser_timeout_callback(gpointer)): Use g_assert + instead of assert. + * src/openvrml-xembed/main.cpp + (openvrml_xembed::command_istream_reader::operator() const): Use + g_assert instead of assert. + * src/openvrml-xembed/plugin_streambuf.cpp + (openvrml_xembed::plugin_streambuf::set_get_url_result(int)): Use + g_assert instead of assert. + + 2007-03-15 Braden McDaniel <br...@en...> + * src/openvrml-player/player.cpp (openvrml_player_curl_write(void *, size_t, size_t, void *)): |
|
From: Braden M. <br...@us...> - 2007-03-15 22:07:34
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31844 Modified Files: ChangeLog Log Message: Moved "data" pointer back outside the "for" loop. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1465 retrieving revision 1.1466 diff -C2 -d -r1.1465 -r1.1466 *** ChangeLog 15 Mar 2007 21:46:20 -0000 1.1465 --- ChangeLog 15 Mar 2007 22:07:29 -0000 1.1466 *************** *** 3,6 **** --- 3,12 ---- * src/openvrml-player/player.cpp (openvrml_player_curl_write(void *, size_t, size_t, void *)): + Moved "data" pointer back outside the "for" loop. + + 2007-03-15 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp + (openvrml_player_curl_write(void *, size_t, size_t, void *)): Check result of curl_easy_getinfo with OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR. |
|
From: Braden M. <br...@us...> - 2007-03-15 22:07:34
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31844/src/openvrml-player Modified Files: player.cpp Log Message: Moved "data" pointer back outside the "for" loop. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** player.cpp 15 Mar 2007 21:46:20 -0000 1.18 --- player.cpp 15 Mar 2007 22:07:29 -0000 1.19 *************** *** 787,792 **** command << "write " << ptrdiff_t(stream_data.handle()) << ' ' << size * nmemb << '\n'; ! for (const char * data = static_cast<char *>(ptr); ! data != static_cast<char *>(ptr) + size * nmemb; ++data) { command.put(*data); --- 787,792 ---- command << "write " << ptrdiff_t(stream_data.handle()) << ' ' << size * nmemb << '\n'; ! const char * data = static_cast<char *>(ptr); ! for (; data != static_cast<char *>(ptr) + size * nmemb; ++data) { command.put(*data); |
|
From: Braden M. <br...@us...> - 2007-03-15 22:07:15
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31804 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Moved "data" pointer back outside the "for" loop. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.140 retrieving revision 1.1310.2.141 diff -C2 -d -r1.1310.2.140 -r1.1310.2.141 *** ChangeLog 15 Mar 2007 21:46:04 -0000 1.1310.2.140 --- ChangeLog 15 Mar 2007 22:07:13 -0000 1.1310.2.141 *************** *** 3,6 **** --- 3,12 ---- * src/openvrml-player/player.cpp (openvrml_player_curl_write(void *, size_t, size_t, void *)): + Moved "data" pointer back outside the "for" loop. + + 2007-03-15 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp + (openvrml_player_curl_write(void *, size_t, size_t, void *)): Check result of curl_easy_getinfo with OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR. |
|
From: Braden M. <br...@us...> - 2007-03-15 22:07:15
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31804/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Moved "data" pointer back outside the "for" loop. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -C2 -d -r1.1.2.17 -r1.1.2.18 *** player.cpp 15 Mar 2007 21:46:05 -0000 1.1.2.17 --- player.cpp 15 Mar 2007 22:07:14 -0000 1.1.2.18 *************** *** 787,792 **** command << "write " << ptrdiff_t(stream_data.handle()) << ' ' << size * nmemb << '\n'; ! for (const char * data = static_cast<char *>(ptr); ! data != static_cast<char *>(ptr) + size * nmemb; ++data) { command.put(*data); --- 787,792 ---- command << "write " << ptrdiff_t(stream_data.handle()) << ' ' << size * nmemb << '\n'; ! const char * data = static_cast<char *>(ptr); ! for (; data != static_cast<char *>(ptr) + size * nmemb; ++data) { command.put(*data); |
|
From: Braden M. <br...@us...> - 2007-03-15 21:46:25
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22920/src/openvrml-player Modified Files: player.cpp Log Message: Check result of curl_easy_getinfo with OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** player.cpp 13 Mar 2007 07:38:37 -0000 1.17 --- player.cpp 15 Mar 2007 21:46:20 -0000 1.18 *************** *** 753,759 **** const char * type = 0; ! CURLcode result = curl_easy_getinfo(stream_data.handle(), ! CURLINFO_CONTENT_TYPE, &type); ! boost::ignore_unused_variable_warning(result); GnomeVFSFileInfo * info = 0; --- 753,760 ---- const char * type = 0; ! CURLcode getinfo_result = ! curl_easy_getinfo(stream_data.handle(), ! CURLINFO_CONTENT_TYPE, &type); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, 0); GnomeVFSFileInfo * info = 0; *************** *** 786,792 **** command << "write " << ptrdiff_t(stream_data.handle()) << ' ' << size * nmemb << '\n'; ! ! const char * data; ! for (data = static_cast<char *>(ptr); data != static_cast<char *>(ptr) + size * nmemb; ++data) { --- 787,791 ---- command << "write " << ptrdiff_t(stream_data.handle()) << ' ' << size * nmemb << '\n'; ! for (const char * data = static_cast<char *>(ptr); data != static_cast<char *>(ptr) + size * nmemb; ++data) { |
|
From: Braden M. <br...@us...> - 2007-03-15 21:46:25
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22920 Modified Files: ChangeLog Log Message: Check result of curl_easy_getinfo with OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1464 retrieving revision 1.1465 diff -C2 -d -r1.1464 -r1.1465 *** ChangeLog 13 Mar 2007 07:38:37 -0000 1.1464 --- ChangeLog 15 Mar 2007 21:46:20 -0000 1.1465 *************** *** 1,2 **** --- 1,9 ---- + 2007-03-15 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp + (openvrml_player_curl_write(void *, size_t, size_t, void *)): + Check result of curl_easy_getinfo with + OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR. + 2007-03-13 Braden McDaniel <br...@en...> |
