Update of /cvsroot/playerstage/code/player/server/drivers/camera/v4l
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/server/drivers/camera/v4l
Modified Files:
Tag: b_thjc_dynamic_arrays
.cvsignore camerav4l.cc
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/camera/v4l/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.16.1
diff -C2 -d -r1.1 -r1.1.16.1
*** .cvsignore 10 Jun 2004 17:56:37 -0000 1.1
--- .cvsignore 10 Oct 2007 09:26:11 -0000 1.1.16.1
***************
*** 1,2 ****
--- 1,7 ----
Makefile
Makefile.in
+ .deps
+ *.la
+ *.a
+ .libs
+ *.lo
Index: camerav4l.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/v4l/camerav4l.cc,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -d -r1.30 -r1.30.2.1
*** camerav4l.cc 23 Aug 2007 19:58:43 -0000 1.30
--- camerav4l.cc 10 Oct 2007 09:26:11 -0000 1.30.2.1
***************
*** 491,499 ****
this->data.height = this->height;
this->data.bpp = this->depth;
! this->data.image_count = image_count;
this->data.compression = PLAYER_CAMERA_COMPRESS_RAW;
- assert(image_count <= sizeof(this->data.image));
-
if (have_ov519)
{
--- 491,498 ----
this->data.height = this->height;
this->data.bpp = this->depth;
! this->data.image_count = image_count;
! this->data.image = new unsigned char [image_count];
this->data.compression = PLAYER_CAMERA_COMPRESS_RAW;
if (have_ov519)
{
***************
*** 548,559 ****
}
- // Copy data to server
- size = sizeof(this->data) - sizeof(this->data.image) + data.image_count;
-
/* We should do this to be efficient */
Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
! reinterpret_cast<void*>(&this->data), size, NULL);
return;
--- 547,557 ----
}
/* We should do this to be efficient */
Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
! reinterpret_cast<void*>(&this->data));
! delete [] this->data.image;
!
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
