openvrml-commit Mailing List for OpenVRML (Page 89)

Status: Alpha

Brought to you by: braden, cks, cmorley

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

Flat | Threaded

<< < 1 .. 87 88 89 90 91 .. 134 > >> (Page 89 of 134)

[openvrml-commit] openvrml ChangeLog, 1.1385, 1.1386 README, 1.71, 1.72

From: Braden M. <br...@us...> - 2006-11-28 20:48:02

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29075

Modified Files:
	ChangeLog README 
Log Message:
Removed zlib from dependencies list; as of 0.16 OpenVRML does not directly require zlib.

Index: README
===================================================================
RCS file: /cvsroot/openvrml/openvrml/README,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** README	28 Oct 2006 07:08:58 -0000	1.71
--- README	28 Nov 2006 20:48:00 -0000	1.72
***************
*** 123,127 ****
  below.
  
-      zlib                   <http://www.gzip.org/zlib/index.html>
       libpng                 <http://www.libpng.org/pub/png/libpng.html>
       libjpeg                <http://www.ijg.org>
--- 123,126 ----

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1385
retrieving revision 1.1386
diff -C2 -d -r1.1385 -r1.1386
*** ChangeLog	28 Nov 2006 06:12:44 -0000	1.1385
--- ChangeLog	28 Nov 2006 20:48:00 -0000	1.1386
***************
*** 1,4 ****
--- 1,9 ----
  2006-11-28 Braden McDaniel  <br...@en...>
  
+ 	* README: Removed zlib from dependencies list; as of 0.16 OpenVRML
+ 	does not directly require zlib.
+ 
+ 2006-11-28 Braden McDaniel  <br...@en...>
+ 
  	Removed "offset" argument from openvrml-gtkplug's "write" command.

[openvrml-commit] openvrml ChangeLog, 1.1310.2.62, 1.1310.2.63 README, 1.65.2.6, 1.65.2.7

From: Braden M. <br...@us...> - 2006-11-28 20:47:31

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29057

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog README 
Log Message:
Removed zlib from dependencies list; as of 0.16 OpenVRML does not directly require zlib.

Index: README
===================================================================
RCS file: /cvsroot/openvrml/openvrml/README,v
retrieving revision 1.65.2.6
retrieving revision 1.65.2.7
diff -C2 -d -r1.65.2.6 -r1.65.2.7
*** README	28 Oct 2006 07:08:43 -0000	1.65.2.6
--- README	28 Nov 2006 20:47:27 -0000	1.65.2.7
***************
*** 123,127 ****
  below.
  
-      zlib                   <http://www.gzip.org/zlib/index.html>
       libpng                 <http://www.libpng.org/pub/png/libpng.html>
       libjpeg                <http://www.ijg.org>
--- 123,126 ----

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.62
retrieving revision 1.1310.2.63
diff -C2 -d -r1.1310.2.62 -r1.1310.2.63
*** ChangeLog	28 Nov 2006 06:12:32 -0000	1.1310.2.62
--- ChangeLog	28 Nov 2006 20:47:27 -0000	1.1310.2.63
***************
*** 1,4 ****
--- 1,9 ----
  2006-11-28 Braden McDaniel  <br...@en...>
  
+ 	* README: Removed zlib from dependencies list; as of 0.16 OpenVRML
+ 	does not directly require zlib.
+ 
+ 2006-11-28 Braden McDaniel  <br...@en...>
+ 
  	Removed "offset" argument from openvrml-gtkplug's "write" command.

[openvrml-commit] openvrml/doc openvrml-gtkplug.texi,1.3,1.4

From: Braden M. <br...@us...> - 2006-11-28 06:12:48

Update of /cvsroot/openvrml/openvrml/doc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24618/doc

Modified Files:
	openvrml-gtkplug.texi 
Log Message:
Removed "offset" argument from openvrml-gtkplug's "write" command.

Index: openvrml-gtkplug.texi
===================================================================
RCS file: /cvsroot/openvrml/openvrml/doc/openvrml-gtkplug.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** openvrml-gtkplug.texi	17 Nov 2006 01:18:34 -0000	1.3
--- openvrml-gtkplug.texi	28 Nov 2006 06:12:44 -0000	1.4
***************
*** 327,331 ****
  
  @example
! write @var{stream_id} @var{offset} @var{length}
  @var{data}
  @end example
--- 327,331 ----
  
  @example
! write @var{stream_id} @var{length}
  @var{data}
  @end example
***************
*** 334,340 ****
  @item stream-id
  An integer identifier for the stream.
- @item offset
- The offset from the beginning of the stream to the beginning of
- @var{data}.
  @item length
  The number of bytes in @var{data}
--- 334,337 ----
***************
*** 353,359 ****
  parameter.
  
! @code{write} may be called multiple times for the same stream.  The
! @var{offset} parameter indicates the offset of the beginning of
! @var{data} with respect to the beginning of the stream (in bytes).
  
  @cindex destroy-stream
--- 350,355 ----
  parameter.
  
! @code{write} may be called multiple times for the same stream with
! consecutive blocks of data for the stream.
  
  @cindex destroy-stream

[openvrml-commit] openvrml ChangeLog,1.1384,1.1385

From: Braden M. <br...@us...> - 2006-11-28 06:12:48

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24618

Modified Files:
	ChangeLog 
