Update of /cvsroot/playerstage/code/player/client_libs/libplayerc++
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/client_libs/libplayerc++
Modified Files:
Tag: b_thjc_dynamic_arrays
opaqueproxy.cc .cvsignore playerc++.h vectormapproxy.cc
Log Message:
Merged some changes from head a while back
Work on updating drivers, A-J done, laser is next
Index: vectormapproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/vectormapproxy.cc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** vectormapproxy.cc 20 Aug 2007 19:42:47 -0000 1.1
--- vectormapproxy.cc 10 Oct 2007 09:26:01 -0000 1.1.2.1
***************
*** 88,91 ****
--- 88,92 ----
void VectorMapProxy::GetMapInfo()
{
+ scoped_lock_t lock(mPc->mMutex);
playerc_vectormap_get_map_info(mDevice);
map_info_cached = true;
***************
*** 94,97 ****
--- 95,99 ----
int VectorMapProxy::GetLayerCount() const
{
+ scoped_lock_t lock(mPc->mMutex);
if (map_info_cached)
return mDevice->layers_count;
***************
*** 102,105 ****
--- 104,108 ----
vector<string> VectorMapProxy::GetLayerNames() const
{
+ scoped_lock_t lock(mPc->mMutex);
vector<string> names;
int layerCount = GetLayerCount();
***************
*** 109,113 ****
for (int i=0; i<layerCount; ++i)
{
! names.push_back(string(mDevice->layers[i]->info.name));
}
--- 112,116 ----
for (int i=0; i<layerCount; ++i)
{
! names.push_back(string(mDevice->layers_info[i]->name));
}
***************
*** 127,133 ****
return -1;
! return mDevice->layers[layer_index]->features_count;
}
ostream&
std::operator << (ostream &os, const VectorMapProxy &c)
--- 130,144 ----
return -1;
! scoped_lock_t lock(mPc->mMutex);
! return mDevice->layers_data[layer_index]->features_count;
}
+ GEOSGeom VectorMapProxy::GetFeatureData(unsigned layer_index, unsigned
feature_index) const
+ {
+ scoped_lock_t lock(mPc->mMutex);
+ return playerc_vectormap_get_feature_data(mDevice, layer_index,
feature_index);
+ }
+
+
ostream&
std::operator << (ostream &os, const VectorMapProxy &c)
Index: playerc++.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/playerc++.h,v
retrieving revision 1.98
retrieving revision 1.98.2.1
diff -C2 -d -r1.98 -r1.98.2.1
*** playerc++.h 22 Aug 2007 00:19:56 -0000 1.98
--- playerc++.h 10 Oct 2007 09:26:01 -0000 1.98.2.1
***************
*** 2373,2376 ****
--- 2373,2377 ----
std::vector<std::string> GetLayerNames() const;
int GetFeatureCount(unsigned layer_index) const;
+ GEOSGeom GetFeatureData(unsigned layer_index, unsigned feature_index)
const;
};
Index: opaqueproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/opaqueproxy.cc,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** opaqueproxy.cc 10 Jul 2007 09:01:50 -0000 1.3
--- opaqueproxy.cc 10 Oct 2007 09:26:01 -0000 1.3.2.1
***************
*** 91,101 ****
OpaqueProxy::SendReq(player_opaque_data_t* aRequest)
{
! player_opaque_data_t aReply;
int result = playerc_opaque_req(mDevice, aRequest, &aReply);
if (result == 0)
{
! memcpy(mDevice->data, aReply.data, aReply.data_count);
! mDevice->data_count = aReply.data_count;
}
return result;
}
--- 91,102 ----
OpaqueProxy::SendReq(player_opaque_data_t* aRequest)
{
! player_opaque_data_t *aReply;
int result = playerc_opaque_req(mDevice, aRequest, &aReply);
if (result == 0)
{
! memcpy(mDevice->data, aReply->data, aReply->data_count);
! mDevice->data_count = aReply->data_count;
}
+ player_opaque_data_t_free(aReply);
return result;
}
Index: .cvsignore
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc++/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** .cvsignore 27 Oct 2005 20:55:28 -0000 1.2
--- .cvsignore 10 Oct 2007 09:26:01 -0000 1.2.4.1
***************
*** 5,6 ****
--- 5,10 ----
stamp-h3
+ .libs
+ .deps
+ *.lo
+ *.la
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
