Update of /cvsroot/playerstage/code/player/server/drivers/blobfinder/upcbarcode
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10946/server/drivers/blobfinder/upcbarcode
Modified Files:
.cvsignore upcbarcode.cc
Log Message:
applied Toby's patch to replace fixed-size arrays
Index: .cvsignore
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/upcbarcode/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** .cvsignore 17 Sep 2007 02:18:53 -0000 1.2
--- .cvsignore 1 Nov 2007 22:16:17 -0000 1.3
***************
*** 3,4 ****
--- 3,6 ----
.deps
*.la
+ .libs
+ *.lo
Index: upcbarcode.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/upcbarcode/upcbarcode.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** upcbarcode.cc 23 Aug 2007 19:58:43 -0000 1.19
--- upcbarcode.cc 1 Nov 2007 22:16:17 -0000 1.20
***************
*** 249,253 ****
int id, min, max;
int symbol_count;
- int symbols[PLAYER_CAMERA_IMAGE_HEIGHT][2];
blob_t *blob;
--- 249,252 ----
***************
*** 256,259 ****
--- 255,259 ----
width = this->stored_data.width;
height = this->stored_data.height;
+ int symbols[height][2];
// Create input image if it doesnt exist
***************
*** 567,571 ****
data.blobs_count = (this->blobCount);
!
for (i = 0; i < this->blobCount; i++)
{
--- 567,571 ----
data.blobs_count = (this->blobCount);
! data.blobs = (player_blobfinder_blob_t*)calloc(blobCount,
sizeof(data.blobs[0]));
for (i = 0; i < this->blobCount; i++)
{
***************
*** 586,593 ****
// 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->blobCount *
sizeof(data.blobs[0]);
! PutMsg(blobfinder_id, NULL, PLAYER_MSGTYPE_DATA, 0, (unsigned char*) &data,
size, &this->cameraTime);
! */
return;
}
--- 586,590 ----
// 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