Log Message:
Removed "offset" argument from openvrml-gtkplug's "write" command.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1384
retrieving revision 1.1385
diff -C2 -d -r1.1384 -r1.1385
*** ChangeLog	24 Nov 2006 06:37:19 -0000	1.1384
--- ChangeLog	28 Nov 2006 06:12:44 -0000	1.1385
***************
*** 1,2 ****
--- 1,15 ----
+ 2006-11-28 Braden McDaniel  <br...@en...>
+ 
+ 	Removed "offset" argument from openvrml-gtkplug's "write" command.
+ 
+ 	* doc/openvrml-gtkplug.texi: Removed "offset" argument from the
+ 	"write" command.
+ 	* mozilla-plugin/src/openvrml.cpp
+ 	(NPP_Write(NPP, NPStream *, int32, int32, int32, void *)): Don't
+ 	write the offset to the command stream.
+ 	* src/openvrml-gtkplug/main.cpp
+ 	(openvrml_player::command_istream_reader::operator() const): Don't
+ 	read the offset from the command stream.
+ 
  2006-11-24 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml/src/openvrml-gtkplug main.cpp,1.3,1.4

From: Braden M. <br...@us...> - 2006-11-28 06:12:48

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24618/src/openvrml-gtkplug

Modified Files:
	main.cpp 
Log Message:
Removed "offset" argument from openvrml-gtkplug's "write" command.

