Revision: 7608
http://playerstage.svn.sourceforge.net/playerstage/?rev=7608&view=rev
Author: gbiggs
Date: 2009-05-01 07:10:59 +0000 (Fri, 01 May 2009)
Log Message:
-----------
Applied patch #2773055
Modified Paths:
--------------
code/player/trunk/rtk2/rtk_canvas.c
code/player/trunk/server/drivers/laser/sickLDMRS.cc
code/player/trunk/utils/playerv/pv_dev_power.c
Modified: code/player/trunk/rtk2/rtk_canvas.c
===================================================================
--- code/player/trunk/rtk2/rtk_canvas.c 2009-04-30 00:47:18 UTC (rev 7607)
+++ code/player/trunk/rtk2/rtk_canvas.c 2009-05-01 07:10:59 UTC (rev 7608)
@@ -775,6 +775,7 @@
int sizex, int sizey, uint8_t *image)
{
FILE *file;
+ int ret = -1;
if (!filename)
{
@@ -792,7 +793,7 @@
// Save PPM image
fprintf(file, "P6\n%d %d\n255\n", sizex, sizey);
- int ret = fwrite(image, sizex * sizey * 3, 1, file);
+ ret = fwrite(image, sizex * sizey * 3, 1, file);
if (ret < 0)
{
fprintf(stderr,"Failed to write Image");
Modified: code/player/trunk/server/drivers/laser/sickLDMRS.cc
===================================================================
--- code/player/trunk/server/drivers/laser/sickLDMRS.cc 2009-04-30 00:47:18 UTC
(rev 7607)
+++ code/player/trunk/server/drivers/laser/sickLDMRS.cc 2009-05-01 07:10:59 UTC
(rev 7608)
@@ -74,7 +74,6 @@
#include <arpa/inet.h>
#endif
#include <string.h>
-#include <iostream>
//#include <stdint.h>
//#include <sys/time.h>
//#include <time.h>
@@ -180,7 +179,7 @@
if (cf->ReadDeviceAddr(&this->opaque_id, section, "requires",
PLAYER_OPAQUE_CODE, -1, NULL) != 0)
{
- puts ("No Opaque driver specified");
+ PLAYER_ERROR("No Opaque driver specified");
this->SetError(-1);
return;
}
@@ -210,7 +209,7 @@
// Set up the device. Return 0 if things go well, and -1 otherwise.
int sickLDMRS::MainSetup()
{
- puts("Setting up sickLDMRS driver");
+ PLAYER_WARN("Setting up sickLDMRS driver");
if(Device::MatchDeviceAddress(this->opaque_id, this->device_addr))
{
@@ -242,7 +241,7 @@
delete [] buffer;
buffer = NULL;
- puts("sickLDMRS driver ready");
+ PLAYER_WARN("sickLDMRS driver ready");
return(0);
}
@@ -263,11 +262,11 @@
delete [] buffer;
- puts("sickLDMRS driver shutting down");
+ PLAYER_WARN("sickLDMRS driver shutting down");
opaque->Unsubscribe(InQueue);
- puts("sickLDMRS driver has been shutdown");
+ PLAYER_WARN("sickLDMRS driver has been shutdown");
}
@@ -284,7 +283,7 @@
{
//GlobalTime->GetTime(&(this->debug_time));
//PLAYER_MSG2(1,"LUX driver received data packet at %d:%d",
this->debug_time.tv_sec, this->debug_time.tv_usec);
- //puts("Received tcp data");
+ //PLAYER_WARN("Received tcp data");
player_opaque_data_t * recv =
reinterpret_cast<player_opaque_data_t * > (data);
unsigned int messageOffset = rx_count;
rx_count += recv->data_count;
@@ -330,7 +329,7 @@
//TODO: Implement a timeout here so that if it gets no data back in a
time frame it either errors or sends a reset and stuff
while(rx_count > HEADER_LEN)
{
- //puts("Got enough data");
+ //PLAYER_WARN("Got enough data");
// find our continuous data header
unsigned int ii;
bool found = false;
Modified: code/player/trunk/utils/playerv/pv_dev_power.c
===================================================================
--- code/player/trunk/utils/playerv/pv_dev_power.c 2009-04-30 00:47:18 UTC
(rev 7607)
+++ code/player/trunk/utils/playerv/pv_dev_power.c 2009-05-01 07:10:59 UTC
(rev 7608)
@@ -121,6 +121,8 @@
void power_draw(power_t *power)
{
char text[256];
+ int size = 0;
+ int ret;
rtk_fig_show(power->fig, 1);
rtk_fig_clear(power->fig);
@@ -131,8 +133,6 @@
rtk_fig_color_rgb32(power->fig, COLOR_POWER);
text[0] = 0;
- int size = 0;
- int ret;
if( power->proxy->valid & PLAYER_POWER_MASK_VOLTS )
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
