SF.net SVN: openvrml:[4122] trunk

[<br...@us...>]

Revision: 4122
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4122&view=rev
Author:   braden
Date:     2010-04-13 07:38:06 +0000 (Tue, 13 Apr 2010)

Log Message:
-----------
Acquire a unique_lock on the image_mutex_.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/node/vrml97/image_stream_listener.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-21 07:49:50 UTC (rev 4121)
+++ trunk/ChangeLog	2010-04-13 07:38:06 UTC (rev 4122)
@@ -1,3 +1,9 @@
+2010-04-13 Braden McDaniel  <br...@en...>
+
+	* src/node/vrml97/image_stream_listener.cpp
+	(openvrml_png_info_callback(png_structp, png_infop)): Acquire a
+	unique_lock on the image_mutex_.
+
 2010-03-21 Braden McDaniel  <br...@en...>
 
 	* README: Note libltdl requirement.

Modified: trunk/src/node/vrml97/image_stream_listener.cpp
===================================================================
--- trunk/src/node/vrml97/image_stream_listener.cpp	2010-03-21 07:49:50 UTC (rev 4121)
+++ trunk/src/node/vrml97/image_stream_listener.cpp	2010-04-13 07:38:06 UTC (rev 4122)
@@ -49,7 +49,7 @@
     png_reader_t & reader =
         *static_cast<png_reader_t *>(png_get_progressive_ptr(png_ptr));
 
-    shared_lock<shared_mutex> lock(reader.stream_listener.image_mutex_);
+    unique_lock<shared_mutex> lock(reader.stream_listener.image_mutex_);
 
     openvrml::image & image = reader.stream_listener.image_;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.