Index: main.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.cpp	2 Oct 2006 22:34:34 -0000	1.3
--- main.cpp	28 Nov 2006 06:12:44 -0000	1.4
***************
*** 128,133 ****
                      plugin_streambuf_map.erase(pos);
                  } else if (command == "write") {
!                     size_t stream_id, offset, length;
!                     command_line_stream >> stream_id >> offset >> length;
                      plugin_streambuf_map_t::const_iterator pos =
                          plugin_streambuf_map.find(stream_id);
--- 128,133 ----
                      plugin_streambuf_map.erase(pos);
                  } else if (command == "write") {
!                     size_t stream_id, length;
!                     command_line_stream >> stream_id >> length;
                      plugin_streambuf_map_t::const_iterator pos =
                          plugin_streambuf_map.find(stream_id);

[openvrml-commit] openvrml/mozilla-plugin/src openvrml.cpp, 1.45, 1.46

From: Braden M. <br...@us...> - 2006-11-28 06:12:48

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24618/mozilla-plugin/src

Modified Files:
	openvrml.cpp 
Log Message:
Removed "offset" argument from openvrml-gtkplug's "write" command.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** openvrml.cpp	24 Nov 2006 06:37:19 -0000	1.45
--- openvrml.cpp	28 Nov 2006 06:12:44 -0000	1.46
***************
*** 490,494 ****
  int32 NPP_Write(const NPP instance,
                  NPStream * const stream,
!                 const int32 offset,
                  const int32 len,
                  void * const buffer)
--- 490,494 ----
  int32 NPP_Write(const NPP instance,
                  NPStream * const stream,
!                 int32 /* offset */,
                  const int32 len,
                  void * const buffer)
***************
*** 500,505 ****
  
      std::ostringstream command;
!     command << "write " << ptrdiff_t(stream) << ' ' << offset << ' ' << len
!             << '\n';
      for (int32 i = 0; i < len; ++i) {
          command.put(static_cast<char *>(buffer)[i]);
--- 500,504 ----
  
      std::ostringstream command;
!     command << "write " << ptrdiff_t(stream) << ' ' << ' ' << len << '\n';
      for (int32 i = 0; i < len; ++i) {
          command.put(static_cast<char *>(buffer)[i]);

[openvrml-commit] openvrml/src/openvrml-gtkplug main.cpp, 1.2.2.2, 1.2.2.3

From: Braden M. <br...@us...> - 2006-11-28 06:12:34

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24588/src/openvrml-gtkplug

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	main.cpp 
Log Message:
Removed "offset" argument from openvrml-gtkplug's "write" command.

Index: main.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/main.cpp,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** main.cpp	2 Oct 2006 22:34:06 -0000	1.2.2.2
--- main.cpp	28 Nov 2006 06:12:33 -0000	1.2.2.3
***************
*** 128,133 ****
                      plugin_streambuf_map.erase(pos);
                  } else if (command == "write") {
!                     size_t stream_id, offset, length;
!                     command_line_stream >> stream_id >> offset >> length;
                      plugin_streambuf_map_t::const_iterator pos =
                          plugin_streambuf_map.find(stream_id);
--- 128,133 ----
                      plugin_streambuf_map.erase(pos);
                  } else if (command == "write") {
!                     size_t stream_id, length;
!                     command_line_stream >> stream_id >> length;
                      plugin_streambuf_map_t::const_iterator pos =
                          plugin_streambuf_map.find(stream_id);

[openvrml-commit] openvrml ChangeLog,1.1310.2.61,1.1310.2.62

From: Braden M. <br...@us...> - 2006-11-28 06:12:34

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24588

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Removed "offset" argument from openvrml-gtkplug's "write" command.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.61
retrieving revision 1.1310.2.62
diff -C2 -d -r1.1310.2.61 -r1.1310.2.62
*** ChangeLog	24 Nov 2006 06:37:03 -0000	1.1310.2.61
--- ChangeLog	28 Nov 2006 06:12:32 -0000	1.1310.2.62
***************
*** 1,2 ****
--- 1,15 ----
+ 2006-11-28 Braden McDaniel  <br...@en...>
+ 
+ 	Removed "offset" argument from openvrml-gtkplug's "write" command.
+ 
+ 	* doc/openvrml-gtkplug.texi: Removed "offset" argument from the
+ 	"write" command.
+ 	* mozilla-plugin/src/openvrml.cpp
+ 	(NPP_Write(NPP, NPStream *, int32, int32, int32, void *)): Don't
+ 	write the offset to the command stream.
+ 	* src/openvrml-gtkplug/main.cpp
+ 	(openvrml_player::command_istream_reader::operator() const): Don't
+ 	read the offset from the command stream.
+ 
  2006-11-24 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml/mozilla-plugin/src openvrml.cpp, 1.37.2.8, 1.37.2.9

From: Braden M. <br...@us...> - 2006-11-28 06:12:34

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24588/mozilla-plugin/src

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	openvrml.cpp 
Log Message:
Removed "offset" argument from openvrml-gtkplug's "write" command.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.37.2.8
retrieving revision 1.37.2.9
diff -C2 -d -r1.37.2.8 -r1.37.2.9
*** openvrml.cpp	24 Nov 2006 06:37:04 -0000	1.37.2.8
--- openvrml.cpp	28 Nov 2006 06:12:32 -0000	1.37.2.9
***************
*** 490,494 ****
  int32 NPP_Write(const NPP instance,
                  NPStream * const stream,
!                 const int32 offset,
                  const int32 len,
                  void * const buffer)
--- 490,494 ----
  int32 NPP_Write(const NPP instance,
                  NPStream * const stream,
!                 int32 /* offset */,
                  const int32 len,
                  void * const buffer)
***************
*** 500,505 ****
  
      std::ostringstream command;
!     command << "write " << ptrdiff_t(stream) << ' ' << offset << ' ' << len
!             << '\n';
      for (int32 i = 0; i < len; ++i) {
          command.put(static_cast<char *>(buffer)[i]);
--- 500,504 ----
  
      std::ostringstream command;
!     command << "write " << ptrdiff_t(stream) << ' ' << ' ' << len << '\n';
      for (int32 i = 0; i < len; ++i) {
          command.put(static_cast<char *>(buffer)[i]);

[openvrml-commit] openvrml/doc openvrml-gtkplug.texi, 1.1.2.3, 1.1.2.4

From: Braden M. <br...@us...> - 2006-11-28 06:12:34

Update of /cvsroot/openvrml/openvrml/doc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24588/doc

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	openvrml-gtkplug.texi 
Log Message:
Removed "offset" argument from openvrml-gtkplug's "write" command.

Index: openvrml-gtkplug.texi
===================================================================
RCS file: /cvsroot/openvrml/openvrml/doc/openvrml-gtkplug.texi,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-gtkplug.texi	17 Nov 2006 01:05:57 -0000	1.1.2.3
--- openvrml-gtkplug.texi	28 Nov 2006 06:12:32 -0000	1.1.2.4
***************
*** 327,331 ****
  
  @example
! write @var{stream_id} @var{offset} @var{length}
  @var{data}
  @end example
--- 327,331 ----
  
  @example
! write @var{stream_id} @var{length}
  @var{data}
  @end example
***************
*** 334,340 ****
  @item stream-id
  An integer identifier for the stream.
- @item offset
- The offset from the beginning of the stream to the beginning of
- @var{data}.
  @item length
  The number of bytes in @var{data}
--- 334,337 ----
***************
*** 353,359 ****
  parameter.
  
! @code{write} may be called multiple times for the same stream.  The
! @var{offset} parameter indicates the offset of the beginning of
! @var{data} with respect to the beginning of the stream (in bytes).
  
  @cindex destroy-stream
--- 350,355 ----
  parameter.
  
! @code{write} may be called multiple times for the same stream with
! consecutive blocks of data for the stream.
  
  @cindex destroy-stream

[openvrml-commit] openvrml/mozilla-plugin/src openvrml.cpp, 1.44, 1.45

From: Braden M. <br...@us...> - 2006-11-24 06:37:20

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16933/mozilla-plugin/src

Modified Files:
	openvrml.cpp 
Log Message:
Removed unreachable return statement.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** openvrml.cpp	22 Nov 2006 16:39:46 -0000	1.44
--- openvrml.cpp	24 Nov 2006 06:37:19 -0000	1.45
***************
*** 1212,1216 ****
                                       ? error->message
                                       : "g_io_channel_set_encoding failure");
-             return;
          }
          error_guard.dismiss();
--- 1212,1215 ----

[openvrml-commit] openvrml ChangeLog,1.1383,1.1384

From: Braden M. <br...@us...> - 2006-11-24 06:37:20

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16933

Modified Files:
	ChangeLog 
Log Message:
Removed unreachable return statement.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1383
retrieving revision 1.1384
diff -C2 -d -r1.1383 -r1.1384
*** ChangeLog	24 Nov 2006 05:41:17 -0000	1.1383
--- ChangeLog	24 Nov 2006 06:37:19 -0000	1.1384
***************
*** 1,4 ****
--- 1,10 ----
  2006-11-24 Braden McDaniel  <br...@en...>
  
+ 	* mozilla-plugin/src/openvrml.cpp
+ 	(plugin_instance::set_window(NPWindow &)): Removed unreachable
+ 	return statement.
+ 
+ 2006-11-24 Braden McDaniel  <br...@en...>
+ 
  	Removed RPM spec file.  This file is now maintained as part of
  	Fedora Extras.

[openvrml-commit] openvrml ChangeLog,1.1310.2.60,1.1310.2.61

From: Braden M. <br...@us...> - 2006-11-24 06:37:06

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16644

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Removed unreachable return statement.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.60
retrieving revision 1.1310.2.61
diff -C2 -d -r1.1310.2.60 -r1.1310.2.61
*** ChangeLog	24 Nov 2006 05:40:58 -0000	1.1310.2.60
--- ChangeLog	24 Nov 2006 06:37:03 -0000	1.1310.2.61
***************
*** 1,4 ****
--- 1,10 ----
  2006-11-24 Braden McDaniel  <br...@en...>
  
+ 	* mozilla-plugin/src/openvrml.cpp
+ 	(plugin_instance::set_window(NPWindow &)): Removed unreachable
+ 	return statement.
+ 
+ 2006-11-24 Braden McDaniel  <br...@en...>
+ 
  	Removed RPM spec file.  This file is now maintained as part of
  	Fedora Extras.

[openvrml-commit] openvrml/mozilla-plugin/src openvrml.cpp, 1.37.2.7, 1.37.2.8

From: Braden M. <br...@us...> - 2006-11-24 06:37:06

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16644/mozilla-plugin/src

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	openvrml.cpp 
Log Message:
Removed unreachable return statement.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.37.2.7
retrieving revision 1.37.2.8
diff -C2 -d -r1.37.2.7 -r1.37.2.8
*** openvrml.cpp	22 Nov 2006 16:39:33 -0000	1.37.2.7
--- openvrml.cpp	24 Nov 2006 06:37:04 -0000	1.37.2.8
***************
*** 1212,1216 ****
                                       ? error->message
                                       : "g_io_channel_set_encoding failure");
-             return;
          }
          error_guard.dismiss();
--- 1212,1215 ----

[openvrml-commit] openvrml ChangeLog, 1.1382, 1.1383 Makefile.am, 1.52, 1.53 configure.ac, 1.100, 1.101 openvrml.spec.in, 1.59, NONE

From: Braden M. <br...@us...> - 2006-11-24 05:41:19

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26860

Modified Files:
	ChangeLog Makefile.am configure.ac 
Removed Files:
	openvrml.spec.in 
Log Message:
Removed RPM spec file.  This file is now maintained as part of Fedora Extras.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** configure.ac	3 Nov 2006 06:03:44 -0000	1.100
--- configure.ac	24 Nov 2006 05:41:18 -0000	1.101
***************
*** 24,29 ****
                  [tests/Makefile]
                  [tests/atlocal]
!                 [openvrml.pc]
!                 [openvrml.spec])
  
  AC_CANONICAL_TARGET
