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...> |