Update of /cvsroot/playerstage/code/player/server/drivers/fiducial
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/fiducial
Modified Files:
laserbar.cc laserbarcode.cc laservisualbarcode.cc
laservisualbw.cc
Log Message:
applied Toby's autopointer patches
Index: laservisualbw.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laservisualbw.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** laservisualbw.cc 20 Aug 2007 06:37:27 -0000 1.18
--- laservisualbw.cc 23 Aug 2007 19:58:43 -0000 1.19
***************
*** 158,162 ****
// Process incoming messages from clients
! int ProcessMessage (MessageQueue * resp_queue, player_msghdr * hdr, void *
data);
// Process laser data.
--- 158,162 ----
// Process incoming messages from clients
! int ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void *
data);
// Process laser data.
***************
*** 386,390 ****
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserVisualBW::ProcessMessage (MessageQueue * resp_queue, player_msghdr *
hdr, void * data)
{
assert(hdr);
--- 386,390 ----
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserVisualBW::ProcessMessage (QueuePointer &resp_queue, player_msghdr *
hdr, void * data)
{
assert(hdr);
***************
*** 1083,1087 ****
// Copy data to server.
! Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
(void*) &data, sizeof(data), ×tamp);
}
--- 1083,1087 ----
// Copy data to server.
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
(void*) &data, sizeof(data), ×tamp);
}
Index: laservisualbarcode.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laservisualbarcode.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** laservisualbarcode.cc 20 Aug 2007 06:37:27 -0000 1.14
--- laservisualbarcode.cc 23 Aug 2007 19:58:43 -0000 1.15
***************
*** 146,150 ****
// Process incoming messages from clients
! int ProcessMessage (MessageQueue * resp_queue, player_msghdr * hdr, void *
data);
// Info on potential fiducials.
--- 146,150 ----
// Process incoming messages from clients
! int ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void *
data);
// Info on potential fiducials.
***************
*** 405,409 ****
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserVisualBarcode::ProcessMessage (MessageQueue * resp_queue,
player_msghdr * hdr, void * data)
{
assert(hdr);
--- 405,409 ----
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserVisualBarcode::ProcessMessage (QueuePointer &resp_queue,
player_msghdr * hdr, void * data)
{
assert(hdr);
***************
*** 987,991 ****
// Copy data to server.
! Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
(void*) &data, sizeof(data), ×tamp);
}
--- 987,991 ----
// Copy data to server.
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
(void*) &data, sizeof(data), ×tamp);
}
Index: laserbarcode.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laserbarcode.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** laserbarcode.cc 20 Aug 2007 06:37:27 -0000 1.18
--- laserbarcode.cc 23 Aug 2007 19:58:43 -0000 1.19
***************
*** 146,150 ****
// Process incoming messages from clients
! int ProcessMessage (MessageQueue * resp_queue, player_msghdr * hdr, void *
data);
// Main function for device thread
--- 146,150 ----
// Process incoming messages from clients
! int ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void *
data);
// Main function for device thread
***************
*** 270,274 ****
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserBarcode::ProcessMessage (MessageQueue * resp_queue, player_msghdr *
hdr, void * data)
{
assert(hdr);
--- 270,274 ----
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserBarcode::ProcessMessage (QueuePointer &resp_queue, player_msghdr *
hdr, void * data)
{
assert(hdr);
***************
*** 546,550 ****
{
// Write the data with the laser timestamp
! this->Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_FIDUCIAL_DATA_SCAN, &this->data, sizeof(this->data));
return;
--- 546,550 ----
{
// Write the data with the laser timestamp
! this->Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
&this->data, sizeof(this->data));
return;
Index: laserbar.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/fiducial/laserbar.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** laserbar.cc 20 Aug 2007 06:37:27 -0000 1.19
--- laserbar.cc 23 Aug 2007 19:58:43 -0000 1.20
***************
*** 128,132 ****
// Process incoming messages from clients
! int ProcessMessage(MessageQueue *resp_queue, player_msghdr *hdr, void
*data);
// Main function for device thread.
--- 128,132 ----
// Process incoming messages from clients
! int ProcessMessage(QueuePointer &resp_queue, player_msghdr *hdr, void
*data);
// Main function for device thread.
***************
*** 279,283 ****
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserBar::ProcessMessage(MessageQueue *resp_queue, player_msghdr *hdr,
void *data)
{
--- 279,283 ----
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserBar::ProcessMessage(QueuePointer &resp_queue, player_msghdr *hdr,
void *data)
{
***************
*** 314,318 ****
printf("Count[%d]\n",this->fdata.fiducials_count);
! this->Publish(this->device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
reinterpret_cast<void*>(&this->fdata),
--- 314,318 ----
printf("Count[%d]\n",this->fdata.fiducials_count);
! this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
reinterpret_cast<void*>(&this->fdata),
-------------------------------------------------------------------------
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