--- 24,28 ----
                  [tests/Makefile]
                  [tests/atlocal]
!                 [openvrml.pc])
  
  AC_CANONICAL_TARGET

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Makefile.am	28 Oct 2006 02:28:42 -0000	1.52
--- Makefile.am	24 Nov 2006 05:41:18 -0000	1.53
***************
*** 5,10 ****
  EXTRA_DIST = \
          openvrml.pc.in \
!         openvrml-gl.pc.in \
!         openvrml.spec.in
  
  if ENABLE_GL_RENDERER
--- 5,9 ----
  EXTRA_DIST = \
          openvrml.pc.in \
!         openvrml-gl.pc.in
  
  if ENABLE_GL_RENDERER
***************
*** 15,20 ****
  pkgconfig_DATA = openvrml.pc $(OPENVRML_GL_PC)
  
- dist-hook: openvrml.spec
- 	cp openvrml.spec $(distdir)
- 
  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--- 14,16 ----

--- openvrml.spec.in DELETED ---

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1382
retrieving revision 1.1383
diff -C2 -d -r1.1382 -r1.1383
*** ChangeLog	22 Nov 2006 16:39:45 -0000	1.1382
--- ChangeLog	24 Nov 2006 05:41:17 -0000	1.1383
***************
*** 1,2 ****
--- 1,11 ----
+ 2006-11-24 Braden McDaniel  <br...@en...>
+ 
+ 	Removed RPM spec file.  This file is now maintained as part of
+ 	Fedora Extras.
+ 
+ 	* Makefile.am
+ 	* configure.ac
+ 	* openvrml.spec.in: Removed file.
+ 
  2006-11-22 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml ChangeLog, 1.1310.2.59, 1.1310.2.60 Makefile.am, 1.51.2.1, 1.51.2.2 configure.ac, 1.92.2.7, 1.92.2.8 openvrml.spec.in, 1.52.2.7, NONE

From: Braden M. <br...@us...> - 2006-11-24 05:41:01

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26490

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog Makefile.am configure.ac 
Removed Files:
      Tag: OpenVRML-0_16-BRANCH
	openvrml.spec.in 
Log Message:
Removed RPM spec file.  This file is now maintained as part of Fedora Extras.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.92.2.7
retrieving revision 1.92.2.8
diff -C2 -d -r1.92.2.7 -r1.92.2.8
*** configure.ac	28 Oct 2006 07:08:43 -0000	1.92.2.7
--- configure.ac	24 Nov 2006 05:40:58 -0000	1.92.2.8
***************
*** 24,29 ****
                  [tests/Makefile]
                  [tests/atlocal]
!                 [openvrml.pc]
!                 [openvrml.spec])
  
  AC_CANONICAL_TARGET
--- 24,28 ----
                  [tests/Makefile]
                  [tests/atlocal]
!                 [openvrml.pc])
  
  AC_CANONICAL_TARGET

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/Makefile.am,v
retrieving revision 1.51.2.1
retrieving revision 1.51.2.2
diff -C2 -d -r1.51.2.1 -r1.51.2.2
*** Makefile.am	28 Oct 2006 02:28:34 -0000	1.51.2.1
--- Makefile.am	24 Nov 2006 05:40:58 -0000	1.51.2.2
***************
*** 5,10 ****
  EXTRA_DIST = \
          openvrml.pc.in \
!         openvrml-gl.pc.in \
!         openvrml.spec.in
  
  if ENABLE_GL_RENDERER
--- 5,9 ----
  EXTRA_DIST = \
          openvrml.pc.in \
!         openvrml-gl.pc.in
  
  if ENABLE_GL_RENDERER
***************
*** 15,20 ****
  pkgconfig_DATA = openvrml.pc $(OPENVRML_GL_PC)
  
- dist-hook: openvrml.spec
- 	cp openvrml.spec $(distdir)
- 
  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--- 14,16 ----

