Update of /cvsroot/playerstage/code/player/server/drivers/blobfinder/simpleshape
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10946/server/drivers/blobfinder/simpleshape
Modified Files:
.cvsignore simpleshape.cc
Log Message:
applied Toby's patch to replace fixed-size arrays
Index: .cvsignore
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/simpleshape/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** .cvsignore 17 Sep 2007 02:18:55 -0000 1.2
--- .cvsignore 1 Nov 2007 22:16:17 -0000 1.3
***************
*** 3,4 ****
--- 3,6 ----
.deps
*.la
+ .libs
+ *.lo
Index: simpleshape.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/simpleshape/simpleshape.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** simpleshape.cc 23 Aug 2007 19:58:42 -0000 1.6
--- simpleshape.cc 1 Nov 2007 22:16:17 -0000 1.7
***************
*** 605,609 ****
data.blobs_count = (this->shapeCount);
!
for (i = 0; i < this->shapeCount; i++)
{
--- 605,609 ----
data.blobs_count = (this->shapeCount);
! data.blobs =
(player_blobfinder_blob_t*)calloc(shapeCount,sizeof(data.blobs[0]));
for (i = 0; i < this->shapeCount; i++)
{
***************
*** 625,631 ****
// Copy data to server.
Publish(device_addr,PLAYER_MSGTYPE_DATA,PLAYER_BLOBFINDER_DATA_BLOBS,&data,sizeof(data));
! // Copy data to server
! /* size = sizeof(data) - sizeof(data.blobs) + this->shapeCount *
sizeof(data.blobs[0]);
! this->PutMsg(this->blobfinder_id, NULL, PLAYER_MSGTYPE_DATA, 0, &data,
size, &this->cameraTime);*/
return;
--- 625,629 ----
// Copy data to server.
Publish(device_addr,PLAYER_MSGTYPE_DATA,PLAYER_BLOBFINDER_DATA_BLOBS,&data,sizeof(data));
! free(data.blobs);
return;
-------------------------------------------------------------------------
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
