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...> - 2006-07-23 07:27:50
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5967/mozilla-plugin/src Modified Files: openvrml.cpp Log Message: Use g_malloc0 to zero-initialize the allocated memory for openvrml_player_cmd_argv. Index: openvrml.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** openvrml.cpp 23 Jul 2006 05:43:12 -0000 1.34 --- openvrml.cpp 23 Jul 2006 07:27:47 -0000 1.35 *************** *** 1066,1070 **** // path to the child process executable. To allow OPENVRML_PLAYER // to include arguments (rather than just be a path to an ! // executable), it is parsed wit g_shell_parse_argv. This is // particularly useful in case we want to run the child process in // a harness like valgrind. --- 1066,1070 ---- // path to the child process executable. To allow OPENVRML_PLAYER // to include arguments (rather than just be a path to an ! // executable), it is parsed with g_shell_parse_argv. This is // particularly useful in case we want to run the child process in // a harness like valgrind. *************** *** 1077,1085 **** openvrml_player_cmd_argc = 1; openvrml_player_cmd_argv = ! static_cast<gchar **>(g_malloc(sizeof (gchar *) * 2)); if (!openvrml_player_cmd_argv) { throw std::bad_alloc(); } openvrml_player_cmd_argv[0] = g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-player"); - openvrml_player_cmd_argv[1] = 0; if (!openvrml_player_cmd_argv[0]) { throw std::bad_alloc(); } } else { --- 1077,1084 ---- openvrml_player_cmd_argc = 1; openvrml_player_cmd_argv = ! static_cast<gchar **>(g_malloc0(sizeof (gchar *) * 2)); if (!openvrml_player_cmd_argv) { throw std::bad_alloc(); } openvrml_player_cmd_argv[0] = g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-player"); if (!openvrml_player_cmd_argv[0]) { throw std::bad_alloc(); } } else { |
|
From: Braden M. <br...@us...> - 2006-07-23 07:27:49
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5967 Modified Files: ChangeLog Log Message: Use g_malloc0 to zero-initialize the allocated memory for openvrml_player_cmd_argv. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1259 retrieving revision 1.1260 diff -C2 -d -r1.1259 -r1.1260 *** ChangeLog 23 Jul 2006 05:43:12 -0000 1.1259 --- ChangeLog 23 Jul 2006 07:27:46 -0000 1.1260 *************** *** 1,4 **** --- 1,10 ---- 2006-07-23 Braden McDaniel <br...@en...> + * mozilla-plugin/src/openvrml.cpp + (PluginInstance::SetWindow(NPWindow &)): Use g_malloc0 to + zero-initialize the allocated memory for openvrml_player_cmd_argv. + + 2006-07-23 Braden McDaniel <br...@en...> + Backed out change to set the plugin_resource_istream initial state to invalid if the Web browser's get-url function fails. The |
|
From: Braden M. <br...@us...> - 2006-07-23 05:43:16
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30550/mozilla-plugin/src/openvrml-player Modified Files: gtkvrmlbrowser.cpp player.cpp plugin_streambuf.cpp plugin_streambuf.h Log Message: Backed out change to set the plugin_resource_istream initial state to invalid if the Web browser's get-url function fails. The attempted solution deadlocks. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/player.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** player.cpp 15 May 2006 05:51:59 -0000 1.24 --- player.cpp 23 Jul 2006 05:43:12 -0000 1.25 *************** *** 74,89 **** string command; command_line_stream >> command; ! if (command == "get-url-result") { ! using boost::shared_ptr; ! ! std::string url; ! int result; ! command_line_stream >> url >> result; ! ! shared_ptr<plugin_streambuf> streambuf = ! uninitialized_plugin_streambuf_map_.find(url); ! assert(streambuf); ! streambuf->set_get_url_result(result); ! } else if (command == "new-stream") { using boost::shared_ptr; --- 74,78 ---- string command; command_line_stream >> command; ! if (command == "new-stream") { using boost::shared_ptr; Index: plugin_streambuf.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/plugin_streambuf.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** plugin_streambuf.cpp 15 May 2006 05:51:59 -0000 1.4 --- plugin_streambuf.cpp 23 Jul 2006 05:43:12 -0000 1.5 *************** *** 24,28 **** openvrml_player::plugin_streambuf:: plugin_streambuf(const std::string & requested_url): - get_url_result_(-1), initialized_(false), url_(requested_url), --- 24,27 ---- *************** *** 38,58 **** } - void openvrml_player::plugin_streambuf::set_get_url_result(const int result) - { - 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(); - } - - int openvrml_player::plugin_streambuf::get_url_result() const - { - boost::mutex::scoped_lock lock(this->mutex_); - while (this->get_url_result_ == -1) { - this->received_get_url_result_.wait(lock); - } - return this->get_url_result_; - } - void openvrml_player::plugin_streambuf::init(const size_t stream_id, const std::string & received_url, --- 37,40 ---- Index: gtkvrmlbrowser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/gtkvrmlbrowser.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gtkvrmlbrowser.cpp 15 May 2006 05:51:59 -0000 1.2 --- gtkvrmlbrowser.cpp 23 Jul 2006 05:43:12 -0000 1.3 *************** *** 183,187 **** } ! void gtk_vrml_browser_class_init(GtkVrmlBrowserClass *) {} --- 183,187 ---- } ! void gtk_vrml_browser_class_init(GtkVrmlBrowserClass * klass) {} *************** *** 512,523 **** 0); g_io_channel_flush(this->request_channel_, 0); - - // - // This blocks until we know the result of NPN_GetURL. - // - const int get_url_result = this->streambuf_->get_url_result(); - if (get_url_result != 0) { - this->setstate(std::ios_base::failbit); - } } --- 512,515 ---- Index: plugin_streambuf.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/plugin_streambuf.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** plugin_streambuf.h 15 May 2006 05:51:59 -0000 1.3 --- plugin_streambuf.h 23 Jul 2006 05:43:12 -0000 1.4 *************** *** 40,45 **** mutable boost::mutex mutex_; - int get_url_result_; - mutable boost::condition received_get_url_result_; bool initialized_; mutable boost::condition streambuf_initialized_; --- 40,43 ---- *************** *** 55,60 **** public: explicit plugin_streambuf(const std::string & requested_url); - void set_get_url_result(int result); - int get_url_result() const; void init(size_t stream_id, const std::string & received_url, --- 53,56 ---- |
|
From: Braden M. <br...@us...> - 2006-07-23 05:43:16
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30550/mozilla-plugin/src Modified Files: openvrml.cpp Log Message: Backed out change to set the plugin_resource_istream initial state to invalid if the Web browser's get-url function fails. The attempted solution deadlocks. Index: openvrml.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** openvrml.cpp 18 May 2006 22:20:47 -0000 1.33 --- openvrml.cpp 23 Jul 2006 05:43:12 -0000 1.34 *************** *** 1081,1086 **** openvrml_player_cmd_argv[0] = g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-player"); - if (!openvrml_player_cmd_argv[0]) { throw std::bad_alloc(); } openvrml_player_cmd_argv[1] = 0; } else { GError * error = 0; --- 1081,1086 ---- openvrml_player_cmd_argv[0] = g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-player"); openvrml_player_cmd_argv[1] = 0; + if (!openvrml_player_cmd_argv[0]) { throw std::bad_alloc(); } } else { GError * error = 0; *************** *** 1215,1221 **** } ! gboolean request_data_available(GIOChannel * const source, GIOCondition, ! const gpointer data) { using std::string; --- 1215,1221 ---- } ! gboolean request_data_available(GIOChannel * source, GIOCondition, ! gpointer data) { using std::string; *************** *** 1252,1269 **** string url, target; pluginInstance.request_line >> url >> target; ! NPError result = ! NPN_GetURL(pluginInstance.npp, ! url.c_str(), ! target.empty() ? 0 : target.c_str()); ! std::ostringstream command; ! command << "get-url-result " << url << ' ' << result ! << '\n'; ! const ssize_t bytes_written = ! pluginInstance.WriteCommand(command.str()); ! if (bytes_written != command.str().length()) { ! // XXX ! // XXX Do what here? Console message? ! // XXX ! } } } --- 1252,1258 ---- string url, target; pluginInstance.request_line >> url >> target; ! NPN_GetURL(pluginInstance.npp, ! url.c_str(), ! target.empty() ? 0 : target.c_str()); } } |
|
From: Braden M. <br...@us...> - 2006-07-23 05:43:16
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30550 Modified Files: ChangeLog Log Message: Backed out change to set the plugin_resource_istream initial state to invalid if the Web browser's get-url function fails. The attempted solution deadlocks. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1258 retrieving revision 1.1259 diff -C2 -d -r1.1258 -r1.1259 *** ChangeLog 9 Jul 2006 05:25:00 -0000 1.1258 --- ChangeLog 23 Jul 2006 05:43:12 -0000 1.1259 *************** *** 1,2 **** --- 1,14 ---- + 2006-07-23 Braden McDaniel <br...@en...> + + Backed out change to set the plugin_resource_istream initial state + to invalid if the Web browser's get-url function fails. The + attempted solution deadlocks. + + * mozilla-plugin/src/openvrml.cpp + * mozilla-plugin/src/openvrml-player/gtkvrmlbrowser.cpp + * mozilla-plugin/src/openvrml-player/player.cpp + * mozilla-plugin/src/openvrml-player/plugin_streambuf.cpp + * mozilla-plugin/src/openvrml-player/plugin_streambuf.h + 2006-07-09 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-07-09 05:25:05
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23167 Modified Files: ChangeLog Log Message: Swallow the openvrml::no_alternative_url exception when loading Background node textures. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1257 retrieving revision 1.1258 diff -C2 -d -r1.1257 -r1.1258 *** ChangeLog 8 Jul 2006 07:00:34 -0000 1.1257 --- ChangeLog 9 Jul 2006 05:25:00 -0000 1.1258 *************** *** 1,2 **** --- 1,14 ---- + 2006-07-09 Braden McDaniel <br...@en...> + + Swallow the openvrml::no_alternative_url exception when loading + Background node textures. + + * src/libopenvrml/openvrml/vrml97node.cpp + (update_texture(background_node &, boost::recursive_mutex &, const + openvrml::mfstring &, openvrml::image)): Added function; called by + background_node::update_textures; swallow the + openvrml::no_alternative_url exception. + (background_node::update_textures()): Delegate to update_texture. + 2006-07-08 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-07-09 05:25:05
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23167/src/libopenvrml/openvrml Modified Files: vrml97node.cpp Log Message: Swallow the openvrml::no_alternative_url exception when loading Background node textures. Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** vrml97node.cpp 7 Jun 2006 14:36:45 -0000 1.106 --- vrml97node.cpp 9 Jul 2006 05:25:00 -0000 1.107 *************** *** 2602,2606 **** virtual void do_shutdown(double timestamp) OPENVRML_NOTHROW; ! void update_textures(); }; --- 2602,2606 ---- virtual void do_shutdown(double timestamp) OPENVRML_NOTHROW; ! void update_textures() OPENVRML_THROW1(std::bad_alloc); }; *************** *** 7182,7186 **** assert(err->stream_listener); std::ostringstream msg; ! msg << err->stream_listener->uri_ << ": " << buffer << std::endl; openvrml::browser & browser = err->stream_listener->node_.type().metatype().browser(); --- 7182,7186 ---- assert(err->stream_listener); std::ostringstream msg; ! msg << err->stream_listener->uri_ << ": " << buffer; openvrml::browser & browser = err->stream_listener->node_.type().metatype().browser(); *************** *** 7446,7554 **** } /** * @brief Called lazily to update texture data. */ void background_node::update_textures() { if (this->front_needs_update) { ! if (this->front_url_.mfstring::value().empty()) { ! this->front = image(); ! } else { ! using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->front_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->front, ! *this, ! this->mutex())); ! read_stream(in, listener); ! } this->front_needs_update = false; } if (this->back_needs_update) { ! if (this->back_url_.mfstring::value().empty()) { ! this->back = image(); ! } else { ! using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->back_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->back, ! *this, ! this->mutex())); ! read_stream(in, listener); ! } this->back_needs_update = false; } if (this->left_needs_update) { ! if (this->left_url_.mfstring::value().empty()) { ! this->left = image(); ! } else { ! using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->left_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->left, ! *this, ! this->mutex())); ! read_stream(in, listener); ! } this->left_needs_update = false; } if (this->right_needs_update) { ! if (this->right_url_.mfstring::value().empty()) { ! this->right = image(); ! } else { ! using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->right_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->right, ! *this, ! this->mutex())); ! read_stream(in, listener); ! } this->right_needs_update = false; } if (this->top_needs_update) { ! if (this->top_url_.mfstring::value().empty()) { ! this->top = image(); ! } else { ! using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->top_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->top, ! *this, ! this->mutex())); ! read_stream(in, listener); ! } this->top_needs_update = false; } if (this->bottom_needs_update) { ! if (this->bottom_url_.mfstring::value().empty()) { ! this->bottom = image(); ! } else { ! using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->bottom_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->bottom, ! *this, ! this->mutex())); ! read_stream(in, listener); ! } this->bottom_needs_update = false; } --- 7446,7520 ---- } + void update_texture(background_node & node, + boost::recursive_mutex & node_mutex, + const openvrml::mfstring & url, + openvrml::image & img) + OPENVRML_THROW1(std::bad_alloc) + try { + using openvrml::image; + + if (url.value().empty()) { + img = image(); + } else { + using std::auto_ptr; + using openvrml::resource_istream; + + auto_ptr<resource_istream> in( + node.scene()->get_resource(url.value())); + auto_ptr<stream_listener> listener( + new image_stream_listener(in->url(), + img, + node, + node_mutex)); + read_stream(in, listener); + } + } catch (const openvrml::no_alternative_url & ex) {} + /** * @brief Called lazily to update texture data. */ void background_node::update_textures() + OPENVRML_THROW1(std::bad_alloc) { if (this->front_needs_update) { ! update_texture(*this, ! this->mutex(), ! this->front_url_, ! this->front); this->front_needs_update = false; } if (this->back_needs_update) { ! update_texture(*this, ! this->mutex(), ! this->back_url_, ! this->back); this->back_needs_update = false; } if (this->left_needs_update) { ! update_texture(*this, ! this->mutex(), ! this->left_url_, ! this->left); this->left_needs_update = false; } if (this->right_needs_update) { ! update_texture(*this, ! this->mutex(), ! this->right_url_, ! this->right); this->right_needs_update = false; } if (this->top_needs_update) { ! update_texture(*this, ! this->mutex(), ! this->top_url_, ! this->top); this->top_needs_update = false; } if (this->bottom_needs_update) { ! update_texture(*this, ! this->mutex(), ! this->bottom_url_, ! this->bottom); this->bottom_needs_update = false; } |
|
From: Braden M. <br...@us...> - 2006-07-08 07:00:41
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24699 Modified Files: ChangeLog Log Message: Use a more compact representation for the command_streambuf. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1256 retrieving revision 1.1257 diff -C2 -d -r1.1256 -r1.1257 *** ChangeLog 7 Jun 2006 14:36:45 -0000 1.1256 --- ChangeLog 8 Jul 2006 07:00:34 -0000 1.1257 *************** *** 1,2 **** --- 1,14 ---- + 2006-07-08 Braden McDaniel <br...@en...> + + Use a more compact representation for the command_streambuf. + + * mozilla-plugin/src/openvrml-player/command_istream.cpp + (openvrml_player::command_streambuf::underflow()): Apply + traits_type::to_char_type and traits_type::to_int_type + consistently. + * mozilla-plugin/src/openvrml-player/command_istream.h + (openvrml_player::command_streambuf): Changed source_buffer_ to be + a bounded_buffer of char_type instead of int_type. + 2006-06-07 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-07-08 07:00:41
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24699/mozilla-plugin/src/openvrml-player Modified Files: command_istream.cpp command_istream.h Log Message: Use a more compact representation for the command_streambuf. Index: command_istream.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/command_istream.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** command_istream.h 9 Jan 2006 00:21:09 -0000 1.1 --- command_istream.h 8 Jul 2006 07:00:34 -0000 1.2 *************** *** 38,42 **** gpointer data); ! bounded_buffer<int_type, 64> source_buffer_; char_type c_; --- 38,42 ---- gpointer data); ! bounded_buffer<char_type, 64> source_buffer_; char_type c_; Index: command_istream.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/command_istream.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** command_istream.cpp 29 Jan 2006 07:00:59 -0000 1.3 --- command_istream.cpp 8 Jul 2006 07:00:34 -0000 1.4 *************** *** 30,38 **** openvrml_player::command_streambuf::underflow() { ! int_type c = this->source_buffer_.get(); if (c == traits_type::eof()) { return traits_type::eof(); } ! this->c_ = c; this->setg(&this->c_, &this->c_, &this->c_ + 1); ! return *this->gptr(); } --- 30,38 ---- openvrml_player::command_streambuf::underflow() { ! int_type c = traits_type::to_int_type(this->source_buffer_.get()); if (c == traits_type::eof()) { return traits_type::eof(); } ! this->c_ = traits_type::to_char_type(c); this->setg(&this->c_, &this->c_, &this->c_ + 1); ! return traits_type::to_int_type(*this->gptr()); } *************** *** 75,79 **** g_assert(bytes_read == 1); ! streambuf.source_buffer_.put(traits_type::to_int_type(c)); } while (g_io_channel_get_buffer_condition(source) & G_IO_IN); --- 75,79 ---- g_assert(bytes_read == 1); ! streambuf.source_buffer_.put(c); } while (g_io_channel_get_buffer_condition(source) & G_IO_IN); |
|
From: Braden M. <br...@us...> - 2006-06-07 18:10:12
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22088/src/libopenvrml/openvrml Modified Files: vrml97node.cpp Log Message: Provide an error handler for libjpeg; the default one calls exit. Instead, print the error message using openvrml::browser::err. Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** vrml97node.cpp 18 May 2006 04:11:31 -0000 1.105 --- vrml97node.cpp 7 Jun 2006 14:36:45 -0000 1.106 *************** *** 36,39 **** --- 36,40 ---- # include <iterator> # include <limits> + # include <sstream> # include <boost/algorithm/string/predicate.hpp> # include <boost/array.hpp> *************** *** 6738,6741 **** --- 6739,6744 ---- long num_bytes); extern "C" void openvrml_jpeg_term_source(j_decompress_ptr cinfo); + extern "C" void openvrml_jpeg_error_exit(j_common_ptr cinfo); + extern "C" void openvrml_jpeg_output_message(j_common_ptr cinfo); # endif *************** *** 6743,6746 **** --- 6746,6750 ---- public openvrml::stream_listener { + const std::string uri_; boost::recursive_mutex & node_mutex_; openvrml::image & image_; *************** *** 6789,6792 **** --- 6793,6798 ---- long num_bytes); friend void openvrml_jpeg_term_source(j_decompress_ptr cinfo); + friend void openvrml_jpeg_error_exit(j_common_ptr cinfo); + friend void openvrml_jpeg_output_message(j_common_ptr cinfo); class jpeg_reader : public image_reader { *************** *** 6797,6806 **** }; - private: - jpeg_decompress_struct cinfo_; struct error_mgr { jpeg_error_mgr pub; jmp_buf jmpbuf; ! } error_mgr_; source_mgr source_mgr_; --- 6803,6815 ---- }; struct error_mgr { jpeg_error_mgr pub; jmp_buf jmpbuf; ! image_stream_listener * stream_listener; ! }; ! ! private: ! jpeg_decompress_struct cinfo_; ! error_mgr error_mgr_; source_mgr source_mgr_; *************** *** 6839,6843 **** public: ! image_stream_listener(openvrml::image & image, openvrml::node & node, boost::recursive_mutex & node_mutex); --- 6848,6853 ---- public: ! image_stream_listener(const std::string & uri, ! openvrml::image & image, openvrml::node & node, boost::recursive_mutex & node_mutex); *************** *** 7156,7159 **** --- 7166,7191 ---- {} + void openvrml_jpeg_error_exit(j_common_ptr cinfo) + { + typedef image_stream_listener::jpeg_reader::error_mgr error_mgr; + error_mgr * const err = reinterpret_cast<error_mgr *>(cinfo->err); + (*cinfo->err->output_message)(cinfo); + longjmp(err->jmpbuf, 1); + } + + void openvrml_jpeg_output_message(j_common_ptr cinfo) + { + typedef image_stream_listener::jpeg_reader::error_mgr error_mgr; + error_mgr * const err = reinterpret_cast<error_mgr *>(cinfo->err); + char buffer[JMSG_LENGTH_MAX]; + (*cinfo->err->format_message)(cinfo, buffer); + assert(err->stream_listener); + std::ostringstream msg; + msg << err->stream_listener->uri_ << ": " << buffer << std::endl; + openvrml::browser & browser = + err->stream_listener->node_.type().metatype().browser(); + browser.err(msg.str()); + } + image_stream_listener::jpeg_reader:: jpeg_reader(image_stream_listener & stream_listener): *************** *** 7170,7175 **** --- 7202,7210 ---- this->cinfo_.err = jpeg_std_error(&this->error_mgr_.pub); + this->error_mgr_.pub.error_exit = openvrml_jpeg_error_exit; + this->error_mgr_.pub.output_message = openvrml_jpeg_output_message; int jmpval = setjmp(this->error_mgr_.jmpbuf); if (jmpval != 0) { return; } + this->error_mgr_.stream_listener = &stream_listener; jpeg_create_decompress(&this->cinfo_); this->source_mgr_.pub.next_input_byte = 0; *************** *** 7374,7380 **** image_stream_listener:: ! image_stream_listener(openvrml::image & image, openvrml::node & node, boost::recursive_mutex & node_mutex): node_mutex_(node_mutex), image_(image), --- 7409,7417 ---- image_stream_listener:: ! image_stream_listener(const std::string & uri, ! openvrml::image & image, openvrml::node & node, boost::recursive_mutex & node_mutex): + uri_(uri), node_mutex_(node_mutex), image_(image), *************** *** 7419,7429 **** } else { using std::auto_ptr; ! auto_ptr<resource_istream> ! in(this->scene() ! ->get_resource(this->front_url_.mfstring::value())); ! auto_ptr<stream_listener> ! listener(new image_stream_listener(this->front, ! *this, ! this->mutex())); read_stream(in, listener); } --- 7456,7467 ---- } else { using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->front_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->front, ! *this, ! this->mutex())); read_stream(in, listener); } *************** *** 7435,7445 **** } else { using std::auto_ptr; ! auto_ptr<resource_istream> ! in(this->scene() ! ->get_resource(this->back_url_.mfstring::value())); ! auto_ptr<stream_listener> ! listener(new image_stream_listener(this->back, ! *this, ! this->mutex())); read_stream(in, listener); } --- 7473,7484 ---- } else { using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->back_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->back, ! *this, ! this->mutex())); read_stream(in, listener); } *************** *** 7451,7461 **** } else { using std::auto_ptr; ! auto_ptr<resource_istream> ! in(this->scene() ! ->get_resource(this->left_url_.mfstring::value())); ! auto_ptr<stream_listener> ! listener(new image_stream_listener(this->left, ! *this, ! this->mutex())); read_stream(in, listener); } --- 7490,7501 ---- } else { using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->left_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->left, ! *this, ! this->mutex())); read_stream(in, listener); } *************** *** 7467,7477 **** } else { using std::auto_ptr; ! auto_ptr<resource_istream> ! in(this->scene() ! ->get_resource(this->right_url_.mfstring::value())); ! auto_ptr<stream_listener> ! listener(new image_stream_listener(this->right, ! *this, ! this->mutex())); read_stream(in, listener); } --- 7507,7518 ---- } else { using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->right_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->right, ! *this, ! this->mutex())); read_stream(in, listener); } *************** *** 7483,7493 **** } else { using std::auto_ptr; ! auto_ptr<resource_istream> ! in(this->scene() ! ->get_resource(this->top_url_.mfstring::value())); ! auto_ptr<stream_listener> ! listener(new image_stream_listener(this->top, ! *this, ! this->mutex())); read_stream(in, listener); } --- 7524,7535 ---- } else { using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->top_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->top, ! *this, ! this->mutex())); read_stream(in, listener); } *************** *** 7499,7509 **** } else { using std::auto_ptr; ! auto_ptr<resource_istream> ! in(this->scene() ! ->get_resource(this->bottom_url_.mfstring::value())); ! auto_ptr<stream_listener> ! listener(new image_stream_listener(this->bottom, ! *this, ! this->mutex())); read_stream(in, listener); } --- 7541,7552 ---- } else { using std::auto_ptr; ! auto_ptr<resource_istream> in( ! this->scene()->get_resource( ! this->bottom_url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->bottom, ! *this, ! this->mutex())); read_stream(in, listener); } *************** *** 12900,12907 **** auto_ptr<resource_istream> in( this->scene()->get_resource(this->url_.mfstring::value())); ! auto_ptr<stream_listener> ! listener(new image_stream_listener(this->image_, ! *this, ! this->mutex())); read_stream(in, listener); } --- 12943,12951 ---- auto_ptr<resource_istream> in( this->scene()->get_resource(this->url_.mfstring::value())); ! auto_ptr<stream_listener> listener( ! new image_stream_listener(in->url(), ! this->image_, ! *this, ! this->mutex())); read_stream(in, listener); } |
|
From: Braden M. <br...@us...> - 2006-06-07 18:06:50
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22088 Modified Files: ChangeLog Log Message: Provide an error handler for libjpeg; the default one calls exit. Instead, print the error message using openvrml::browser::err. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1255 retrieving revision 1.1256 diff -C2 -d -r1.1255 -r1.1256 *** ChangeLog 19 May 2006 21:55:07 -0000 1.1255 --- ChangeLog 7 Jun 2006 14:36:45 -0000 1.1256 *************** *** 1,2 **** --- 1,29 ---- + 2006-06-07 Braden McDaniel <br...@en...> + + Provide an error handler for libjpeg; the default one calls exit. + Instead, print the error message using openvrml::browser::err. + + * src/libopenvrml/openvrml/vrml97node.cpp + (openvrml_jpeg_error_exit): Added callback to handle the error + without calling exit. + (openvrml_jpeg_output_message): Added callback to print the error + message using openvrml::browser::err. + (image_stream_listener): Added uri_ member; made + openvrml_jpeg_error_exit and openvrml_jpeg_output_message friends. + (image_stream_listener::jpeg_reader): Moved error_mgr from private + to public. + (image_stream_listener::jpeg_reader::error_mgr): Added + stream_listener member. + (image_stream_listener::jpeg_reader::jpeg_reader(image_stream_listener&)): + Set error_exit and output_message callbacks for the error_mgr; + initialize error_mgr_'s image_stream_listener pointer. + (image_stream_listener::image_stream_listener(const std::string &, + openvrml::image &, openvrml::node &, boost::recursive_mutex &)): + Construct using the stream URI. + (background_node::update_textures()): Construct + image_stream_listener with the stream URI. + (image_texture_node::update_textures()): Construct + image_stream_listener with the stream URI. + 2006-05-19 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-05-19 21:55:10
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9136 Modified Files: ChangeLog Log Message: Added OPENVRML_API to friend declaration of operator==(const node_type &, const node_type &). Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1254 retrieving revision 1.1255 diff -C2 -d -r1.1254 -r1.1255 *** ChangeLog 19 May 2006 21:52:43 -0000 1.1254 --- ChangeLog 19 May 2006 21:55:07 -0000 1.1255 *************** *** 1,4 **** --- 1,10 ---- 2006-05-19 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.h + (openvrml::browser): Added OPENVRML_API to friend declaration of + operator==(const node_type &, const node_type &). + + 2006-05-19 Braden McDaniel <br...@en...> + * src/libopenvrml-gl/openvrml/gl/viewer.h (openvrml::gl::viewer::modelview_matrix_stack): Added missing |
|
From: Braden M. <br...@us...> - 2006-05-19 21:55:10
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9136/src/libopenvrml/openvrml Modified Files: browser.h Log Message: Added OPENVRML_API to friend declaration of operator==(const node_type &, const node_type &). Index: browser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** browser.h 18 May 2006 04:11:30 -0000 1.59 --- browser.h 19 May 2006 21:55:08 -0000 1.60 *************** *** 172,176 **** friend class Vrml97Parser; friend class X3DVrmlParser; ! friend bool operator==(const node_type &, const node_type &) OPENVRML_NOTHROW; --- 172,176 ---- friend class Vrml97Parser; friend class X3DVrmlParser; ! friend bool OPENVRML_API operator==(const node_type &, const node_type &) OPENVRML_NOTHROW; |
|
From: Braden M. <br...@us...> - 2006-05-19 21:52:46
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8024/src/libopenvrml-gl/openvrml/gl Modified Files: viewer.h Log Message: Added missing OPENVRML_LOCAL. Index: viewer.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** viewer.h 12 Feb 2006 09:40:17 -0000 1.13 --- viewer.h 19 May 2006 21:52:43 -0000 1.14 *************** *** 79,83 **** }; ! class modelview_matrix_stack { size_t size; std::stack<mat4f> spillover; --- 79,83 ---- }; ! class OPENVRML_LOCAL modelview_matrix_stack { size_t size; std::stack<mat4f> spillover; |
|
From: Braden M. <br...@us...> - 2006-05-19 21:52:46
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8024 Modified Files: ChangeLog Log Message: Added missing OPENVRML_LOCAL. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1253 retrieving revision 1.1254 diff -C2 -d -r1.1253 -r1.1254 *** ChangeLog 19 May 2006 21:47:01 -0000 1.1253 --- ChangeLog 19 May 2006 21:52:43 -0000 1.1254 *************** *** 1,4 **** --- 1,10 ---- 2006-05-19 Braden McDaniel <br...@en...> + * src/libopenvrml-gl/openvrml/gl/viewer.h + (openvrml::gl::viewer::modelview_matrix_stack): Added missing + OPENVRML_LOCAL. + + 2006-05-19 Braden McDaniel <br...@en...> + Microsoft Visual Studio project file updates. |
|
From: Braden M. <br...@us...> - 2006-05-19 21:47:12
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5348/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl Modified Files: openvrml-gl.vcproj Log Message: Microsoft Visual Studio project file updates. Index: openvrml-gl.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** openvrml-gl.vcproj 8 Mar 2006 22:39:00 -0000 1.6 --- openvrml-gl.vcproj 19 May 2006 21:47:02 -0000 1.7 *************** *** 109,113 **** OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="4" CharacterSet="2"> <Tool --- 109,113 ---- OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="2" CharacterSet="2"> <Tool *************** *** 130,134 **** Name="VCCustomBuildTool"/> <Tool ! Name="VCLibrarianTool"/> <Tool Name="VCMIDLTool"/> --- 130,135 ---- Name="VCCustomBuildTool"/> <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib glu32.lib"/> <Tool Name="VCMIDLTool"/> *************** *** 147,150 **** --- 148,153 ---- Name="VCXMLDataGeneratorTool"/> <Tool + Name="VCWebDeploymentTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool *************** *** 178,182 **** Name="VCCustomBuildTool"/> <Tool ! Name="VCLinkerTool"/> <Tool Name="VCMIDLTool"/> --- 181,186 ---- Name="VCCustomBuildTool"/> <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib glu32.lib"/> <Tool Name="VCMIDLTool"/> |
|
From: Braden M. <br...@us...> - 2006-05-19 21:47:11
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5348/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml Modified Files: openvrml.vcproj Log Message: Microsoft Visual Studio project file updates. Index: openvrml.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** openvrml.vcproj 21 Feb 2006 23:01:02 -0000 1.3 --- openvrml.vcproj 19 May 2006 21:47:02 -0000 1.4 *************** *** 43,47 **** Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" MinimalRebuild="true" BasicRuntimeChecks="0" --- 43,47 ---- Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" MinimalRebuild="true" BasicRuntimeChecks="0" *************** *** 115,119 **** OmitFramePointers="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" StringPooling="true" RuntimeLibrary="2" --- 115,119 ---- OmitFramePointers="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" StringPooling="true" RuntimeLibrary="2" *************** *** 184,188 **** Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.15.99\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL" MinimalRebuild="true" BasicRuntimeChecks="0" --- 184,188 ---- Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.15.99\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL" MinimalRebuild="true" BasicRuntimeChecks="0" *************** *** 265,269 **** WholeProgramOptimization="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.15.99\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL" StringPooling="true" RuntimeLibrary="2" --- 265,269 ---- WholeProgramOptimization="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.15.99\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL" StringPooling="true" RuntimeLibrary="2" *************** *** 455,458 **** --- 455,522 ---- </FileConfiguration> </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_cad_geometry.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_core.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_dis.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_environmental_effects.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_event_utilities.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_geometry2d.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_geospatial.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_grouping.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_hanim.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_interpolation.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_key_device_sensor.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_networking.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_nurbs.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_rendering.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_shape.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_texturing.cpp" + > + </File> </Filter> <Filter *************** *** 544,547 **** --- 608,675 ---- > </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_cad_geometry.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_core.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_dis.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_environmental_effects.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_event_utilities.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_geometry2d.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_geospatial.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_grouping.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_hanim.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_interpolation.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_key_device_sensor.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_networking.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_nurbs.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_rendering.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_shape.h" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_texturing.h" + > + </File> </Filter> <Filter |
|
From: Braden M. <br...@us...> - 2006-05-19 21:47:11
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5348/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml Modified Files: openvrml.vcproj Log Message: Microsoft Visual Studio project file updates. Index: openvrml.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml/openvrml.vcproj,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** openvrml.vcproj 8 Mar 2006 22:39:00 -0000 1.12 --- openvrml.vcproj 19 May 2006 21:47:02 -0000 1.13 *************** *** 23,27 **** Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" MinimalRebuild="TRUE" BasicRuntimeChecks="0" --- 23,27 ---- Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" MinimalRebuild="TRUE" BasicRuntimeChecks="0" *************** *** 72,76 **** OmitFramePointers="TRUE" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" StringPooling="TRUE" RuntimeLibrary="2" --- 72,76 ---- OmitFramePointers="TRUE" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" StringPooling="TRUE" RuntimeLibrary="2" *************** *** 119,123 **** Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" MinimalRebuild="TRUE" BasicRuntimeChecks="0" --- 119,123 ---- Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" MinimalRebuild="TRUE" BasicRuntimeChecks="0" *************** *** 170,174 **** OmitFramePointers="TRUE" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" StringPooling="TRUE" RuntimeLibrary="2" --- 170,174 ---- OmitFramePointers="TRUE" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" StringPooling="TRUE" RuntimeLibrary="2" *************** *** 285,291 **** Name="VCCLCompilerTool" Optimization="0" ! EnableFunctionLevelLinking="FALSE"/> </FileConfiguration> </File> </Filter> <Filter --- 285,340 ---- Name="VCCLCompilerTool" Optimization="0" ! EnableFunctionLevelLinking="FALSE" ! DebugInformationFormat="2"/> </FileConfiguration> </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_cad_geometry.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_core.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_dis.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_environmental_effects.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_event_utilities.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_geometry2d.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_geospatial.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_grouping.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_hanim.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_interpolation.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_key_device_sensor.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_networking.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_nurbs.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_rendering.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_shape.cpp"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_texturing.cpp"> + </File> </Filter> <Filter *************** *** 355,358 **** --- 404,455 ---- RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\Vrml97ParserTokenTypes.hpp"> </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_cad_geometry.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_core.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_dis.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_environmental_effects.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_event_utilities.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_geometry2d.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_geospatial.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_grouping.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_hanim.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_interpolation.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_key_device_sensor.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_networking.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_nurbs.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_rendering.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_shape.h"> + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_texturing.h"> + </File> </Filter> <Filter |
|
From: Braden M. <br...@us...> - 2006-05-19 21:47:11
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5348/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer Modified Files: sdl-viewer.vcproj Log Message: Microsoft Visual Studio project file updates. Index: sdl-viewer.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sdl-viewer.vcproj 21 Feb 2006 23:01:02 -0000 1.3 --- sdl-viewer.vcproj 19 May 2006 21:47:02 -0000 1.4 *************** *** 216,220 **** Detect64BitPortabilityProblems="true" DebugInformationFormat="4" ! DisableSpecificWarnings="4250;4290;4355" /> <Tool --- 216,220 ---- Detect64BitPortabilityProblems="true" DebugInformationFormat="4" ! DisableSpecificWarnings="4250;4251;4275;4290;4355" /> <Tool |
|
From: Braden M. <br...@us...> - 2006-05-19 21:47:11
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5348/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Modified Files: openvrml-gl.vcproj Log Message: Microsoft Visual Studio project file updates. Index: openvrml-gl.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** openvrml-gl.vcproj 21 Feb 2006 23:01:02 -0000 1.3 --- openvrml-gl.vcproj 19 May 2006 21:47:02 -0000 1.4 *************** *** 191,195 **** Detect64BitPortabilityProblems="true" DebugInformationFormat="4" ! DisableSpecificWarnings="4099;4250;4290;4800" /> <Tool --- 191,195 ---- Detect64BitPortabilityProblems="true" DebugInformationFormat="4" ! DisableSpecificWarnings="4099;4250;4251;4275;4290;4800" /> <Tool |
|
From: Braden M. <br...@us...> - 2006-05-19 21:47:07
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5348 Modified Files: ChangeLog Log Message: Microsoft Visual Studio project file updates. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1252 retrieving revision 1.1253 diff -C2 -d -r1.1252 -r1.1253 *** ChangeLog 19 May 2006 17:32:49 -0000 1.1252 --- ChangeLog 19 May 2006 21:47:01 -0000 1.1253 *************** *** 1,4 **** --- 1,14 ---- 2006-05-19 Braden McDaniel <br...@en...> + Microsoft Visual Studio project file updates. + + * ide-projects/Windows/VisualC7_1/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl/openvrml-gl.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj + + 2006-05-19 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/node.h (node_metatype_id): The Microsoft compiler wants OPENVRML_API in |
|
From: Braden M. <br...@us...> - 2006-05-19 17:33:54
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23299/src/libopenvrml/openvrml Modified Files: node.h Log Message: The Microsoft compiler wants OPENVRML_API in the friend declaration. Index: node.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.h,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** node.h 18 May 2006 04:11:31 -0000 1.55 --- node.h 19 May 2006 17:32:49 -0000 1.56 *************** *** 183,188 **** class OPENVRML_API node_metatype_id { ! friend bool operator==(const node_metatype_id & lhs, ! const node_metatype_id & rhs) OPENVRML_NOTHROW; --- 183,188 ---- class OPENVRML_API node_metatype_id { ! friend OPENVRML_API bool operator==(const node_metatype_id & lhs, ! const node_metatype_id & rhs) OPENVRML_NOTHROW; |
|
From: Braden M. <br...@us...> - 2006-05-19 17:32:56
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23299 Modified Files: ChangeLog Log Message: The Microsoft compiler wants OPENVRML_API in the friend declaration. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1251 retrieving revision 1.1252 diff -C2 -d -r1.1251 -r1.1252 *** ChangeLog 18 May 2006 22:20:46 -0000 1.1251 --- ChangeLog 19 May 2006 17:32:49 -0000 1.1252 *************** *** 1,2 **** --- 1,8 ---- + 2006-05-19 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/node.h + (node_metatype_id): The Microsoft compiler wants OPENVRML_API in + the friend declaration. + 2006-05-18 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-05-18 22:20:52
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23521 Modified Files: ChangeLog Log Message: Set the command channel encoding to null (i.e., no encoding). Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1250 retrieving revision 1.1251 diff -C2 -d -r1.1250 -r1.1251 *** ChangeLog 18 May 2006 07:09:57 -0000 1.1250 --- ChangeLog 18 May 2006 22:20:46 -0000 1.1251 *************** *** 1,4 **** --- 1,10 ---- 2006-05-18 Braden McDaniel <br...@en...> + * mozilla-plugin/src/openvrml.cpp + (PluginInstance::SetWindow(NPWindow &)): Set the command channel + encoding to null (i.e., no encoding). + + 2006-05-18 Braden McDaniel <br...@en...> + Implemented Browser.createVrmlFromURL() in the Script node JavaScript binding. |
|
From: Braden M. <br...@us...> - 2006-05-18 22:20:52
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23521/mozilla-plugin/src Modified Files: openvrml.cpp Log Message: Set the command channel encoding to null (i.e., no encoding). Index: openvrml.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** openvrml.cpp 15 May 2006 05:51:59 -0000 1.32 --- openvrml.cpp 18 May 2006 22:20:47 -0000 1.33 *************** *** 1152,1155 **** --- 1152,1169 ---- this->command_channel = g_io_channel_unix_new(standard_input); if (!this->command_channel) { throw std::bad_alloc(); } + const GIOStatus status = + g_io_channel_set_encoding(this->command_channel, + 0, // binary (no encoding) + &error); + if (status != G_IO_STATUS_NORMAL) { + if (error) { + g_critical(error->message); + g_error_free(error); + } + // XXX + // XXX Should probably throw here instead. + // XXX + return; + } this->request_channel = g_io_channel_unix_new(standard_output); |