--- openvrml.spec.in DELETED ---

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.59
retrieving revision 1.1310.2.60
diff -C2 -d -r1.1310.2.59 -r1.1310.2.60
*** ChangeLog	22 Nov 2006 16:39:33 -0000	1.1310.2.59
--- ChangeLog	24 Nov 2006 05:40:58 -0000	1.1310.2.60
***************
*** 1,2 ****
--- 1,11 ----
+ 2006-11-24 Braden McDaniel  <br...@en...>
+ 
+ 	Removed RPM spec file.  This file is now maintained as part of
+ 	Fedora Extras.
+ 
+ 	* Makefile.am
+ 	* configure.ac
+ 	* openvrml.spec.in: Removed file.
+ 
  2006-11-22 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml ChangeLog,1.1381,1.1382

From: Braden M. <br...@us...> - 2006-11-22 16:39:48

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21889

Modified Files:
	ChangeLog 
Log Message:
Check that the request_channel is nonzero after creating a new one.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1381
retrieving revision 1.1382
diff -C2 -d -r1.1381 -r1.1382
*** ChangeLog	22 Nov 2006 04:51:36 -0000	1.1381
--- ChangeLog	22 Nov 2006 16:39:45 -0000	1.1382
***************
*** 1,2 ****
--- 1,8 ----
+ 2006-11-22 Braden McDaniel  <br...@en...>
+ 
+ 	* mozilla-plugin/src/openvrml.cpp
+ 	(plugin_instance::set_window(NPWindow &)): Check that the
+ 	request_channel is nonzero after creating a new one.
+ 
  2006-11-21 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml/mozilla-plugin/src openvrml.cpp, 1.43, 1.44

From: Braden M. <br...@us...> - 2006-11-22 16:39:48

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21889/mozilla-plugin/src

Modified Files:
	openvrml.cpp 
Log Message:
Check that the request_channel is nonzero after creating a new one.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** openvrml.cpp	25 Oct 2006 22:31:11 -0000	1.43
--- openvrml.cpp	22 Nov 2006 16:39:46 -0000	1.44
***************
*** 1217,1221 ****
  
          this->request_channel = g_io_channel_unix_new(standard_output);
