Revision: 6745
http://playerstage.svn.sourceforge.net/playerstage/?rev=6745&view=rev
Author: jeremy_asher
Date: 2008-07-02 17:02:27 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
Fixed warnings
Modified Paths:
--------------
code/stage/trunk/libstage/model.cc
code/stage/trunk/libstage/model_blobfinder.cc
code/stage/trunk/libstage/model_camera.cc
code/stage/trunk/libstage/model_laser.cc
code/stage/trunk/libstage/model_load.cc
code/stage/trunk/libstage/stage.hh
code/stage/trunk/libstage/world.cc
Modified: code/stage/trunk/libstage/model.cc
===================================================================
--- code/stage/trunk/libstage/model.cc 2008-07-02 23:42:25 UTC (rev 6744)
+++ code/stage/trunk/libstage/model.cc 2008-07-03 00:02:27 UTC (rev 6745)
@@ -101,7 +101,9 @@
- friction).
*/
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
//#define DEBUG 0
#include "stage_internal.hh"
Modified: code/stage/trunk/libstage/model_blobfinder.cc
===================================================================
--- code/stage/trunk/libstage/model_blobfinder.cc 2008-07-02 23:42:25 UTC
(rev 6744)
+++ code/stage/trunk/libstage/model_blobfinder.cc 2008-07-03 00:02:27 UTC
(rev 6745)
@@ -162,7 +162,7 @@
{
RemoveAllColors(); // empty the color list to start from scratch
- unsigned int count = wf->ReadFloat( wf_entity, "colors_count",
0 );
+ unsigned int count = wf->ReadInt( wf_entity, "colors_count", 0
);
for( unsigned int c=0; c<count; c++ )
{
Modified: code/stage/trunk/libstage/model_camera.cc
===================================================================
--- code/stage/trunk/libstage/model_camera.cc 2008-07-02 23:42:25 UTC (rev
6744)
+++ code/stage/trunk/libstage/model_camera.cc 2008-07-03 00:02:27 UTC (rev
6745)
@@ -96,9 +96,9 @@
_camera.setClip( wf->ReadLength( wf_entity, "nearclip",
_camera.nearClip() ), wf->ReadLength( wf_entity, "farclip", CAMERA_FAR_CLIP )
);
- _yaw_offset = wf->ReadLength( wf_entity, "yaw", _yaw_offset );
- _width = wf->ReadLength( wf_entity, "width", _width );
- _height = wf->ReadLength( wf_entity, "height", _height );
+ _yaw_offset = wf->ReadInt( wf_entity, "yaw", _yaw_offset );
+ _width = wf->ReadInt( wf_entity, "width", _width );
+ _height = wf->ReadInt( wf_entity, "height", _height );
}
Modified: code/stage/trunk/libstage/model_laser.cc
===================================================================
--- code/stage/trunk/libstage/model_laser.cc 2008-07-02 23:42:25 UTC (rev
6744)
+++ code/stage/trunk/libstage/model_laser.cc 2008-07-03 00:02:27 UTC (rev
6745)
@@ -83,7 +83,7 @@
id, typestr );
// sensible laser defaults
- interval = DEFAULT_INTERVAL_MS * thousand;
+ interval = DEFAULT_INTERVAL_MS * (int)thousand;
laser_return = LaserVisible;
stg_geom_t geom;
Modified: code/stage/trunk/libstage/model_load.cc
===================================================================
--- code/stage/trunk/libstage/model_load.cc 2008-07-02 23:42:25 UTC (rev
6744)
+++ code/stage/trunk/libstage/model_load.cc 2008-07-03 00:02:27 UTC (rev
6745)
@@ -1,4 +1,6 @@
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <limits.h>
#include <libgen.h> // for dirname()
#include <string.h>
Modified: code/stage/trunk/libstage/stage.hh
===================================================================
--- code/stage/trunk/libstage/stage.hh 2008-07-02 23:42:25 UTC (rev 6744)
+++ code/stage/trunk/libstage/stage.hh 2008-07-03 00:02:27 UTC (rev 6745)
@@ -2451,7 +2451,7 @@
private:
double dutycycle;
bool enabled;
- double period;
+ stg_msec_t period;
bool on;
static Option showBlinkenData;
Modified: code/stage/trunk/libstage/world.cc
===================================================================
--- code/stage/trunk/libstage/world.cc 2008-07-02 23:42:25 UTC (rev 6744)
+++ code/stage/trunk/libstage/world.cc 2008-07-03 00:02:27 UTC (rev 6745)
@@ -39,7 +39,9 @@
*/
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
//#define DEBUG
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
