Update of /cvsroot/playerstage/code/player/server/drivers/camera/compress
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/camera/compress
Modified Files:
cameracompress.cc camerauncompress.cc
Log Message:
applied Toby's autopointer patches
Index: cameracompress.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/compress/cameracompress.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** cameracompress.cc 31 Jul 2007 03:53:40 -0000 1.15
--- cameracompress.cc 23 Aug 2007 19:58:43 -0000 1.16
***************
*** 56,66 ****
@par Configuration file options
! - save (int)
! - Default: 0
! - If non-zero, compressed images are saved to disk (with a .ppm extension?)
!
! - image_quality (float)
! - Default: 0.8
! - JPEG image quality (0.0 - 1.0)
@par Example
--- 56,60 ----
@par Configuration file options
! - none
@par Example
***************
*** 101,105 ****
// This method will be invoked on each incoming message
! public: virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 95,99 ----
// This method will be invoked on each incoming message
! public: virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 202,206 ****
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int CameraCompress::ProcessMessage(MessageQueue* resp_queue, player_msghdr *
hdr,
void * data)
{
--- 196,200 ----
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int CameraCompress::ProcessMessage(QueuePointer & resp_queue, player_msghdr *
hdr,
void * data)
{
***************
*** 305,309 ****
this->data.image_count = (this->data.image_count);
! Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
(void*) &this->data, size, &this->camera_time);
}
--- 299,303 ----
this->data.image_count = (this->data.image_count);
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE, (void*)
&this->data, size, &this->camera_time);
}
Index: camerauncompress.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/compress/camerauncompress.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** camerauncompress.cc 31 Jul 2007 03:53:40 -0000 1.2
--- camerauncompress.cc 23 Aug 2007 19:58:43 -0000 1.3
***************
*** 97,101 ****
// This method will be invoked on each incoming message
! public: virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 97,101 ----
// This method will be invoked on each incoming message
! public: virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 195,199 ****
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int CameraUncompress::ProcessMessage(MessageQueue* resp_queue, player_msghdr
* hdr,
void * data)
{
--- 195,199 ----
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int CameraUncompress::ProcessMessage(QueuePointer &resp_queue, player_msghdr
* hdr,
void * data)
{
***************
*** 260,264 ****
this->data.compression = PLAYER_CAMERA_COMPRESS_RAW;
! Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
(void*) &this->data, size, &this->camera_time);
}
--- 260,264 ----
this->data.compression = PLAYER_CAMERA_COMPRESS_RAW;
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE, (void*)
&this->data, size, &this->camera_time);
}
-------------------------------------------------------------------------
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