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-12-30 23:37:45
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22542 Modified Files: ChangeLog NEWS README configure.ac Log Message: Updates for the 0.16.3 release. Index: README =================================================================== RCS file: /cvsroot/openvrml/openvrml/README,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** README 29 Nov 2006 19:04:48 -0000 1.74 --- README 30 Dec 2006 23:37:43 -0000 1.75 *************** *** 1,3 **** ! OpenVRML library version 0.16.2 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 --- 1,3 ---- ! OpenVRML library version 0.16.3 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Index: NEWS =================================================================== RCS file: /cvsroot/openvrml/openvrml/NEWS,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** NEWS 29 Nov 2006 19:04:48 -0000 1.41 --- NEWS 30 Dec 2006 23:37:43 -0000 1.42 *************** *** 1,2 **** --- 1,25 ---- + Changes new in version 0.16.3, 30 December, 2006 + ======================================================================== + + - Changed openvrml-gtkplug only to expect an initial stream when + passed the --initial-stream argument. + + - Fixed deadlocks in openvrml-gtkplug. + + - Fixed a bug in openvrml-gtkplug that caused it to consume 100% of + the CPU. + + - Fixed relative URI resolution on Windows. + + - Mozilla plug-in now registers itself as a handler for + model/x3d+vrml. + + - Fixes for compiling on Mac OS X PPC. + + - Fixes for compiling with Apple's OpenGL framework. + + - Fixes for compiling with Microsoft Visual C++ 8.0 Service Pack 1. + + Changes new in version 0.16.2, 29 November, 2006 ======================================================================== Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** configure.ac 4 Dec 2006 05:18:07 -0000 1.103 --- configure.ac 30 Dec 2006 23:37:43 -0000 1.104 *************** *** 1,3 **** ! AC_INIT([OpenVRML], [0.16.2], [ope...@li...]) AC_PREREQ([2.53]) AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Braden McDaniel]) --- 1,3 ---- ! AC_INIT([OpenVRML], [0.16.3], [ope...@li...]) AC_PREREQ([2.53]) AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Braden McDaniel]) Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1402 retrieving revision 1.1403 diff -C2 -d -r1.1402 -r1.1403 *** ChangeLog 28 Dec 2006 23:12:19 -0000 1.1402 --- ChangeLog 30 Dec 2006 23:37:43 -0000 1.1403 *************** *** 1,2 **** --- 1,21 ---- + 2006-12-30 Braden McDaniel <br...@en...> + + Updates for the 0.16.3 release. + + * NEWS: Updated for 0.16.3 release. + * README: Updated for 0.16.3 release. + * configure.ac: Updated for 0.16.3 release. + * doc/Doxyfile: Updated for 0.16.3 release. + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.rc: + Updated for 0.16.3 release. + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj: + Updated for 0.16.3 release. + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.rc: + Updated for 0.16.3 release. + * mozilla-plugin/configure.ac: Updated for 0.16.3 release. + * src/libopenvrml/Makefile.am: Updated libtool library version number. + * src/libopenvrml-gl/Makefile.am: Updated libtool library version + number. + 2006-12-28 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-12-30 23:37:45
|
Update of /cvsroot/openvrml/openvrml/doc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22542/doc Modified Files: Doxyfile Log Message: Updates for the 0.16.3 release. Index: Doxyfile =================================================================== RCS file: /cvsroot/openvrml/openvrml/doc/Doxyfile,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Doxyfile 29 Nov 2006 19:04:48 -0000 1.25 --- Doxyfile 30 Dec 2006 23:37:43 -0000 1.26 *************** *** 5,9 **** #--------------------------------------------------------------------------- PROJECT_NAME = OpenVRML ! PROJECT_NUMBER = 0.16.2 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO --- 5,9 ---- #--------------------------------------------------------------------------- PROJECT_NAME = OpenVRML ! PROJECT_NUMBER = 0.16.3 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO |
|
From: Braden M. <br...@us...> - 2006-12-30 23:37:08
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22335/src/libopenvrml Modified Files: Tag: OpenVRML-0_16-BRANCH Makefile.am Log Message: Updates for the 0.16.3 release. Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/Makefile.am,v retrieving revision 1.37.2.2 retrieving revision 1.37.2.3 diff -C2 -d -r1.37.2.2 -r1.37.2.3 *** Makefile.am 29 Nov 2006 19:04:36 -0000 1.37.2.2 --- Makefile.am 30 Dec 2006 23:37:07 -0000 1.37.2.3 *************** *** 63,67 **** $(X3DVRMLPARSER_BUILT_SOURCEFILES) ! LIBRARY_VERSION = 7:1:1 # | | | # +------+ | +---+ --- 63,67 ---- $(X3DVRMLPARSER_BUILT_SOURCEFILES) ! LIBRARY_VERSION = 7:2:1 # | | | # +------+ | +---+ |
|
From: Braden M. <br...@us...> - 2006-12-30 23:37:08
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22335/mozilla-plugin Modified Files: Tag: OpenVRML-0_16-BRANCH configure.ac Log Message: Updates for the 0.16.3 release. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/configure.ac,v retrieving revision 1.14.2.5 retrieving revision 1.14.2.6 diff -C2 -d -r1.14.2.5 -r1.14.2.6 *** configure.ac 29 Nov 2006 19:04:36 -0000 1.14.2.5 --- configure.ac 30 Dec 2006 23:37:07 -0000 1.14.2.6 *************** *** 1,4 **** AC_PREREQ([2.53]) ! AC_INIT([OpenVRML Mozilla Plugin], [0.16.2], [ope...@li...]) AC_COPYRIGHT([Portions copyright 2004, 2005, 2006 Braden McDaniel]) --- 1,4 ---- AC_PREREQ([2.53]) ! AC_INIT([OpenVRML Mozilla Plugin], [0.16.3], [ope...@li...]) AC_COPYRIGHT([Portions copyright 2004, 2005, 2006 Braden McDaniel]) |
|
From: Braden M. <br...@us...> - 2006-12-30 23:37:08
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22335/src/libopenvrml-gl Modified Files: Tag: OpenVRML-0_16-BRANCH Makefile.am Log Message: Updates for the 0.16.3 release. Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/Makefile.am,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** Makefile.am 28 Oct 2006 07:08:44 -0000 1.6.2.1 --- Makefile.am 30 Dec 2006 23:37:07 -0000 1.6.2.2 *************** *** 1,3 **** ! LIBRARY_VERSION = 6:3:0 # | | | # +------+ | +---+ --- 1,3 ---- ! LIBRARY_VERSION = 6:4:0 # | | | # +------+ | +---+ |
|
From: Braden M. <br...@us...> - 2006-12-30 23:37:08
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22335/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml-gl.rc Log Message: Updates for the 0.16.3 release. Index: openvrml-gl.rc =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.rc,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** openvrml-gl.rc 29 Nov 2006 19:04:36 -0000 1.1.2.3 --- openvrml-gl.rc 30 Dec 2006 23:37:07 -0000 1.1.2.4 *************** *** 54,59 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 6,3,0,0 ! PRODUCTVERSION 0,16,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG --- 54,59 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 6,4,0,0 ! PRODUCTVERSION 0,16,3,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG *************** *** 71,80 **** BEGIN VALUE "FileDescription", "OpenVRML OpenGL Renderer Library" ! VALUE "FileVersion", "6, 3, 0, 0" VALUE "InternalName", "openvrml-gl" VALUE "LegalCopyright", "Copyright (C) 2006" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" ! VALUE "ProductVersion", "0.16.2" END END --- 71,80 ---- BEGIN VALUE "FileDescription", "OpenVRML OpenGL Renderer Library" ! VALUE "FileVersion", "6, 4, 0, 0" VALUE "InternalName", "openvrml-gl" VALUE "LegalCopyright", "Copyright (C) 2006" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" ! VALUE "ProductVersion", "0.16.3" END END |
|
From: Braden M. <br...@us...> - 2006-12-30 23:37:08
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22335/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml.rc openvrml.vcproj Log Message: Updates for the 0.16.3 release. Index: openvrml.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -C2 -d -r1.4.2.5 -r1.4.2.6 *** openvrml.vcproj 29 Nov 2006 19:04:36 -0000 1.4.2.5 --- openvrml.vcproj 30 Dec 2006 23:37:07 -0000 1.4.2.6 *************** *** 43,47 **** Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.16.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL" MinimalRebuild="true" BasicRuntimeChecks="0" --- 43,47 ---- Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.16.3\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL" MinimalRebuild="true" BasicRuntimeChecks="0" *************** *** 127,131 **** WholeProgramOptimization="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.16.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL" StringPooling="true" RuntimeLibrary="2" --- 127,131 ---- WholeProgramOptimization="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" ! PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.16.3\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL" StringPooling="true" RuntimeLibrary="2" Index: openvrml.rc =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.rc,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** openvrml.rc 29 Nov 2006 19:04:36 -0000 1.1.2.3 --- openvrml.rc 30 Dec 2006 23:37:07 -0000 1.1.2.4 *************** *** 54,59 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 7,1,1,0 ! PRODUCTVERSION 0,16,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG --- 54,59 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 7,2,1,0 ! PRODUCTVERSION 0,16,3,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG *************** *** 71,80 **** BEGIN VALUE "FileDescription", "OpenVRML Library" ! VALUE "FileVersion", "7, 1, 1, 0" VALUE "InternalName", "openvrml" VALUE "LegalCopyright", "Copyright (C) 2006" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" ! VALUE "ProductVersion", "0.16.2" END END --- 71,80 ---- BEGIN VALUE "FileDescription", "OpenVRML Library" ! VALUE "FileVersion", "7, 2, 1, 0" VALUE "InternalName", "openvrml" VALUE "LegalCopyright", "Copyright (C) 2006" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" ! VALUE "ProductVersion", "0.16.3" END END |
|
From: Braden M. <br...@us...> - 2006-12-30 23:37:08
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22335 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog NEWS README configure.ac Log Message: Updates for the 0.16.3 release. Index: README =================================================================== RCS file: /cvsroot/openvrml/openvrml/README,v retrieving revision 1.65.2.9 retrieving revision 1.65.2.10 diff -C2 -d -r1.65.2.9 -r1.65.2.10 *** README 29 Nov 2006 19:04:36 -0000 1.65.2.9 --- README 30 Dec 2006 23:37:06 -0000 1.65.2.10 *************** *** 1,3 **** ! OpenVRML library version 0.16.2 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 --- 1,3 ---- ! OpenVRML library version 0.16.3 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Index: NEWS =================================================================== RCS file: /cvsroot/openvrml/openvrml/NEWS,v retrieving revision 1.38.2.3 retrieving revision 1.38.2.4 diff -C2 -d -r1.38.2.3 -r1.38.2.4 *** NEWS 29 Nov 2006 19:04:36 -0000 1.38.2.3 --- NEWS 30 Dec 2006 23:37:06 -0000 1.38.2.4 *************** *** 1,2 **** --- 1,25 ---- + Changes new in version 0.16.3, 30 December, 2006 + ======================================================================== + + - Changed openvrml-gtkplug only to expect an initial stream when + passed the --initial-stream argument. + + - Fixed deadlocks in openvrml-gtkplug. + + - Fixed a bug in openvrml-gtkplug that caused it to consume 100% of + the CPU. + + - Fixed relative URI resolution on Windows. + + - Mozilla plug-in now registers itself as a handler for + model/x3d+vrml. + + - Fixes for compiling on Mac OS X PPC. + + - Fixes for compiling with Apple's OpenGL framework. + + - Fixes for compiling with Microsoft Visual C++ 8.0 Service Pack 1. + + Changes new in version 0.16.2, 29 November, 2006 ======================================================================== Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.92.2.10 retrieving revision 1.92.2.11 diff -C2 -d -r1.92.2.10 -r1.92.2.11 *** configure.ac 4 Dec 2006 05:17:57 -0000 1.92.2.10 --- configure.ac 30 Dec 2006 23:37:06 -0000 1.92.2.11 *************** *** 1,3 **** ! AC_INIT([OpenVRML], [0.16.2], [ope...@li...]) AC_PREREQ([2.53]) AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Braden McDaniel]) --- 1,3 ---- ! AC_INIT([OpenVRML], [0.16.3], [ope...@li...]) AC_PREREQ([2.53]) AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Braden McDaniel]) Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.79 retrieving revision 1.1310.2.80 diff -C2 -d -r1.1310.2.79 -r1.1310.2.80 *** ChangeLog 28 Dec 2006 23:10:56 -0000 1.1310.2.79 --- ChangeLog 30 Dec 2006 23:37:05 -0000 1.1310.2.80 *************** *** 1,2 **** --- 1,21 ---- + 2006-12-30 Braden McDaniel <br...@en...> + + Updates for the 0.16.3 release. + + * NEWS: Updated for 0.16.3 release. + * README: Updated for 0.16.3 release. + * configure.ac: Updated for 0.16.3 release. + * doc/Doxyfile: Updated for 0.16.3 release. + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.rc: + Updated for 0.16.3 release. + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj: + Updated for 0.16.3 release. + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.rc: + Updated for 0.16.3 release. + * mozilla-plugin/configure.ac: Updated for 0.16.3 release. + * src/libopenvrml/Makefile.am: Updated libtool library version number. + * src/libopenvrml-gl/Makefile.am: Updated libtool library version + number. + 2006-12-28 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-12-30 23:37:08
|
Update of /cvsroot/openvrml/openvrml/doc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22335/doc Modified Files: Tag: OpenVRML-0_16-BRANCH Doxyfile Log Message: Updates for the 0.16.3 release. Index: Doxyfile =================================================================== RCS file: /cvsroot/openvrml/openvrml/doc/Doxyfile,v retrieving revision 1.23.2.2 retrieving revision 1.23.2.3 diff -C2 -d -r1.23.2.2 -r1.23.2.3 *** Doxyfile 29 Nov 2006 19:04:36 -0000 1.23.2.2 --- Doxyfile 30 Dec 2006 23:37:07 -0000 1.23.2.3 *************** *** 5,9 **** #--------------------------------------------------------------------------- PROJECT_NAME = OpenVRML ! PROJECT_NUMBER = 0.16.2 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO --- 5,9 ---- #--------------------------------------------------------------------------- PROJECT_NAME = OpenVRML ! PROJECT_NUMBER = 0.16.3 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO |
|
From: Braden M. <br...@us...> - 2006-12-28 23:12:25
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11585/src/libopenvrml/openvrml Modified Files: browser.cpp vrml97node.cpp Log Message: Microsoft cl 14.00.50727.762 (Visual C++ 8.0 SP1) is consistent in its lack of support for function try blocks. The previous release (14.00.50727.42) was hit-or-miss. This changes code that the newer compiler complains about. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.198 retrieving revision 1.199 diff -C2 -d -r1.198 -r1.199 *** browser.cpp 6 Dec 2006 01:52:58 -0000 1.198 --- browser.cpp 28 Dec 2006 23:12:20 -0000 1.199 *************** *** 3638,3718 **** void operator()() const OPENVRML_NOTHROW ! try { ! using openvrml::unreachable_url; try { ! using namespace openvrml; ! using std::auto_ptr; ! using std::ostringstream; ! using std::string; ! using std::vector; ! using boost::dynamic_pointer_cast; ! using boost::shared_ptr; ! using openvrml_::scope_guard; ! using openvrml_::make_obj_guard; ! scope_guard guard = ! make_obj_guard( ! *this->externproto_node_metatype_, ! &externproto_node_metatype::clear_externproto_node_types); ! boost::ignore_unused_variable_warning(guard); ! auto_ptr<resource_istream> in = ! this->scene_->get_resource(this->alt_uris_); ! if (!(*in)) { throw unreachable_url(); } ! // ! // We don't actually do anything with these; but the parser ! // wants them. ! // ! vector<boost::intrusive_ptr<node> > nodes; ! std::map<string, string> meta; ! parse_vrml(*in, in->url(), in->type(), ! *this->scene_, nodes, meta); ! shared_ptr<openvrml::proto_node_metatype> proto_node_metatype; ! for (vector<string>::const_iterator alt_uri = ! this->alt_uris_.begin(); ! alt_uri != this->alt_uris_.end() && !proto_node_metatype; ! ++alt_uri) { ! const uri absolute_uri = !relative(uri(*alt_uri)) ! ? uri(*alt_uri) ! : this->scene_->url().empty() ! ? create_file_url(uri(*alt_uri)) ! : uri(*alt_uri).resolve_against( ! uri(this->scene_->url())); ! const shared_ptr<openvrml::node_metatype> node_metatype = ! this->scene_->browser() ! .node_metatype(node_metatype_id(absolute_uri)); ! proto_node_metatype = ! dynamic_pointer_cast<openvrml::proto_node_metatype>( ! node_metatype); ! } ! if (!proto_node_metatype) { ! ostringstream err_msg; ! err_msg << "no PROTO definition at <" << in->url() << ">"; ! this->scene_->browser().err(err_msg.str()); ! return; ! } ! this->externproto_node_metatype_ ! ->set_proto_node_metatype(proto_node_metatype); } catch (std::exception & ex) { this->scene_->browser().err(ex.what()); - throw unreachable_url(); - } catch (...) { - // - // The implementation of resource_istream is provided by - // the user; and unfortunately, operations on it could - // throw anything. - // - throw unreachable_url(); } - } catch (std::exception & ex) { - this->scene_->browser().err(ex.what()); } --- 3638,3724 ---- void operator()() const OPENVRML_NOTHROW ! { try { ! using openvrml::unreachable_url; ! try { ! using namespace openvrml; ! using std::auto_ptr; ! using std::ostringstream; ! using std::string; ! using std::vector; ! using boost::dynamic_pointer_cast; ! using boost::shared_ptr; ! using openvrml_::scope_guard; ! using openvrml_::make_obj_guard; ! scope_guard guard = ! make_obj_guard( ! *this->externproto_node_metatype_, ! &externproto_node_metatype::clear_externproto_node_types); ! boost::ignore_unused_variable_warning(guard); ! auto_ptr<resource_istream> in = ! this->scene_->get_resource(this->alt_uris_); ! if (!(*in)) { throw unreachable_url(); } ! // ! // We don't actually do anything with these; but the parser ! // wants them. ! // ! vector<boost::intrusive_ptr<node> > nodes; ! std::map<string, string> meta; ! parse_vrml(*in, in->url(), in->type(), ! *this->scene_, nodes, meta); ! shared_ptr<openvrml::proto_node_metatype> ! proto_node_metatype; ! for (vector<string>::const_iterator alt_uri = ! this->alt_uris_.begin(); ! (alt_uri != this->alt_uris_.end()) ! && !proto_node_metatype; ! ++alt_uri) { ! const uri absolute_uri = !relative(uri(*alt_uri)) ! ? uri(*alt_uri) ! : this->scene_->url().empty() ! ? create_file_url(uri(*alt_uri)) ! : uri(*alt_uri).resolve_against( ! uri(this->scene_->url())); ! const shared_ptr<openvrml::node_metatype> ! node_metatype = ! this->scene_->browser() ! .node_metatype(node_metatype_id(absolute_uri)); ! proto_node_metatype = ! dynamic_pointer_cast<openvrml::proto_node_metatype>( ! node_metatype); ! } ! if (!proto_node_metatype) { ! ostringstream err_msg; ! err_msg << "no PROTO definition at <" << in->url() ! << ">"; ! this->scene_->browser().err(err_msg.str()); ! return; ! } ! this->externproto_node_metatype_ ! ->set_proto_node_metatype(proto_node_metatype); + } catch (std::exception & ex) { + this->scene_->browser().err(ex.what()); + throw unreachable_url(); + } catch (...) { + // + // The implementation of resource_istream is provided by + // the user; and unfortunately, operations on it could + // throw anything. + // + throw unreachable_url(); + } } catch (std::exception & ex) { this->scene_->browser().err(ex.what()); } } *************** *** 6122,6153 **** void operator()() const OPENVRML_NOTHROW ! try { ! boost::recursive_mutex::scoped_lock lock(this->browser_->mutex_); ! using std::endl; ! openvrml::browser & browser = *this->browser_; ! try { ! std::auto_ptr<resource_istream> in = ! browser.scene_->get_resource(this->url_); ! if (!(*in)) { throw unreachable_url(); } ! browser.set_world(*in); ! } catch (antlr::ANTLRException & ex) { ! browser.err(ex.getMessage()); ! } catch (invalid_vrml & ex) { ! std::ostringstream out; ! out << ex.url << ':' << ex.line << ':' << ex.column << ": error: " ! << ex.what(); ! browser.err(out.str()); ! } catch (unreachable_url &) { ! throw; ! } catch (std::exception & ex) { ! browser.err(ex.what()); ! } catch (...) { ! throw unreachable_url(); } - } catch (unreachable_url & ex) { - this->browser_->err(ex.what()); } --- 6128,6161 ---- void operator()() const OPENVRML_NOTHROW ! { ! try { ! boost::recursive_mutex::scoped_lock lock(this->browser_->mutex_); ! using std::endl; ! openvrml::browser & browser = *this->browser_; ! try { ! std::auto_ptr<resource_istream> in = ! browser.scene_->get_resource(this->url_); ! if (!(*in)) { throw unreachable_url(); } ! browser.set_world(*in); ! } catch (antlr::ANTLRException & ex) { ! browser.err(ex.getMessage()); ! } catch (invalid_vrml & ex) { ! std::ostringstream out; ! out << ex.url << ':' << ex.line << ':' << ex.column ! << ": error: " << ex.what(); ! browser.err(out.str()); ! } catch (unreachable_url &) { ! throw; ! } catch (std::exception & ex) { ! browser.err(ex.what()); ! } catch (...) { ! throw unreachable_url(); ! } ! } catch (unreachable_url & ex) { ! this->browser_->err(ex.what()); } } *************** *** 6260,6283 **** void operator()() const OPENVRML_NOTHROW ! try { try { ! std::auto_ptr<resource_istream> in = ! this->browser_->scene_->get_resource(*this->url_); ! if (!(*in)) { throw unreachable_url(); } ! mfnode nodes; ! nodes.value(this->browser_->create_vrml_from_stream(*in, in->type())); ! this->listener_->process_event(nodes, browser::current_time()); } catch (std::exception & ex) { this->browser_->err(ex.what()); - throw unreachable_url(); - } catch (...) { - // - // The implementation of resource_istream is provided by the user; - // and unfortunately, operations on it could throw anything. - // - throw unreachable_url(); } - } catch (std::exception & ex) { - this->browser_->err(ex.what()); } --- 6268,6295 ---- void operator()() const OPENVRML_NOTHROW ! { try { ! try { ! std::auto_ptr<resource_istream> in = ! this->browser_->scene_->get_resource(*this->url_); ! if (!(*in)) { throw unreachable_url(); } ! mfnode nodes; ! nodes.value( ! this->browser_->create_vrml_from_stream(*in, in->type())); ! this->listener_->process_event(nodes, browser::current_time()); ! } catch (std::exception & ex) { ! this->browser_->err(ex.what()); ! throw unreachable_url(); ! } catch (...) { ! // ! // The implementation of resource_istream is provided by the ! // user; and unfortunately, operations on it could throw ! // anything. ! // ! throw unreachable_url(); ! } } catch (std::exception & ex) { this->browser_->err(ex.what()); } } Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** vrml97node.cpp 18 Oct 2006 05:56:59 -0000 1.115 --- vrml97node.cpp 28 Dec 2006 23:12:20 -0000 1.116 *************** *** 3889,3893 **** public: explicit string_exposedfield(text_node & node); ! string_exposedfield(const string_exposedfield & obj) OPENVRML_NOTHROW; virtual ~string_exposedfield() OPENVRML_NOTHROW; --- 3889,3894 ---- public: explicit string_exposedfield(text_node & node); ! string_exposedfield(const string_exposedfield & obj) ! OPENVRML_NOTHROW; virtual ~string_exposedfield() OPENVRML_NOTHROW; *************** *** 14142,14174 **** void operator()() const OPENVRML_NOTHROW ! try { ! using std::endl; ! using std::string; ! using std::vector; ! openvrml::scene & inline_scene = *this->inline_scene_; ! const vector<string> & url = *this->url_; ! assert(inline_scene.url().empty()); ! vector<boost::intrusive_ptr<node> > nodes; ! try { ! // ! // Any relative URLs passed here will be relative to the ! // *parent* scene; so we call get_resource on the parent. ! // ! assert(inline_scene.parent()); ! std::auto_ptr<resource_istream> in = ! inline_scene.parent()->get_resource(url); ! if (!(*in)) { throw unreachable_url(); } ! inline_scene.load(*in); } catch (std::exception & ex) { ! inline_scene.browser().err(ex.what()); ! throw unreachable_url(); ! } catch (...) { ! throw unreachable_url(); } - } catch (std::exception & ex) { - this->inline_scene_->browser().err(ex.what()); } --- 14143,14177 ---- void operator()() const OPENVRML_NOTHROW ! { ! try { ! using std::endl; ! using std::string; ! using std::vector; ! openvrml::scene & inline_scene = *this->inline_scene_; ! const vector<string> & url = *this->url_; ! assert(inline_scene.url().empty()); ! vector<boost::intrusive_ptr<node> > nodes; ! try { ! // ! // Any relative URLs passed here will be relative to the ! // *parent* scene; so we call get_resource on the parent. ! // ! assert(inline_scene.parent()); ! std::auto_ptr<resource_istream> in = ! inline_scene.parent()->get_resource(url); ! if (!(*in)) { throw unreachable_url(); } ! inline_scene.load(*in); ! } catch (std::exception & ex) { ! inline_scene.browser().err(ex.what()); ! throw unreachable_url(); ! } catch (...) { ! throw unreachable_url(); ! } } catch (std::exception & ex) { ! this->inline_scene_->browser().err(ex.what()); } } *************** *** 23009,23013 **** && std::equal(faceName, faceName + faceNameLen, valueName.begin())) { ! HRESULT strcat_result = StringCchCat(fontPath, MAX_PATH, fontsPath); --- 23012,23016 ---- && std::equal(faceName, faceName + faceNameLen, valueName.begin())) { ! HRESULT strcat_result = StringCchCat(fontPath, MAX_PATH, fontsPath); |
|
From: Braden M. <br...@us...> - 2006-12-28 23:12:21
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11585 Modified Files: ChangeLog Log Message: Microsoft cl 14.00.50727.762 (Visual C++ 8.0 SP1) is consistent in its lack of support for function try blocks. The previous release (14.00.50727.42) was hit-or-miss. This changes code that the newer compiler complains about. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1401 retrieving revision 1.1402 diff -C2 -d -r1.1401 -r1.1402 *** ChangeLog 28 Dec 2006 20:11:58 -0000 1.1401 --- ChangeLog 28 Dec 2006 23:12:19 -0000 1.1402 *************** *** 1,4 **** --- 1,22 ---- 2006-12-28 Braden McDaniel <br...@en...> + Microsoft cl 14.00.50727.762 (Visual C++ 8.0 SP1) is consistent in + its lack of support for function try blocks. The previous + release (14.00.50727.42) was hit-or-miss. This changes code that + the newer compiler complains about. + + * src/libopenvrml/openvrml/browser.cpp + (externproto_node_metatype::load_proto::operator()() const): + Removed function try block. + (openvrml::browser::root_scene_loader::operator()() const): + Removed function try block. + (openvrml::browser::vrml_from_url_creator::operator()() const): + Removed function try block. + * src/libopenvrml/openvrml/vrml97node.cpp + (inline_node::load_inline_scene::operator()() const): Removed + function try block. + + 2006-12-28 Braden McDaniel <br...@en...> + Fixed position of attribute applied to OpenGL callback functions. |
|
From: Braden M. <br...@us...> - 2006-12-28 23:11:33
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10806 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Microsoft cl 14.00.50727.762 (Visual C++ 8.0 SP1) is consistent in its lack of support for function try blocks. The previous release (14.00.50727.42) was hit-or-miss. This changes code that the newer compiler complains about. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.78 retrieving revision 1.1310.2.79 diff -C2 -d -r1.1310.2.78 -r1.1310.2.79 *** ChangeLog 28 Dec 2006 20:10:24 -0000 1.1310.2.78 --- ChangeLog 28 Dec 2006 23:10:56 -0000 1.1310.2.79 *************** *** 1,4 **** --- 1,22 ---- 2006-12-28 Braden McDaniel <br...@en...> + Microsoft cl 14.00.50727.762 (Visual C++ 8.0 SP1) is consistent in + its lack of support for function try blocks. The previous + release (14.00.50727.42) was hit-or-miss. This changes code that + the newer compiler complains about. + + * src/libopenvrml/openvrml/browser.cpp + (externproto_node_metatype::load_proto::operator()() const): + Removed function try block. + (openvrml::browser::root_scene_loader::operator()() const): + Removed function try block. + (openvrml::browser::vrml_from_url_creator::operator()() const): + Removed function try block. + * src/libopenvrml/openvrml/vrml97node.cpp + (inline_node::load_inline_scene::operator()() const): Removed + function try block. + + 2006-12-28 Braden McDaniel <br...@en...> + Fixed position of attribute applied to OpenGL callback functions. |
|
From: Braden M. <br...@us...> - 2006-12-28 23:11:03
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10806/src/libopenvrml/openvrml Modified Files: Tag: OpenVRML-0_16-BRANCH browser.cpp vrml97node.cpp Log Message: Microsoft cl 14.00.50727.762 (Visual C++ 8.0 SP1) is consistent in its lack of support for function try blocks. The previous release (14.00.50727.42) was hit-or-miss. This changes code that the newer compiler complains about. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.190.2.6 retrieving revision 1.190.2.7 diff -C2 -d -r1.190.2.6 -r1.190.2.7 *** browser.cpp 6 Dec 2006 01:52:49 -0000 1.190.2.6 --- browser.cpp 28 Dec 2006 23:10:57 -0000 1.190.2.7 *************** *** 3636,3716 **** void operator()() const OPENVRML_NOTHROW ! try { ! using openvrml::unreachable_url; try { ! using namespace openvrml; ! using std::auto_ptr; ! using std::ostringstream; ! using std::string; ! using std::vector; ! using boost::dynamic_pointer_cast; ! using boost::shared_ptr; ! using openvrml_::scope_guard; ! using openvrml_::make_obj_guard; ! scope_guard guard = ! make_obj_guard( ! *this->externproto_node_metatype_, ! &externproto_node_metatype::clear_externproto_node_types); ! boost::ignore_unused_variable_warning(guard); ! auto_ptr<resource_istream> in = ! this->scene_->get_resource(this->alt_uris_); ! if (!(*in)) { throw unreachable_url(); } ! // ! // We don't actually do anything with these; but the parser ! // wants them. ! // ! vector<boost::intrusive_ptr<node> > nodes; ! std::map<string, string> meta; ! parse_vrml(*in, in->url(), in->type(), ! *this->scene_, nodes, meta); ! shared_ptr<openvrml::proto_node_metatype> proto_node_metatype; ! for (vector<string>::const_iterator alt_uri = ! this->alt_uris_.begin(); ! alt_uri != this->alt_uris_.end() && !proto_node_metatype; ! ++alt_uri) { ! const uri absolute_uri = !relative(uri(*alt_uri)) ! ? uri(*alt_uri) ! : this->scene_->url().empty() ! ? create_file_url(uri(*alt_uri)) ! : uri(*alt_uri).resolve_against( ! uri(this->scene_->url())); ! const shared_ptr<openvrml::node_metatype> node_metatype = ! this->scene_->browser() ! .node_metatype(node_metatype_id(absolute_uri)); ! proto_node_metatype = ! dynamic_pointer_cast<openvrml::proto_node_metatype>( ! node_metatype); ! } ! if (!proto_node_metatype) { ! ostringstream err_msg; ! err_msg << "no PROTO definition at <" << in->url() << ">"; ! this->scene_->browser().err(err_msg.str()); ! return; ! } ! this->externproto_node_metatype_ ! ->set_proto_node_metatype(proto_node_metatype); } catch (std::exception & ex) { this->scene_->browser().err(ex.what()); - throw unreachable_url(); - } catch (...) { - // - // The implementation of resource_istream is provided by - // the user; and unfortunately, operations on it could - // throw anything. - // - throw unreachable_url(); } - } catch (std::exception & ex) { - this->scene_->browser().err(ex.what()); } --- 3636,3722 ---- void operator()() const OPENVRML_NOTHROW ! { try { ! using openvrml::unreachable_url; ! try { ! using namespace openvrml; ! using std::auto_ptr; ! using std::ostringstream; ! using std::string; ! using std::vector; ! using boost::dynamic_pointer_cast; ! using boost::shared_ptr; ! using openvrml_::scope_guard; ! using openvrml_::make_obj_guard; ! scope_guard guard = ! make_obj_guard( ! *this->externproto_node_metatype_, ! &externproto_node_metatype::clear_externproto_node_types); ! boost::ignore_unused_variable_warning(guard); ! auto_ptr<resource_istream> in = ! this->scene_->get_resource(this->alt_uris_); ! if (!(*in)) { throw unreachable_url(); } ! // ! // We don't actually do anything with these; but the parser ! // wants them. ! // ! vector<boost::intrusive_ptr<node> > nodes; ! std::map<string, string> meta; ! parse_vrml(*in, in->url(), in->type(), ! *this->scene_, nodes, meta); ! shared_ptr<openvrml::proto_node_metatype> ! proto_node_metatype; ! for (vector<string>::const_iterator alt_uri = ! this->alt_uris_.begin(); ! (alt_uri != this->alt_uris_.end()) ! && !proto_node_metatype; ! ++alt_uri) { ! const uri absolute_uri = !relative(uri(*alt_uri)) ! ? uri(*alt_uri) ! : this->scene_->url().empty() ! ? create_file_url(uri(*alt_uri)) ! : uri(*alt_uri).resolve_against( ! uri(this->scene_->url())); ! const shared_ptr<openvrml::node_metatype> ! node_metatype = ! this->scene_->browser() ! .node_metatype(node_metatype_id(absolute_uri)); ! proto_node_metatype = ! dynamic_pointer_cast<openvrml::proto_node_metatype>( ! node_metatype); ! } ! if (!proto_node_metatype) { ! ostringstream err_msg; ! err_msg << "no PROTO definition at <" << in->url() ! << ">"; ! this->scene_->browser().err(err_msg.str()); ! return; ! } ! this->externproto_node_metatype_ ! ->set_proto_node_metatype(proto_node_metatype); + } catch (std::exception & ex) { + this->scene_->browser().err(ex.what()); + throw unreachable_url(); + } catch (...) { + // + // The implementation of resource_istream is provided by + // the user; and unfortunately, operations on it could + // throw anything. + // + throw unreachable_url(); + } } catch (std::exception & ex) { this->scene_->browser().err(ex.what()); } } *************** *** 6088,6119 **** void operator()() const OPENVRML_NOTHROW ! try { ! boost::recursive_mutex::scoped_lock lock(this->browser_->mutex_); ! using std::endl; ! openvrml::browser & browser = *this->browser_; ! try { ! std::auto_ptr<resource_istream> in = ! browser.scene_->get_resource(this->url_); ! if (!(*in)) { throw unreachable_url(); } ! browser.set_world(*in); ! } catch (antlr::ANTLRException & ex) { ! browser.err(ex.getMessage()); ! } catch (invalid_vrml & ex) { ! std::ostringstream out; ! out << ex.url << ':' << ex.line << ':' << ex.column << ": error: " ! << ex.what(); ! browser.err(out.str()); ! } catch (unreachable_url &) { ! throw; ! } catch (std::exception & ex) { ! browser.err(ex.what()); ! } catch (...) { ! throw unreachable_url(); } - } catch (unreachable_url & ex) { - this->browser_->err(ex.what()); } --- 6094,6127 ---- void operator()() const OPENVRML_NOTHROW ! { ! try { ! boost::recursive_mutex::scoped_lock lock(this->browser_->mutex_); ! using std::endl; ! openvrml::browser & browser = *this->browser_; ! try { ! std::auto_ptr<resource_istream> in = ! browser.scene_->get_resource(this->url_); ! if (!(*in)) { throw unreachable_url(); } ! browser.set_world(*in); ! } catch (antlr::ANTLRException & ex) { ! browser.err(ex.getMessage()); ! } catch (invalid_vrml & ex) { ! std::ostringstream out; ! out << ex.url << ':' << ex.line << ':' << ex.column ! << ": error: " << ex.what(); ! browser.err(out.str()); ! } catch (unreachable_url &) { ! throw; ! } catch (std::exception & ex) { ! browser.err(ex.what()); ! } catch (...) { ! throw unreachable_url(); ! } ! } catch (unreachable_url & ex) { ! this->browser_->err(ex.what()); } } *************** *** 6226,6249 **** void operator()() const OPENVRML_NOTHROW ! try { try { ! std::auto_ptr<resource_istream> in = ! this->browser_->scene_->get_resource(*this->url_); ! if (!(*in)) { throw unreachable_url(); } ! mfnode nodes; ! nodes.value(this->browser_->create_vrml_from_stream(*in, in->type())); ! this->listener_->process_event(nodes, browser::current_time()); } catch (std::exception & ex) { this->browser_->err(ex.what()); - throw unreachable_url(); - } catch (...) { - // - // The implementation of resource_istream is provided by the user; - // and unfortunately, operations on it could throw anything. - // - throw unreachable_url(); } - } catch (std::exception & ex) { - this->browser_->err(ex.what()); } --- 6234,6261 ---- void operator()() const OPENVRML_NOTHROW ! { try { ! try { ! std::auto_ptr<resource_istream> in = ! this->browser_->scene_->get_resource(*this->url_); ! if (!(*in)) { throw unreachable_url(); } ! mfnode nodes; ! nodes.value( ! this->browser_->create_vrml_from_stream(*in, in->type())); ! this->listener_->process_event(nodes, browser::current_time()); ! } catch (std::exception & ex) { ! this->browser_->err(ex.what()); ! throw unreachable_url(); ! } catch (...) { ! // ! // The implementation of resource_istream is provided by the ! // user; and unfortunately, operations on it could throw ! // anything. ! // ! throw unreachable_url(); ! } } catch (std::exception & ex) { this->browser_->err(ex.what()); } } Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.108.2.5 retrieving revision 1.108.2.6 diff -C2 -d -r1.108.2.5 -r1.108.2.6 *** vrml97node.cpp 22 Sep 2006 01:04:45 -0000 1.108.2.5 --- vrml97node.cpp 28 Dec 2006 23:10:59 -0000 1.108.2.6 *************** *** 3889,3893 **** public: explicit string_exposedfield(text_node & node); ! string_exposedfield(const string_exposedfield & obj) OPENVRML_NOTHROW; virtual ~string_exposedfield() OPENVRML_NOTHROW; --- 3889,3894 ---- public: explicit string_exposedfield(text_node & node); ! string_exposedfield(const string_exposedfield & obj) ! OPENVRML_NOTHROW; virtual ~string_exposedfield() OPENVRML_NOTHROW; *************** *** 14142,14174 **** void operator()() const OPENVRML_NOTHROW ! try { ! using std::endl; ! using std::string; ! using std::vector; ! openvrml::scene & inline_scene = *this->inline_scene_; ! const vector<string> & url = *this->url_; ! assert(inline_scene.url().empty()); ! vector<boost::intrusive_ptr<node> > nodes; ! try { ! // ! // Any relative URLs passed here will be relative to the ! // *parent* scene; so we call get_resource on the parent. ! // ! assert(inline_scene.parent()); ! std::auto_ptr<resource_istream> in = ! inline_scene.parent()->get_resource(url); ! if (!(*in)) { throw unreachable_url(); } ! inline_scene.load(*in); } catch (std::exception & ex) { ! inline_scene.browser().err(ex.what()); ! throw unreachable_url(); ! } catch (...) { ! throw unreachable_url(); } - } catch (std::exception & ex) { - this->inline_scene_->browser().err(ex.what()); } --- 14143,14177 ---- void operator()() const OPENVRML_NOTHROW ! { ! try { ! using std::endl; ! using std::string; ! using std::vector; ! openvrml::scene & inline_scene = *this->inline_scene_; ! const vector<string> & url = *this->url_; ! assert(inline_scene.url().empty()); ! vector<boost::intrusive_ptr<node> > nodes; ! try { ! // ! // Any relative URLs passed here will be relative to the ! // *parent* scene; so we call get_resource on the parent. ! // ! assert(inline_scene.parent()); ! std::auto_ptr<resource_istream> in = ! inline_scene.parent()->get_resource(url); ! if (!(*in)) { throw unreachable_url(); } ! inline_scene.load(*in); ! } catch (std::exception & ex) { ! inline_scene.browser().err(ex.what()); ! throw unreachable_url(); ! } catch (...) { ! throw unreachable_url(); ! } } catch (std::exception & ex) { ! this->inline_scene_->browser().err(ex.what()); } } *************** *** 23008,23012 **** && std::equal(faceName, faceName + faceNameLen, valueName.begin())) { ! HRESULT strcat_result = StringCchCat(fontPath, MAX_PATH, fontsPath); --- 23011,23015 ---- && std::equal(faceName, faceName + faceNameLen, valueName.begin())) { ! HRESULT strcat_result = StringCchCat(fontPath, MAX_PATH, fontsPath); |
|
From: Braden M. <br...@us...> - 2006-12-28 20:12:02
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30392/src/libopenvrml-gl/openvrml/gl Modified Files: viewer.cpp Log Message: Fixed position of attribute applied to OpenGL callback functions. Index: viewer.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** viewer.cpp 10 Dec 2006 07:26:34 -0000 1.51 --- viewer.cpp 28 Dec 2006 20:11:59 -0000 1.52 *************** *** 75,79 **** # define OPENVRML_GL_CALLBACK_ __attribute__ ((__stdcall__)) # elif defined (_WIN32) ! # define OPENVRML_GL_CALLBACK_ APIENTRY # else # define OPENVRML_GL_CALLBACK_ --- 75,79 ---- # define OPENVRML_GL_CALLBACK_ __attribute__ ((__stdcall__)) # elif defined (_WIN32) ! # define OPENVRML_GL_CALLBACK_ CALLBACK # else # define OPENVRML_GL_CALLBACK_ *************** *** 1983,1989 **** */ # if HAVE_APPLE_OPENGL_FRAMEWORK ! typedef GLvoid (*OPENVRML_GL_CALLBACK_ TessCB)(...); # else ! typedef GLvoid (*OPENVRML_GL_CALLBACK_ TessCB)(GLvoid); # endif --- 1983,1989 ---- */ # if HAVE_APPLE_OPENGL_FRAMEWORK ! typedef GLvoid (OPENVRML_GL_CALLBACK_* TessCB)(...); # else ! typedef GLvoid (OPENVRML_GL_CALLBACK_* TessCB)(GLvoid); # endif |
|
From: Braden M. <br...@us...> - 2006-12-28 20:12:02
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30392 Modified Files: ChangeLog Log Message: Fixed position of attribute applied to OpenGL callback functions. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1400 retrieving revision 1.1401 diff -C2 -d -r1.1400 -r1.1401 *** ChangeLog 15 Dec 2006 07:39:48 -0000 1.1400 --- ChangeLog 28 Dec 2006 20:11:58 -0000 1.1401 *************** *** 1,2 **** --- 1,10 ---- + 2006-12-28 Braden McDaniel <br...@en...> + + Fixed position of attribute applied to OpenGL callback functions. + + * src/libopenvrml-gl/openvrml/gl/viewer.cpp + (OPENVRML_GL_CALLBACK_): Define as CALLBACK for _WIN32. + (TessCB): Fixed position of attribute. + 2006-12-15 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-12-28 20:10:48
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29918 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Fixed position of attribute applied to OpenGL callback functions. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.77 retrieving revision 1.1310.2.78 diff -C2 -d -r1.1310.2.77 -r1.1310.2.78 *** ChangeLog 15 Dec 2006 07:39:31 -0000 1.1310.2.77 --- ChangeLog 28 Dec 2006 20:10:24 -0000 1.1310.2.78 *************** *** 1,2 **** --- 1,10 ---- + 2006-12-28 Braden McDaniel <br...@en...> + + Fixed position of attribute applied to OpenGL callback functions. + + * src/libopenvrml-gl/openvrml/gl/viewer.cpp + (OPENVRML_GL_CALLBACK_): Define as CALLBACK for _WIN32. + (TessCB): Fixed position of attribute. + 2006-12-15 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-12-28 20:10:45
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29918/src/libopenvrml-gl/openvrml/gl Modified Files: Tag: OpenVRML-0_16-BRANCH viewer.cpp Log Message: Fixed position of attribute applied to OpenGL callback functions. Index: viewer.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v retrieving revision 1.43.2.4 retrieving revision 1.43.2.5 diff -C2 -d -r1.43.2.4 -r1.43.2.5 *** viewer.cpp 10 Dec 2006 07:26:23 -0000 1.43.2.4 --- viewer.cpp 28 Dec 2006 20:10:25 -0000 1.43.2.5 *************** *** 75,79 **** # define OPENVRML_GL_CALLBACK_ __attribute__ ((__stdcall__)) # elif defined (_WIN32) ! # define OPENVRML_GL_CALLBACK_ APIENTRY # else # define OPENVRML_GL_CALLBACK_ --- 75,79 ---- # define OPENVRML_GL_CALLBACK_ __attribute__ ((__stdcall__)) # elif defined (_WIN32) ! # define OPENVRML_GL_CALLBACK_ CALLBACK # else # define OPENVRML_GL_CALLBACK_ *************** *** 1972,1978 **** */ # if HAVE_APPLE_OPENGL_FRAMEWORK ! typedef GLvoid (*OPENVRML_GL_CALLBACK_ TessCB)(...); # else ! typedef GLvoid (*OPENVRML_GL_CALLBACK_ TessCB)(GLvoid); # endif --- 1972,1978 ---- */ # if HAVE_APPLE_OPENGL_FRAMEWORK ! typedef GLvoid (OPENVRML_GL_CALLBACK_* TessCB)(...); # else ! typedef GLvoid (OPENVRML_GL_CALLBACK_* TessCB)(GLvoid); # endif |
|
From: Braden M. <br...@us...> - 2006-12-15 07:39:52
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19161/src/openvrml-gtkplug Modified Files: Makefile.am main.cpp Removed Files: flag.cpp flag.h Log Message: Removed quit_flag silliness in openvrml-gtkplug. Made the "producer" thread--command_channel_loop--spawn (and join) the "consumer" thread, command_istream_reader. "quit" is propagated up from the consumer, to the producer, to the main thread. Index: main.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/main.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** main.cpp 4 Dec 2006 05:18:07 -0000 1.7 --- main.cpp 15 Dec 2006 07:39:48 -0000 1.8 *************** *** 37,41 **** # include "command_istream.h" # include "plugin_streambuf.h" - # include "flag.h" using namespace openvrml_player; --- 37,40 ---- *************** *** 53,65 **** // const char initial_stream_uri[] = "x-openvrml-initial:"; - - // - // Used to signal the various threads that we're done. "quit" is - // initiated when the command_istream gets EOF. At that point, the - // command_istream_reader thread sets quit_flag to true. This flag is - // checked by the command_channel_loop thread and the main (rendering) - // thread, signaling them to terminate. - // - flag quit_flag; } --- 52,55 ---- *************** *** 67,72 **** struct command_istream_reader { ! explicit command_istream_reader(command_istream & in): ! in_(&in) {} --- 57,66 ---- struct command_istream_reader { ! command_istream_reader(command_istream & in, ! GtkVrmlBrowser & vrml_browser, ! GMainLoop & command_channel_loop): ! in_(&in), ! vrml_browser_(&vrml_browser), ! command_channel_loop_(&command_channel_loop) {} *************** *** 155,181 **** // ! // Set the quit flag. ! // ! ::quit_flag.value(true); ! ! // ! // We can safely shut down the Gtk main loop from here. ! // ! // (However, trying to shut down the command_main loop results in ! // it deadlocking in g_main_context_check's call to poll. So we ! // still use the annoying quit_flag condition variable (see above) ! // to end that thread). // ! gtk_main_quit(); } private: ! command_istream * in_; }; } - extern "C" gboolean - openvrml_player_command_channel_loop_quit_event(gpointer data); - namespace { --- 149,165 ---- // ! // Tell the command_channel_loop thread to quit. (This is our ! // "producer" thread; it's also the thread that spawned us.) // ! g_main_loop_quit(this->command_channel_loop_); } private: ! command_istream * const in_; ! GtkVrmlBrowser * const vrml_browser_; ! GMainLoop * const command_channel_loop_; }; } namespace { *************** *** 262,282 **** }; - GIOChannel * request_channel; - struct command_channel_loop { command_channel_loop(GIOChannel & command_channel, ! command_istream & command_in): command_channel_(&command_channel), ! command_in_(&command_in) {} void operator()() const throw () { GMainContext * const main_context = g_main_context_new(); scope_guard main_context_guard = make_guard(g_main_context_unref, main_context); GMainLoop * const main_loop = g_main_loop_new(main_context, false); scope_guard main_loop_guard = make_guard(g_main_loop_unref, main_loop); GSource * const command_watch = --- 246,272 ---- }; struct command_channel_loop { command_channel_loop(GIOChannel & command_channel, ! command_istream & command_in, ! GtkVrmlBrowser & vrml_browser): command_channel_(&command_channel), ! command_in_(&command_in), ! vrml_browser_(&vrml_browser) {} void operator()() const throw () { + using boost::function0; + using boost::scoped_ptr; + using boost::thread; + GMainContext * const main_context = g_main_context_new(); scope_guard main_context_guard = make_guard(g_main_context_unref, main_context); + boost::ignore_unused_variable_warning(main_context_guard); GMainLoop * const main_loop = g_main_loop_new(main_context, false); scope_guard main_loop_guard = make_guard(g_main_loop_unref, main_loop); + boost::ignore_unused_variable_warning(main_loop_guard); GSource * const command_watch = *************** *** 285,288 **** --- 275,279 ---- scope_guard command_watch_guard = make_guard(g_source_unref, command_watch); + boost::ignore_unused_variable_warning(command_watch_guard); static const GDestroyNotify notify = 0; *************** *** 290,309 **** command_watch, reinterpret_cast<GSourceFunc>(::command_data_available), ! static_cast<command_streambuf *>(this->command_in_->rdbuf()), notify); const guint command_watch_id = g_source_attach(command_watch, main_context); g_assert(command_watch_id != 0); ! GSource * const quit = g_idle_source_new(); ! scope_guard quit_guard = make_guard(g_source_unref, quit); ! g_source_set_callback( ! quit, ! ::openvrml_player_command_channel_loop_quit_event, ! main_loop, ! notify); ! const guint quit_source_id = g_source_attach(quit, main_context); ! g_assert(quit_source_id != 0); g_main_loop_run(main_loop); } --- 281,309 ---- command_watch, reinterpret_cast<GSourceFunc>(::command_data_available), ! static_cast<command_streambuf *>(this->command_in_->rdbuf()), ! notify); const guint command_watch_id = g_source_attach(command_watch, main_context); g_assert(command_watch_id != 0); ! // ! // The command_istream_reader thread is our "consumer" thread. ! // ! function0<void> read_commands = ! command_istream_reader(*this->command_in_, ! *this->vrml_browser_, ! *main_loop); ! const scoped_ptr<thread> ! command_reader_thread(new thread(read_commands)); g_main_loop_run(main_loop); + + // + // If we're here, our consumer thread is done. Join it and tell + // the GTK+ main loop to quit. + // + command_reader_thread->join(); + + gtk_main_quit(); } *************** *** 311,314 **** --- 311,315 ---- GIOChannel * const command_channel_; command_istream * const command_in_; + GtkVrmlBrowser * const vrml_browser_; }; } *************** *** 371,379 **** command_istream command_in; ! ::request_channel = g_io_channel_unix_new(1); // stdout GtkWidget * const window = gtk_plug_new(socket_id); ! GtkWidget * const vrml_browser = gtk_vrml_browser_new(::request_channel); gtk_container_add(GTK_CONTAINER(window), vrml_browser); --- 372,380 ---- command_istream command_in; ! GIOChannel * const request_channel = g_io_channel_unix_new(1); // stdout GtkWidget * const window = gtk_plug_new(socket_id); ! GtkWidget * const vrml_browser = gtk_vrml_browser_new(request_channel); gtk_container_add(GTK_CONTAINER(window), vrml_browser); *************** *** 382,387 **** thread_group threads; ! GIOChannel * command_channel = 0; ! command_channel = g_io_channel_unix_new(0); // stdin error = 0; GIOStatus status = g_io_channel_set_encoding(command_channel, --- 383,387 ---- thread_group threads; ! GIOChannel * const command_channel = g_io_channel_unix_new(0); // stdin error = 0; GIOStatus status = g_io_channel_set_encoding(command_channel, *************** *** 397,401 **** function0<void> command_channel_loop_func = ! command_channel_loop(*command_channel, command_in); threads.create_thread(command_channel_loop_func); --- 397,403 ---- function0<void> command_channel_loop_func = ! command_channel_loop(*command_channel, ! command_in, ! *GTK_VRML_BROWSER(vrml_browser)); threads.create_thread(command_channel_loop_func); *************** *** 411,417 **** } - function0<void> read_commands = command_istream_reader(command_in); - threads.create_thread(read_commands); - gtk_main(); --- 413,416 ---- *************** *** 427,434 **** g_io_channel_unref(command_channel); ! if (::request_channel) { GError * error = 0; const gboolean flush = false; ! GIOStatus status = g_io_channel_shutdown(::request_channel, flush, &error); --- 426,433 ---- g_io_channel_unref(command_channel); ! if (request_channel) { GError * error = 0; const gboolean flush = false; ! GIOStatus status = g_io_channel_shutdown(request_channel, flush, &error); *************** *** 440,454 **** } } ! g_io_channel_unref(::request_channel); ! } ! ! gboolean openvrml_player_command_channel_loop_quit_event(const gpointer data) ! { ! GMainLoop * const main_loop = static_cast<GMainLoop *>(data); ! ! if (::quit_flag.value()) { ! g_main_loop_quit(main_loop); ! return false; ! } ! return true; } --- 439,442 ---- } } ! g_io_channel_unref(request_channel); } Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 2 Oct 2006 03:44:08 -0000 1.3 --- Makefile.am 15 Dec 2006 07:39:48 -0000 1.4 *************** *** 30,41 **** command_istream.h \ plugin_streambuf.h \ ! gtkvrmlbrowser.h \ ! flag.h openvrml_gtkplug_SOURCES = \ main.cpp \ command_istream.cpp \ plugin_streambuf.cpp \ ! gtkvrmlbrowser.cpp \ ! flag.cpp EXTRA_DIST = $(openvrml_gtkplug_SOURCES) --- 30,39 ---- command_istream.h \ plugin_streambuf.h \ ! gtkvrmlbrowser.h openvrml_gtkplug_SOURCES = \ main.cpp \ command_istream.cpp \ plugin_streambuf.cpp \ ! gtkvrmlbrowser.cpp EXTRA_DIST = $(openvrml_gtkplug_SOURCES) --- flag.h DELETED --- --- flag.cpp DELETED --- |
|
From: Braden M. <br...@us...> - 2006-12-15 07:39:49
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19161 Modified Files: ChangeLog Log Message: Removed quit_flag silliness in openvrml-gtkplug. Made the "producer" thread--command_channel_loop--spawn (and join) the "consumer" thread, command_istream_reader. "quit" is propagated up from the consumer, to the producer, to the main thread. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1399 retrieving revision 1.1400 diff -C2 -d -r1.1399 -r1.1400 *** ChangeLog 15 Dec 2006 06:52:26 -0000 1.1399 --- ChangeLog 15 Dec 2006 07:39:48 -0000 1.1400 *************** *** 1,4 **** --- 1,44 ---- 2006-12-15 Braden McDaniel <br...@en...> + Removed quit_flag silliness in openvrml-gtkplug. Made the + "producer" thread--command_channel_loop--spawn (and join) the + "consumer" thread, command_istream_reader. "quit" is propagated + up from the consumer, to the producer, to the main thread. + + * src/openvrml-gtkplug/Makefile.am + (noinst_HEADERS): Removed reference to flag.h. + (openvrml_gtkplug_SOURCES): Removed reference to flag.cpp. + * src/openvrml-gtkplug/main.cpp + (quit_flag): Removed. + (openvrml_player::command_istream_reader::command_istream_reader(command_istream&, + GtkVrmlBrowser &, GMainLoop &)): Construct using a reference to + the command_channel_loop's GMainLoop. + (openvrml_player::command_istream_reader::operator()() const): + Instead of setting the quit_flag, call g_main_loop_quit on the + command_channel_loop. + (openvrml_player::command_istream_reader::command_channel_loop_): + Added member. + (openvrml_player_command_channel_loop_quit(gpointer)): Removed + function. + (request_channel): Removed; we don't need this to be global + anymore. Replaced with a local variable in main. + (command_channel_loop::command_channel_loop(GIOChannel &, + command_istream &, GtkVrmlBrowser &)): Construct using a reference + to the GtkVrmlBrowser widget; we need to propagate this to the + consumer thread, command_istream_reader. + (command_channel_loop::operator()() const): Removed idle source + for quit event; instead, spawn the command_istream_reader thread + here and join it with the main loop completes. Then, call + gtk_main_quit from here. + (command_channel_loop::vrml_browser_): Added member. + (main(int, char *[])): Made request_channel a local variable; pass + vrml_browser to the command_channel_loop; don't create the + command_istream_reader thread here (it's now spawned from the + command_channel_loop thread); + * src/openvrml-gtkplug/flag.cpp: Removed file. + * src/openvrml-gtkplug/flag.h: Removed file. + + 2006-12-15 Braden McDaniel <br...@en...> + * src/openvrml-gtkplug/gtkvrmlbrowser.h (gtk_vrml_browser_load_url(GtkVrmlBrowser *, const gchar **, const |
|
From: Braden M. <br...@us...> - 2006-12-15 07:39:33
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19125/src/openvrml-gtkplug Modified Files: Tag: OpenVRML-0_16-BRANCH Makefile.am main.cpp Removed Files: Tag: OpenVRML-0_16-BRANCH flag.cpp flag.h Log Message: Removed quit_flag silliness in openvrml-gtkplug. Made the "producer" thread--command_channel_loop--spawn (and join) the "consumer" thread, command_istream_reader. "quit" is propagated up from the consumer, to the producer, to the main thread. Index: main.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/main.cpp,v retrieving revision 1.2.2.6 retrieving revision 1.2.2.7 diff -C2 -d -r1.2.2.6 -r1.2.2.7 *** main.cpp 4 Dec 2006 05:17:57 -0000 1.2.2.6 --- main.cpp 15 Dec 2006 07:39:31 -0000 1.2.2.7 *************** *** 37,41 **** # include "command_istream.h" # include "plugin_streambuf.h" - # include "flag.h" using namespace openvrml_player; --- 37,40 ---- *************** *** 53,65 **** // const char initial_stream_uri[] = "x-openvrml-initial:"; - - // - // Used to signal the various threads that we're done. "quit" is - // initiated when the command_istream gets EOF. At that point, the - // command_istream_reader thread sets quit_flag to true. This flag is - // checked by the command_channel_loop thread and the main (rendering) - // thread, signaling them to terminate. - // - flag quit_flag; } --- 52,55 ---- *************** *** 67,72 **** struct command_istream_reader { ! explicit command_istream_reader(command_istream & in): ! in_(&in) {} --- 57,66 ---- struct command_istream_reader { ! command_istream_reader(command_istream & in, ! GtkVrmlBrowser & vrml_browser, ! GMainLoop & command_channel_loop): ! in_(&in), ! vrml_browser_(&vrml_browser), ! command_channel_loop_(&command_channel_loop) {} *************** *** 155,181 **** // ! // Set the quit flag. ! // ! ::quit_flag.value(true); ! ! // ! // We can safely shut down the Gtk main loop from here. ! // ! // (However, trying to shut down the command_main loop results in ! // it deadlocking in g_main_context_check's call to poll. So we ! // still use the annoying quit_flag condition variable (see above) ! // to end that thread). // ! gtk_main_quit(); } private: ! command_istream * in_; }; } - extern "C" gboolean - openvrml_player_command_channel_loop_quit_event(gpointer data); - namespace { --- 149,165 ---- // ! // Tell the command_channel_loop thread to quit. (This is our ! // "producer" thread; it's also the thread that spawned us.) // ! g_main_loop_quit(this->command_channel_loop_); } private: ! command_istream * const in_; ! GtkVrmlBrowser * const vrml_browser_; ! GMainLoop * const command_channel_loop_; }; } namespace { *************** *** 262,282 **** }; - GIOChannel * request_channel; - struct command_channel_loop { command_channel_loop(GIOChannel & command_channel, ! command_istream & command_in): command_channel_(&command_channel), ! command_in_(&command_in) {} void operator()() const throw () { GMainContext * const main_context = g_main_context_new(); scope_guard main_context_guard = make_guard(g_main_context_unref, main_context); GMainLoop * const main_loop = g_main_loop_new(main_context, false); scope_guard main_loop_guard = make_guard(g_main_loop_unref, main_loop); GSource * const command_watch = --- 246,272 ---- }; struct command_channel_loop { command_channel_loop(GIOChannel & command_channel, ! command_istream & command_in, ! GtkVrmlBrowser & vrml_browser): command_channel_(&command_channel), ! command_in_(&command_in), ! vrml_browser_(&vrml_browser) {} void operator()() const throw () { + using boost::function0; + using boost::scoped_ptr; + using boost::thread; + GMainContext * const main_context = g_main_context_new(); scope_guard main_context_guard = make_guard(g_main_context_unref, main_context); + boost::ignore_unused_variable_warning(main_context_guard); GMainLoop * const main_loop = g_main_loop_new(main_context, false); scope_guard main_loop_guard = make_guard(g_main_loop_unref, main_loop); + boost::ignore_unused_variable_warning(main_loop_guard); GSource * const command_watch = *************** *** 285,288 **** --- 275,279 ---- scope_guard command_watch_guard = make_guard(g_source_unref, command_watch); + boost::ignore_unused_variable_warning(command_watch_guard); static const GDestroyNotify notify = 0; *************** *** 290,309 **** command_watch, reinterpret_cast<GSourceFunc>(::command_data_available), ! static_cast<command_streambuf *>(this->command_in_->rdbuf()), notify); const guint command_watch_id = g_source_attach(command_watch, main_context); g_assert(command_watch_id != 0); ! GSource * const quit = g_idle_source_new(); ! scope_guard quit_guard = make_guard(g_source_unref, quit); ! g_source_set_callback( ! quit, ! ::openvrml_player_command_channel_loop_quit_event, ! main_loop, ! notify); ! const guint quit_source_id = g_source_attach(quit, main_context); ! g_assert(quit_source_id != 0); g_main_loop_run(main_loop); } --- 281,309 ---- command_watch, reinterpret_cast<GSourceFunc>(::command_data_available), ! static_cast<command_streambuf *>(this->command_in_->rdbuf()), ! notify); const guint command_watch_id = g_source_attach(command_watch, main_context); g_assert(command_watch_id != 0); ! // ! // The command_istream_reader thread is our "consumer" thread. ! // ! function0<void> read_commands = ! command_istream_reader(*this->command_in_, ! *this->vrml_browser_, ! *main_loop); ! const scoped_ptr<thread> ! command_reader_thread(new thread(read_commands)); g_main_loop_run(main_loop); + + // + // If we're here, our consumer thread is done. Join it and tell + // the GTK+ main loop to quit. + // + command_reader_thread->join(); + + gtk_main_quit(); } *************** *** 311,314 **** --- 311,315 ---- GIOChannel * const command_channel_; command_istream * const command_in_; + GtkVrmlBrowser * const vrml_browser_; }; } *************** *** 371,379 **** command_istream command_in; ! ::request_channel = g_io_channel_unix_new(1); // stdout GtkWidget * const window = gtk_plug_new(socket_id); ! GtkWidget * const vrml_browser = gtk_vrml_browser_new(::request_channel); gtk_container_add(GTK_CONTAINER(window), vrml_browser); --- 372,380 ---- command_istream command_in; ! GIOChannel * const request_channel = g_io_channel_unix_new(1); // stdout GtkWidget * const window = gtk_plug_new(socket_id); ! GtkWidget * const vrml_browser = gtk_vrml_browser_new(request_channel); gtk_container_add(GTK_CONTAINER(window), vrml_browser); *************** *** 382,387 **** thread_group threads; ! GIOChannel * command_channel = 0; ! command_channel = g_io_channel_unix_new(0); // stdin error = 0; GIOStatus status = g_io_channel_set_encoding(command_channel, --- 383,387 ---- thread_group threads; ! GIOChannel * const command_channel = g_io_channel_unix_new(0); // stdin error = 0; GIOStatus status = g_io_channel_set_encoding(command_channel, *************** *** 397,401 **** function0<void> command_channel_loop_func = ! command_channel_loop(*command_channel, command_in); threads.create_thread(command_channel_loop_func); --- 397,403 ---- function0<void> command_channel_loop_func = ! command_channel_loop(*command_channel, ! command_in, ! *GTK_VRML_BROWSER(vrml_browser)); threads.create_thread(command_channel_loop_func); *************** *** 411,417 **** } - function0<void> read_commands = command_istream_reader(command_in); - threads.create_thread(read_commands); - gtk_main(); --- 413,416 ---- *************** *** 427,434 **** g_io_channel_unref(command_channel); ! if (::request_channel) { GError * error = 0; const gboolean flush = false; ! GIOStatus status = g_io_channel_shutdown(::request_channel, flush, &error); --- 426,433 ---- g_io_channel_unref(command_channel); ! if (request_channel) { GError * error = 0; const gboolean flush = false; ! GIOStatus status = g_io_channel_shutdown(request_channel, flush, &error); *************** *** 440,454 **** } } ! g_io_channel_unref(::request_channel); ! } ! ! gboolean openvrml_player_command_channel_loop_quit_event(const gpointer data) ! { ! GMainLoop * const main_loop = static_cast<GMainLoop *>(data); ! ! if (::quit_flag.value()) { ! g_main_loop_quit(main_loop); ! return false; ! } ! return true; } --- 439,442 ---- } } ! g_io_channel_unref(request_channel); } Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/Makefile.am,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** Makefile.am 2 Oct 2006 03:43:57 -0000 1.2.2.2 --- Makefile.am 15 Dec 2006 07:39:31 -0000 1.2.2.3 *************** *** 30,41 **** command_istream.h \ plugin_streambuf.h \ ! gtkvrmlbrowser.h \ ! flag.h openvrml_gtkplug_SOURCES = \ main.cpp \ command_istream.cpp \ plugin_streambuf.cpp \ ! gtkvrmlbrowser.cpp \ ! flag.cpp EXTRA_DIST = $(openvrml_gtkplug_SOURCES) --- 30,39 ---- command_istream.h \ plugin_streambuf.h \ ! gtkvrmlbrowser.h openvrml_gtkplug_SOURCES = \ main.cpp \ command_istream.cpp \ plugin_streambuf.cpp \ ! gtkvrmlbrowser.cpp EXTRA_DIST = $(openvrml_gtkplug_SOURCES) --- flag.h DELETED --- --- flag.cpp DELETED --- |
|
From: Braden M. <br...@us...> - 2006-12-15 07:39:33
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19125 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Removed quit_flag silliness in openvrml-gtkplug. Made the "producer" thread--command_channel_loop--spawn (and join) the "consumer" thread, command_istream_reader. "quit" is propagated up from the consumer, to the producer, to the main thread. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.76 retrieving revision 1.1310.2.77 diff -C2 -d -r1.1310.2.76 -r1.1310.2.77 *** ChangeLog 15 Dec 2006 06:52:13 -0000 1.1310.2.76 --- ChangeLog 15 Dec 2006 07:39:31 -0000 1.1310.2.77 *************** *** 1,4 **** --- 1,44 ---- 2006-12-15 Braden McDaniel <br...@en...> + Removed quit_flag silliness in openvrml-gtkplug. Made the + "producer" thread--command_channel_loop--spawn (and join) the + "consumer" thread, command_istream_reader. "quit" is propagated + up from the consumer, to the producer, to the main thread. + + * src/openvrml-gtkplug/Makefile.am + (noinst_HEADERS): Removed reference to flag.h. + (openvrml_gtkplug_SOURCES): Removed reference to flag.cpp. + * src/openvrml-gtkplug/main.cpp + (quit_flag): Removed. + (openvrml_player::command_istream_reader::command_istream_reader(command_istream&, + GtkVrmlBrowser &, GMainLoop &)): Construct using a reference to + the command_channel_loop's GMainLoop. + (openvrml_player::command_istream_reader::operator()() const): + Instead of setting the quit_flag, call g_main_loop_quit on the + command_channel_loop. + (openvrml_player::command_istream_reader::command_channel_loop_): + Added member. + (openvrml_player_command_channel_loop_quit(gpointer)): Removed + function. + (request_channel): Removed; we don't need this to be global + anymore. Replaced with a local variable in main. + (command_channel_loop::command_channel_loop(GIOChannel &, + command_istream &, GtkVrmlBrowser &)): Construct using a reference + to the GtkVrmlBrowser widget; we need to propagate this to the + consumer thread, command_istream_reader. + (command_channel_loop::operator()() const): Removed idle source + for quit event; instead, spawn the command_istream_reader thread + here and join it with the main loop completes. Then, call + gtk_main_quit from here. + (command_channel_loop::vrml_browser_): Added member. + (main(int, char *[])): Made request_channel a local variable; pass + vrml_browser to the command_channel_loop; don't create the + command_istream_reader thread here (it's now spawned from the + command_channel_loop thread); + * src/openvrml-gtkplug/flag.cpp: Removed file. + * src/openvrml-gtkplug/flag.h: Removed file. + + 2006-12-15 Braden McDaniel <br...@en...> + * src/openvrml-gtkplug/gtkvrmlbrowser.h (gtk_vrml_browser_load_url(GtkVrmlBrowser *, const gchar **, const |
|
From: Braden M. <br...@us...> - 2006-12-15 06:52:29
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv911/src/openvrml-gtkplug Modified Files: gtkvrmlbrowser.h Log Message: Fixed use of char that should be gchar. Index: gtkvrmlbrowser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gtkvrmlbrowser.h 1 Oct 2006 05:47:07 -0000 1.2 --- gtkvrmlbrowser.h 15 Dec 2006 06:52:26 -0000 1.3 *************** *** 51,55 **** void gtk_vrml_browser_load_url(GtkVrmlBrowser *vrml_browser, const gchar **url, ! const char **parameter); G_END_DECLS --- 51,55 ---- void gtk_vrml_browser_load_url(GtkVrmlBrowser *vrml_browser, const gchar **url, ! const gchar **parameter); G_END_DECLS |
|
From: Braden M. <br...@us...> - 2006-12-15 06:52:29
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv911 Modified Files: ChangeLog Log Message: Fixed use of char that should be gchar. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1398 retrieving revision 1.1399 diff -C2 -d -r1.1398 -r1.1399 *** ChangeLog 10 Dec 2006 07:26:34 -0000 1.1398 --- ChangeLog 15 Dec 2006 06:52:26 -0000 1.1399 *************** *** 1,2 **** --- 1,8 ---- + 2006-12-15 Braden McDaniel <br...@en...> + + * src/openvrml-gtkplug/gtkvrmlbrowser.h + (gtk_vrml_browser_load_url(GtkVrmlBrowser *, const gchar **, const + gchar **)): Fixed use of char that should be gchar. + 2006-12-10 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-12-15 06:52:18
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv857 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Fixed use of char that should be gchar. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.75 retrieving revision 1.1310.2.76 diff -C2 -d -r1.1310.2.75 -r1.1310.2.76 *** ChangeLog 10 Dec 2006 07:26:22 -0000 1.1310.2.75 --- ChangeLog 15 Dec 2006 06:52:13 -0000 1.1310.2.76 *************** *** 1,2 **** --- 1,8 ---- + 2006-12-15 Braden McDaniel <br...@en...> + + * src/openvrml-gtkplug/gtkvrmlbrowser.h + (gtk_vrml_browser_load_url(GtkVrmlBrowser *, const gchar **, const + gchar **)): Fixed use of char that should be gchar. + 2006-12-10 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-12-15 06:52:18
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv857/src/openvrml-gtkplug Modified Files: Tag: OpenVRML-0_16-BRANCH gtkvrmlbrowser.h Log Message: Fixed use of char that should be gchar. Index: gtkvrmlbrowser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.h,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** gtkvrmlbrowser.h 1 Oct 2006 05:48:30 -0000 1.2.2.1 --- gtkvrmlbrowser.h 15 Dec 2006 06:52:15 -0000 1.2.2.2 *************** *** 51,55 **** void gtk_vrml_browser_load_url(GtkVrmlBrowser *vrml_browser, const gchar **url, ! const char **parameter); G_END_DECLS --- 51,55 ---- void gtk_vrml_browser_load_url(GtkVrmlBrowser *vrml_browser, const gchar **url, ! const gchar **parameter); G_END_DECLS |
