Update of /cvsroot/playerstage/code/player/server/drivers/camera/compress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25650
Modified Files:
cameracompress.cc
Log Message:
applied patch 1848685
Index: cameracompress.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/compress/cameracompress.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** cameracompress.cc 8 Nov 2007 04:23:26 -0000 1.19
--- cameracompress.cc 11 Dec 2007 18:23:16 -0000 1.20
***************
*** 209,213 ****
if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_DATA,
PLAYER_CAMERA_DATA_STATE, camera_id))
{
- assert(hdr->size >= sizeof(player_camera_data_t));
player_camera_data_t * recv = reinterpret_cast<player_camera_data_t * >
(data);
ProcessImage(*recv);
--- 209,212 ----
***************
*** 300,303 ****
--- 299,305 ----
} else
{
+ if (this->data.image) delete []this->data.image;
+ this->data.image = new unsigned char[rawdata.image_count];
+ assert(this->data.image);
memcpy(this->data.image, rawdata.image, rawdata.image_count);
this->data.width = (rawdata.width);
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