!         if (!this->command_channel) { throw std::bad_alloc(); }
          this->request_channel_watch_id =
              g_io_add_watch(this->request_channel,
--- 1217,1221 ----
  
          this->request_channel = g_io_channel_unix_new(standard_output);
!         if (!this->request_channel) { throw std::bad_alloc(); }
          this->request_channel_watch_id =
              g_io_add_watch(this->request_channel,

[openvrml-commit] openvrml/mozilla-plugin/src openvrml.cpp, 1.37.2.6, 1.37.2.7

From: Braden M. <br...@us...> - 2006-11-22 16:39:35

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21867/mozilla-plugin/src

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	openvrml.cpp 
Log Message:
Check that the request_channel is nonzero after creating a new one.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.37.2.6
retrieving revision 1.37.2.7
diff -C2 -d -r1.37.2.6 -r1.37.2.7
*** openvrml.cpp	25 Oct 2006 22:30:52 -0000	1.37.2.6
--- openvrml.cpp	22 Nov 2006 16:39:33 -0000	1.37.2.7
***************
*** 1217,1221 ****
  
          this->request_channel = g_io_channel_unix_new(standard_output);
!         if (!this->command_channel) { throw std::bad_alloc(); }
          this->request_channel_watch_id =
              g_io_add_watch(this->request_channel,
--- 1217,1221 ----
  
          this->request_channel = g_io_channel_unix_new(standard_output);
!         if (!this->request_channel) { throw std::bad_alloc(); }
          this->request_channel_watch_id =
              g_io_add_watch(this->request_channel,

[openvrml-commit] openvrml ChangeLog,1.1310.2.58,1.1310.2.59

From: Braden M. <br...@us...> - 2006-11-22 16:39:35

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21867

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Check that the request_channel is nonzero after creating a new one.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.58
retrieving revision 1.1310.2.59
diff -C2 -d -r1.1310.2.58 -r1.1310.2.59
*** ChangeLog	22 Nov 2006 04:51:21 -0000	1.1310.2.58
--- ChangeLog	22 Nov 2006 16:39:33 -0000	1.1310.2.59
***************
*** 1,2 ****
--- 1,8 ----
+ 2006-11-22 Braden McDaniel  <br...@en...>
+ 
+ 	* mozilla-plugin/src/openvrml.cpp
+ 	(plugin_instance::set_window(NPWindow &)): Check that the
+ 	request_channel is nonzero after creating a new one.
+ 
  2006-11-21 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml ChangeLog,1.1380,1.1381

From: Braden M. <br...@us...> - 2006-11-22 04:51:39

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21915

Modified Files:
	ChangeLog 
Log Message:
Assert normalization of vectors by directly checking that the length is 1.0, rather than asserting that the vector is equal to the normalized version of itself.  The latter mechanism introduces too much error.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1380
retrieving revision 1.1381
diff -C2 -d -r1.1380 -r1.1381
*** ChangeLog	22 Nov 2006 00:05:17 -0000	1.1380
--- ChangeLog	22 Nov 2006 04:51:36 -0000	1.1381
***************
*** 1,4 ****
--- 1,21 ----
  2006-11-21 Braden McDaniel  <br...@en...>
  
+ 	Assert normalization of vectors by directly checking that the
+ 	length is 1.0, rather than asserting that the vector is equal to
+ 	the normalized version of itself.  The latter mechanism introduces
+ 	too much error.
+ 
+ 	* src/libopenvrml/openvrml/basetypes.cpp
+ 	(openvrml::make_rotation(const float (&)[4])): Assert that
+ 	the length of the vector is 1.0.
+ 	(openvrml::make_rotation(float, float, float, float)): Assert
+ 	that the length of the vector is 1.0.
+ 	(openvrml::make_rotation(const vec3f &, float)): Assert that
+ 	the length of the vector is 1.0.
+ 	(openvrml::rotation::axis(const vec3f &)): Assert that the length
+ 	of the vector is 1.0.
+ 
+ 2006-11-21 Braden McDaniel  <br...@en...>
+ 
  	Factored creation of openvrml::resource_istreams to a dedicated
  	abstract factory, openvrml::resource_fetcher.  This allows the

[openvrml-commit] openvrml/src/libopenvrml/openvrml basetypes.cpp, 1.39, 1.40

From: Braden M. <br...@us...> - 2006-11-22 04:51:39

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21915/src/libopenvrml/openvrml

Modified Files:
	basetypes.cpp 
Log Message:
Assert normalization of vectors by directly checking that the length is 1.0, rather than asserting that the vector is equal to the normalized version of itself.  The latter mechanism introduces too much error.

Index: basetypes.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** basetypes.cpp	31 Aug 2006 06:45:30 -0000	1.39
--- basetypes.cpp	22 Nov 2006 04:51:36 -0000	1.40
***************
*** 2674,2679 ****
      OPENVRML_NOTHROW
  {
!     assert(make_vec3f(rot[0], rot[1], rot[2])
!            == make_vec3f(rot[0], rot[1], rot[2]).normalize());
      const rotation r = { { rot[0], rot[1], rot[2], rot[3] } };
      return r;
--- 2674,2679 ----
      OPENVRML_NOTHROW
  {
!     assert(openvrml_::fequal(1.0f,
!                              make_vec3f(rot[0], rot[1], rot[2]).length()));
      const rotation r = { { rot[0], rot[1], rot[2], rot[3] } };
      return r;
***************
*** 2702,2706 ****
      OPENVRML_NOTHROW
  {
!     assert(make_vec3f(x, y, z) == make_vec3f(x, y, z).normalize());
      const rotation r = { { x, y, z, angle } };
      return r;
--- 2702,2706 ----
      OPENVRML_NOTHROW
  {
!     assert(openvrml_::fequal(1.0f, make_vec3f(x, y, z).length()));
      const rotation r = { { x, y, z, angle } };
      return r;
***************
*** 2725,2729 ****
      OPENVRML_NOTHROW
  {
!     assert(axis == axis.normalize());
      const rotation r = { { axis.x(), axis.y(), axis.z(), angle } };
      return r;
--- 2725,2729 ----
      OPENVRML_NOTHROW
  {
!     assert(openvrml_::fequal(1.0f, axis.length()));
      const rotation r = { { axis.x(), axis.y(), axis.z(), angle } };
      return r;
***************
*** 2935,2939 ****
  void openvrml::rotation::axis(const vec3f & axis) OPENVRML_NOTHROW
  {
!     assert(axis == axis.normalize());
      this->rot[0] = axis.x();
      this->rot[1] = axis.y();
--- 2935,2939 ----
  void openvrml::rotation::axis(const vec3f & axis) OPENVRML_NOTHROW
  {
!     assert(openvrml_::fequal(1.0f, axis.length()));
      this->rot[0] = axis.x();
      this->rot[1] = axis.y();

[openvrml-commit] openvrml ChangeLog,1.1310.2.57,1.1310.2.58

From: Braden M. <br...@us...> - 2006-11-22 04:51:26

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21871

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Assert normalization of vectors by directly checking that the length is 1.0, rather than asserting that the vector is equal to the normalized version of itself.  The latter mechanism introduces too much error.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.57
retrieving revision 1.1310.2.58
diff -C2 -d -r1.1310.2.57 -r1.1310.2.58
*** ChangeLog	20 Nov 2006 03:21:14 -0000	1.1310.2.57
--- ChangeLog	22 Nov 2006 04:51:21 -0000	1.1310.2.58
***************
*** 1,2 ****
--- 1,19 ----
+ 2006-11-21 Braden McDaniel  <br...@en...>
+ 
+ 	Assert normalization of vectors by directly checking that the
+ 	length is 1.0, rather than asserting that the vector is equal to
+ 	the normalized version of itself.  The latter mechanism introduces
+ 	too much error.
+ 
+ 	* src/libopenvrml/openvrml/basetypes.cpp
+ 	(openvrml::rotation::rotation(const float (&)[4])): Assert that
+ 	the length of the vector is 1.0.
+ 	(openvrml::rotation::rotation(float, float, float, float)): Assert
+ 	that the length of the vector is 1.0.
+ 	(openvrml::rotation::rotation(const vec3f &, float)): Assert that
+ 	the length of the vector is 1.0.
+ 	(openvrml::rotation::axis(const vec3f &)): Assert that the length
+ 	of the vector is 1.0.
+ 
  2006-11-19 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml/src/libopenvrml/openvrml basetypes.cpp, 1.37.2.1, 1.37.2.2

From: Braden M. <br...@us...> - 2006-11-22 04:51:26

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21871/src/libopenvrml/openvrml

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	basetypes.cpp 
Log Message:
Assert normalization of vectors by directly checking that the length is 1.0, rather than asserting that the vector is equal to the normalized version of itself.  The latter mechanism introduces too much error.

Index: basetypes.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.cpp,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -C2 -d -r1.37.2.1 -r1.37.2.2
*** basetypes.cpp	23 Aug 2006 06:49:49 -0000	1.37.2.1
--- basetypes.cpp	22 Nov 2006 04:51:22 -0000	1.37.2.2
***************
*** 2578,2583 ****
  openvrml::rotation::rotation(const float (&rot)[4]) OPENVRML_NOTHROW
  {
!     assert(vec3f(rot[0], rot[1], rot[2])
!            == vec3f(rot[0], rot[1], rot[2]).normalize());
      std::copy(rot, rot + 4, this->rot);
  }
--- 2578,2582 ----
  openvrml::rotation::rotation(const float (&rot)[4]) OPENVRML_NOTHROW
  {
!     assert(openvrml_::fequal(1.0f, vec3f(rot[0], rot[1], rot[2]).length()));
      std::copy(rot, rot + 4, this->rot);
  }
***************
*** 2599,2603 ****
      OPENVRML_NOTHROW
  {
!     assert(vec3f(x, y, z) == vec3f(x, y, z).normalize());
      this->rot[0] = x;
      this->rot[1] = y;
--- 2598,2602 ----
      OPENVRML_NOTHROW
  {
!     assert(openvrml_::fequal(1.0f, vec3f(x, y, z).length()));
      this->rot[0] = x;
      this->rot[1] = y;
***************
*** 2617,2621 ****
      OPENVRML_NOTHROW
  {
!     assert(axis == axis.normalize());
      this->axis(axis);
      this->rot[3] = angle;
--- 2616,2620 ----
      OPENVRML_NOTHROW
  {
!     assert(openvrml_::fequal(1.0f, axis.length()));
      this->axis(axis);
      this->rot[3] = angle;
***************
*** 2814,2818 ****
  void openvrml::rotation::axis(const vec3f & axis) OPENVRML_NOTHROW
  {
!     assert(axis == axis.normalize());
      this->rot[0] = axis.x();
      this->rot[1] = axis.y();
--- 2813,2817 ----
  void openvrml::rotation::axis(const vec3f & axis) OPENVRML_NOTHROW
  {
!     assert(openvrml_::fequal(1.0f, axis.length()));
      this->rot[0] = axis.x();
      this->rot[1] = axis.y();

[openvrml-commit] openvrml/tests test_resource_fetcher.cpp, NONE, 1.1 test_resource_fetcher.h, NONE, 1.1 Makefile.am, 1.15, 1.16 browser.cpp, 1.7, 1.8 parse_anchor.cpp, 1.5, 1.6 parse_vrml97.cpp, 1.2, 1.3 parse_x3dvrml.cpp, 1.2, 1.3 test_browser.cpp, 1.5, NONE test_browser.h, 1.3, NONE

From: Braden M. <br...@us...> - 2006-11-22 00:05:22

Update of /cvsroot/openvrml/openvrml/tests
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3665/tests

Modified Files:
	Makefile.am browser.cpp parse_anchor.cpp parse_vrml97.cpp 
	parse_x3dvrml.cpp 
Added Files:
	test_resource_fetcher.cpp test_resource_fetcher.h 
Removed Files:
	test_browser.cpp test_browser.h 
Log Message:
Factored creation of openvrml::resource_istreams to a dedicated abstract factory, openvrml::resource_fetcher.  This allows the code associated with resource fetching to live at least as long as the browser instance, which it needs to do if there are any outstanding fetches happening when the browser instance is destroyed.

--- test_browser.h DELETED ---

Index: parse_vrml97.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/tests/parse_vrml97.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** parse_vrml97.cpp	6 Mar 2006 05:58:26 -0000	1.2
--- parse_vrml97.cpp	22 Nov 2006 00:05:19 -0000	1.3
***************
*** 19,23 ****
  
  # include <iostream>
! # include "test_browser.h"
  
  using namespace std;
--- 19,23 ----
  
  # include <iostream>
! # include "test_resource_fetcher.h"
  
  using namespace std;
***************
*** 27,31 ****
  {
      try {
!         test_browser b;
          b.create_vrml_from_stream(cin, vrml_media_type);
      } catch (invalid_vrml & ex) {
--- 27,32 ----
  {
      try {
!         test_resource_fetcher fetcher;
!         browser b(fetcher, std::cout, std::cerr);
          b.create_vrml_from_stream(cin, vrml_media_type);
      } catch (invalid_vrml & ex) {

--- NEW FILE: test_resource_fetcher.cpp ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
//
// Copyright 2006  Braden McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# include <iostream>
# include <fstream>
# include <boost/algorithm/string/predicate.hpp>
# include "test_resource_fetcher.h"

std::auto_ptr<openvrml::resource_istream>
test_resource_fetcher::do_get_resource(const std::string & uri)
{
    using std::auto_ptr;
    using std::invalid_argument;
    using std::string;
    using openvrml::resource_istream;

    class file_resource_istream : public resource_istream {
        std::string url_;
        std::filebuf buf_;

    public:
        explicit file_resource_istream(const std::string & path):
            resource_istream(&this->buf_)
        {
            if (!this->buf_.open(path.c_str(), ios_base::in)) {
                this->setstate(ios_base::failbit);
            }
        }

        void url(const std::string & str) throw (std::bad_alloc)
        {
            this->url_ = str;
        }

    private:
        virtual const std::string do_url() const throw ()
        {
            return this->url_;
        }

        virtual const std::string do_type() const throw ()
        {
            using std::find;
            using std::string;
            using boost::algorithm::iequals;
            using boost::next;
            string media_type = "application/octet-stream";
            const string::const_reverse_iterator dot_pos =
                find(this->url_.rbegin(), this->url_.rend(), '.');
            if (dot_pos == this->url_.rend()
                || next(dot_pos.base()) == this->url_.end()) {
                return media_type;
            }
            const string::const_iterator hash_pos =
                find(next(dot_pos.base()), this->url_.end(), '#');
            const string ext(dot_pos.base(), hash_pos);
            if (iequals(ext, "wrl")) {
                media_type = "model/vrml";
            } else if (iequals(ext, "x3dv")) {
                media_type = "model/x3d+vrml";
            } else if (iequals(ext, "png")) {
                media_type = "image/png";
            } else if (iequals(ext, "jpg") || iequals(ext, "jpeg")) {
                media_type = "image/jpeg";
            }
            return media_type;
        }

        virtual bool do_data_available() const throw ()
        {
            return !!(*this);
        }
    };

    const string scheme = uri.substr(0, uri.find_first_of(':'));
    if (scheme != "file") {
        throw invalid_argument('\"' + scheme + "\" URI scheme not supported");
    }
    //
    // file://
    //        ^
    // 01234567
    //
    string path = uri.substr(uri.find_first_of('/', 7));

    auto_ptr<resource_istream> in(new file_resource_istream(path));
    static_cast<file_resource_istream *>(in.get())->url(uri);

    return in;
}

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/tests/browser.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** browser.cpp	28 Jul 2006 07:11:10 -0000	1.7
--- browser.cpp	22 Nov 2006 00:05:19 -0000	1.8
***************
*** 19,22 ****
--- 19,23 ----
  
  # include <fstream>
+ # include <iostream>
  # include <sstream>
  # include <boost/filesystem/operations.hpp>
***************
*** 24,28 ****
  # include <boost/thread.hpp>
  # include <boost/test/unit_test.hpp>
! # include "test_browser.h"
  
  using namespace std;
--- 25,29 ----
  # include <boost/thread.hpp>
  # include <boost/test/unit_test.hpp>
! # include "test_resource_fetcher.h"
  
  using namespace std;
***************
*** 33,37 ****
  void create_vrml_from_stream()
  {
!     test_browser b;
  
      const char vrmlstring[] = "Group {}";
--- 34,39 ----
  void create_vrml_from_stream()
  {
!     test_resource_fetcher fetcher;
!     browser b(fetcher, std::cout, std::cerr);
  
      const char vrmlstring[] = "Group {}";
***************
*** 61,65 ****
      stringstream vrmlstream(vrmlstring);
  
!     test_browser b;
  
      vector<boost::intrusive_ptr<node> > nodes =
--- 63,68 ----
      stringstream vrmlstream(vrmlstring);
  
!     test_resource_fetcher fetcher;
!     browser b(fetcher, std::cout, std::cerr);
  
      vector<boost::intrusive_ptr<node> > nodes =
***************
*** 110,114 ****
      boost::ignore_unused_variable_warning(test_file_guard);
  
!     test_browser b;
      const char vrmlstring[] = "Group {}";
      stringstream vrmlstream(vrmlstring);
--- 113,118 ----
      boost::ignore_unused_variable_warning(test_file_guard);
  
!     test_resource_fetcher fetcher;
!     browser b(fetcher, std::cout, std::cerr);
      const char vrmlstring[] = "Group {}";
      stringstream vrmlstream(vrmlstring);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/tests/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.am	23 Aug 2006 06:41:27 -0000	1.15
--- Makefile.am	22 Nov 2006 00:05:19 -0000	1.16
***************
*** 17,23 ****
  check_LTLIBRARIES = libtest-openvrml.la
  check_PROGRAMS = $(TESTS) parse-vrml97 parse-x3dvrml
! noinst_HEADERS = test_browser.h
  
! libtest_openvrml_la_SOURCES = test_browser.cpp
  libtest_openvrml_la_LIBADD = $(top_builddir)/src/libopenvrml/libopenvrml.la
  
--- 17,23 ----
  check_LTLIBRARIES = libtest-openvrml.la
  check_PROGRAMS = $(TESTS) parse-vrml97 parse-x3dvrml
! noinst_HEADERS = test_resource_fetcher.h
  
! libtest_openvrml_la_SOURCES = test_resource_fetcher.cpp
  libtest_openvrml_la_LIBADD = $(top_builddir)/src/libopenvrml/libopenvrml.la
  

Index: parse_x3dvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/tests/parse_x3dvrml.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** parse_x3dvrml.cpp	6 Mar 2006 05:58:26 -0000	1.2
--- parse_x3dvrml.cpp	22 Nov 2006 00:05:19 -0000	1.3
***************
*** 19,23 ****
  
  # include <iostream>
! # include "test_browser.h"
  
  using namespace std;
--- 19,23 ----
  
  # include <iostream>
! # include "test_resource_fetcher.h"
  
  using namespace std;
***************
*** 27,31 ****
  {
      try {
!         test_browser b;
          b.create_vrml_from_stream(cin, x3d_vrml_media_type);
      } catch (invalid_vrml & ex) {
--- 27,32 ----
  {
      try {
!         test_resource_fetcher fetcher;
!         browser b(fetcher, std::cout, std::cerr);
          b.create_vrml_from_stream(cin, x3d_vrml_media_type);
      } catch (invalid_vrml & ex) {

--- NEW FILE: test_resource_fetcher.h ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
//
// Copyright 2006  Braden McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# ifndef TEST_RESOURCE_FETCHER
#   define TEST_RESOURCE_FETCHER

#   include <openvrml/browser.h>

class test_resource_fetcher : public openvrml::resource_fetcher {
private:
    virtual std::auto_ptr<openvrml::resource_istream>
    do_get_resource(const std::string & uri);
};

# endif

--- test_browser.cpp DELETED ---

Index: parse_anchor.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/tests/parse_anchor.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** parse_anchor.cpp	27 Feb 2006 21:14:08 -0000	1.5
--- parse_anchor.cpp	22 Nov 2006 00:05:19 -0000	1.6
***************
*** 21,25 ****
  # include <iostream>
  # include <sstream>
! # include "test_browser.h"
  
  int main()
--- 21,25 ----
  # include <iostream>
  # include <sstream>
! # include "test_resource_fetcher.h"
  
  int main()
***************
*** 29,33 ****
  
      try {
!         test_browser b;
  
          const char vrmlstring[] =
--- 29,34 ----
  
      try {
!         test_resource_fetcher fetcher;
!         browser b(fetcher, std::cout, std::cerr);
  
          const char vrmlstring[] =

Flat | Threaded

<< < 1 .. 87 88 89 90 91 .. 134 > >> (Page 89 of 134)