Update of /cvsroot/playerstage/code/player/server/drivers/blobfinder/cmvision
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/server/drivers/blobfinder/cmvision
Modified Files:
Tag: b_thjc_dynamic_arrays
.cvsignore P2CMV.cc
Log Message:
Merged some changes from head a while back
Work on updating drivers, A-J done, laser is next
Index: P2CMV.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/cmvision/P2CMV.cc,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C2 -d -r1.29 -r1.29.2.1
*** P2CMV.cc 23 Aug 2007 19:58:42 -0000 1.29
--- P2CMV.cc 10 Oct 2007 09:26:10 -0000 1.29.2.1
***************
*** 152,155 ****
--- 152,156 ----
player_blobfinder_data_t mData;
+ unsigned int allocated_blobs;
player_devaddr_t mCameraAddr;
***************
*** 244,247 ****
--- 245,249 ----
// clean our data
memset(&mData,0,sizeof(mData));
+ allocated_blobs = 0;
puts("done.");
***************
*** 323,326 ****
--- 325,329 ----
}
+
mData.blobs_count = 0;
for (int ch = 0; ch < CMV_MAX_COLORS; ++ch)
***************
*** 334,339 ****
for (r = mVision->getRegions(ch); r != NULL; r = r->next)
{
! if (mData.blobs_count >= PLAYER_BLOBFINDER_MAX_BLOBS)
! break;
player_blobfinder_blob_t *blob;
--- 337,345 ----
for (r = mVision->getRegions(ch); r != NULL; r = r->next)
{
! if (mData.blobs_count >= allocated_blobs)
! {
! mData.blobs =
(player_blobfinder_blob_t*)realloc(mData.blobs,sizeof(mData.blobs[0])*mData.blobs_count+1);
! allocated_blobs = mData.blobs_count+1;
! }
player_blobfinder_blob_t *blob;
***************
*** 458,462 ****
#if HAVE_JPEGLIB_H
jpeg_decompress((unsigned char*)mTmp,
! PLAYER_CAMERA_IMAGE_SIZE,
camera_data->image,
camera_data->image_count
--- 464,468 ----
#if HAVE_JPEGLIB_H
jpeg_decompress((unsigned char*)mTmp,
! mWidth*mHeight*3,
camera_data->image,
camera_data->image_count
Index: .cvsignore
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/cmvision/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.2.16.1
diff -C2 -d -r1.2 -r1.2.16.1
*** .cvsignore 9 May 2003 15:36:02 -0000 1.2
--- .cvsignore 10 Oct 2007 09:26:10 -0000 1.2.16.1
***************
*** 1,2 ****
--- 1,7 ----
Makefile
Makefile.in
+ .deps
+ *.la
+ *.a
+ .libs
+ *.lo
-------------------------------------------------------------------------
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
