Update of /cvsroot/playerstage/code/player/server/drivers/camera/uvc
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/server/drivers/camera/uvc
Modified Files:
Tag: b_thjc_dynamic_arrays
.cvsignore cameraUVC.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/uvc/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** .cvsignore 20 Apr 2006 00:31:47 -0000 1.1
--- .cvsignore 10 Oct 2007 09:26:04 -0000 1.1.4.1
***************
*** 1,2 ****
--- 1,6 ----
Makefile
Makefile.in
+ .deps
+ *.la
+ .libs
+ *.lo
Index: cameraUVC.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/uvc/cameraUVC.cc,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** cameraUVC.cc 27 Aug 2007 03:53:00 -0000 1.6
--- cameraUVC.cc 10 Oct 2007 09:26:05 -0000 1.6.2.1
***************
*** 180,189 ****
data.fdiv=1;
data.compression=PLAYER_CAMERA_COMPRESS_JPEG;
! data.image_count=ui->GetFrameSize();
! assert(data.image_count <= PLAYER_CAMERA_IMAGE_SIZE);
ui->CopyFrame(data.image);
// Write data to the client (through the server)
! Publish
(device_addr,PLAYER_MSGTYPE_DATA,PLAYER_CAMERA_DATA_STATE,&data,sizeof(data),NULL);
}
}
--- 180,190 ----
data.fdiv=1;
data.compression=PLAYER_CAMERA_COMPRESS_JPEG;
! data.image_count=ui->GetFrameSize();
! data.image = new unsigned char[data.image_count];
ui->CopyFrame(data.image);
// Write data to the client (through the server)
! Publish
(device_addr,PLAYER_MSGTYPE_DATA,PLAYER_CAMERA_DATA_STATE,&data);
! delete [] data.image;
}
}
-------------------------------------------------------------------------
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
