Update of /cvsroot/playerstage/code/player/server/drivers/mixed/garcia
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10946/server/drivers/mixed/garcia
Modified Files:
garcia_mixed.cc
Log Message:
applied Toby's patch to replace fixed-size arrays
Index: garcia_mixed.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/garcia/garcia_mixed.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** garcia_mixed.cc 23 Aug 2007 19:58:45 -0000 1.9
--- garcia_mixed.cc 1 Nov 2007 22:16:20 -0000 1.10
***************
*** 545,554 ****
player_ir_pose_t pose;
pose.poses_count = 6;
! memcpy(pose.poses, poses, 6*sizeof(player_pose_t));
Publish(mIrAddr,
PLAYER_MSGTYPE_RESP_ACK,
PLAYER_IR_REQ_POSE,
! &pose, sizeof(pose), NULL);
}
--- 545,556 ----
player_ir_pose_t pose;
pose.poses_count = 6;
! pose.poses = new double[pose.poses_count];
! memcpy(pose.poses, poses, 6*sizeof(player_pose3d_t));
Publish(mIrAddr,
PLAYER_MSGTYPE_RESP_ACK,
PLAYER_IR_REQ_POSE,
! &pose);
! delete [] pose.poses;
}
***************
*** 573,577 ****
mIrData.voltages_count = 0;
mIrData.ranges_count = 6;
!
mIrData.ranges[0] =
mGarcia->getNamedValue("front-ranger-left")->getFloatVal();
mIrData.ranges[1] =
mGarcia->getNamedValue("front-ranger-right")->getFloatVal();
--- 575,580 ----
mIrData.voltages_count = 0;
mIrData.ranges_count = 6;
! mIrData.ranges = new double[mIrData.ranges_count];
!
mIrData.ranges[0] =
mGarcia->getNamedValue("front-ranger-left")->getFloatVal();
mIrData.ranges[1] =
mGarcia->getNamedValue("front-ranger-right")->getFloatVal();
***************
*** 583,587 ****
Publish(mIrAddr,
PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES,
! reinterpret_cast<void*>(&mIrData), sizeof(mIrData), NULL);
// do we currently have a dio device?
--- 586,591 ----
Publish(mIrAddr,
PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES,
! reinterpret_cast<void*>(&mIrData));
! delete [] mIrData.ranges;
// do we currently have a dio device?
-------------------------------------------------------------------------
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
