Update of /cvsroot/playerstage/code/player/server/drivers/blobfinder/acts
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/server/drivers/blobfinder/acts
Modified Files:
Tag: b_thjc_dynamic_arrays
acts.cc .cvsignore
Log Message:
Merged some changes from head a while back
Work on updating drivers, A-J done, laser is next
Index: .cvsignore
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/acts/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -d -r1.1 -r1.1.6.1
*** .cvsignore 4 Oct 2005 17:53:50 -0000 1.1
--- .cvsignore 10 Oct 2007 09:26:09 -0000 1.1.6.1
***************
*** 1,2 ****
--- 1,6 ----
Makefile
Makefile.in
+ .deps
+ *.la
+ .libs
+ *.lo
Index: acts.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/acts/acts.cc,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** acts.cc 23 Aug 2007 19:58:42 -0000 1.5
--- acts.cc 10 Oct 2007 09:26:09 -0000 1.5.2.1
***************
*** 855,858 ****
--- 855,859 ----
}
+
if(acts_version == ACTS_VERSION_1_0)
{
***************
*** 947,950 ****
--- 948,952 ----
local_data.height = acts_data.height;
local_data.blobs_count = num_blobs;
+ local_data.blobs = (player_blobfinder_blob_t *)calloc(num_blobs,
sizeof(local_data.blobs[0]));
for (i = 0; i < num_blobs; i++)
***************
*** 964,969 ****
/* got the data. now fill it in */
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_BLOBFINDER_DATA_BLOBS,
&local_data, sizeof(local_data) - sizeof(local_data.blobs) +
! (local_data.blobs_count) * sizeof(local_data.blobs[0]), NULL);
}
--- 966,971 ----
/* got the data. now fill it in */
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_BLOBFINDER_DATA_BLOBS,
&local_data);
! free(local_data.blobs);
}
-------------------------------------------------------------------------
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
