Update of /cvsroot/playerstage/code/player/client_libs/libplayerc++
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31331/client_libs/libplayerc++
Modified Files:
playerclient.cc vectormapproxy.cc
Log Message:
These changes were contributed by David Olsen, including:
Extensive NAV200 changes, adding new constallelation configuration options
Fix to memory leak of messages when a player client is destroyed
Fix to laser interface which assumed intensity was provided
Fix to memory leaks in vectormap interface (mainly leaking geoms)
Proper error handling in C++ PlayerClient Peek
Mutex lock in VectorMapProxy GetLayerData
playerv vectormap rendering bug
Index: vectormapproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/vectormapproxy.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vectormapproxy.cc 6 Dec 2007 22:41:46 -0000 1.4
--- vectormapproxy.cc 4 Feb 2008 18:59:43 -0000 1.5
***************
*** 122,126 ****
--- 122,131 ----
{
if (map_info_cached)
+ {
+ scoped_lock_t lock(mPc->mMutex);
playerc_vectormap_get_layer_data(mDevice, layer_index);
+ }
+ else
+ PLAYER_ERROR("Map info not cached\n");
}
***************
*** 128,132 ****
{
int layerCount = GetLayerCount();
! if (layerCount < 1)
return -1;
--- 133,137 ----
{
int layerCount = GetLayerCount();
! if (layerCount <= (int)layer_index)
return -1;
Index: playerclient.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/playerclient.cc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** playerclient.cc 26 Nov 2007 22:14:59 -0000 1.28
--- playerclient.cc 4 Feb 2008 18:59:43 -0000 1.29
***************
*** 210,214 ****
ClientProxy::scoped_lock_t lock(mMutex);
//EVAL(playerc_client_peek(mClient, aTimeout));
! return playerc_client_peek(mClient, aTimeout);
}
--- 210,217 ----
ClientProxy::scoped_lock_t lock(mMutex);
//EVAL(playerc_client_peek(mClient, aTimeout));
! int ret = playerc_client_peek(mClient, aTimeout);
! if (ret < 0)
! throw PlayerError("PlayerClient::Peek()", playerc_error_str());
! return ret;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
