Update of
/cvsroot/playerstage/code/player/server/drivers/blobfinder/artoolkitplus
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/server/drivers/blobfinder/artoolkitplus
Modified Files:
Tag: b_thjc_dynamic_arrays
artoolkitplus.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/artoolkitplus/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** .cvsignore 2 May 2006 10:26:28 -0000 1.1
--- .cvsignore 10 Oct 2007 09:26:08 -0000 1.1.4.1
***************
*** 1,2 ****
--- 1,6 ----
Makefile
Makefile.in
+ .deps
+ *.la
+ .libs
+ *.lo
Index: artoolkitplus.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/artoolkitplus/artoolkitplus.cc,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** artoolkitplus.cc 23 Aug 2007 19:58:42 -0000 1.4
--- artoolkitplus.cc 10 Oct 2007 09:26:08 -0000 1.4.2.1
***************
*** 239,242 ****
--- 239,243 ----
blobs.height = stored_data.height;
blobs.blobs_count = 0;
+ blobs.blobs =
(player_blobfinder_blob_t*)calloc(minfocnt,sizeof(blobs.blobs[0]));
for(int i =0 ;i < minfocnt; i++)
{
***************
*** 268,273 ****
}
!
Publish(device_addr,PLAYER_MSGTYPE_DATA,PLAYER_BLOBFINDER_DATA_BLOBS,&blobs,sizeof(blobs));
!
return 0;
}
--- 269,274 ----
}
!
Publish(device_addr,PLAYER_MSGTYPE_DATA,PLAYER_BLOBFINDER_DATA_BLOBS,&blobs);
! free(blobs.blobs);
return 0;
}
-------------------------------------------------------------------------
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
