Revision: 8652
http://playerstage.svn.sourceforge.net/playerstage/?rev=8652&view=rev
Author: thjc
Date: 2010-05-03 18:03:12 +0000 (Mon, 03 May 2010)
Log Message:
-----------
Applied patch 2955163: Player SVN trunk: one more QNX patch
Modified Paths:
--------------
code/player/trunk/replace/CMakeLists.txt
code/player/trunk/server/drivers/laser/sicklms400.cc
code/player/trunk/server/drivers/position/snd/gap_nd_nav.cc
code/player/trunk/server/drivers/shell/gripcmd.cc
code/player/trunk/utils/playerv/pv_dev_map.c
Modified: code/player/trunk/replace/CMakeLists.txt
===================================================================
--- code/player/trunk/replace/CMakeLists.txt 2010-05-03 17:59:33 UTC (rev
8651)
+++ code/player/trunk/replace/CMakeLists.txt 2010-05-03 18:03:12 UTC (rev
8652)
@@ -13,7 +13,9 @@
xdr_intXX_t.c
xdr_mem.c
xdr_sizeof.c)
- SET (ws2_32lib Ws2_32)
+ IF (PLAYER_OS_WIN)
+ SET (ws2_32lib Ws2_32)
+ ENDIF (PLAYER_OS_WIN)
ENDIF (NOT HAVE_XDR)
IF (NOT HAVE_GETOPT)
@@ -54,7 +56,9 @@
IF (NOT HAVE_POLL)
SET (replaceSrcs ${replaceSrcs} poll.c)
- SET (ws2_32lib Ws2_32)
+ IF (PLAYER_OS_WIN)
+ SET (ws2_32lib Ws2_32)
+ ENDIF (PLAYER_OS_WIN)
ENDIF (NOT HAVE_POLL)
IF (NOT HAVE_COMPRESSBOUND)
@@ -64,9 +68,13 @@
IF (replaceSrcs)
PLAYER_ADD_LIBRARY (playerreplace ${replaceSrcs})
TARGET_LINK_LIBRARIES (playerreplace playercommon)
- IF (NOT HAVE_XDR OR NOT HAVE_POLL)
- TARGET_LINK_LIBRARIES (playerreplace Ws2_32)
- ENDIF (NOT HAVE_XDR OR NOT HAVE_POLL)
- PLAYER_MAKE_PKGCONFIG ("playerreplace" "Player library of replacements for
missing platform functionality - part of the Player Project" "playercommon
${ws2_32Lib}" "" "" "")
+ IF (PLAYER_OS_WIN)
+ IF (NOT HAVE_XDR OR NOT HAVE_POLL)
+ TARGET_LINK_LIBRARIES (playerreplace Ws2_32)
+ ENDIF (NOT HAVE_XDR OR NOT HAVE_POLL)
+ PLAYER_MAKE_PKGCONFIG ("playerreplace" "Player library of replacements
for missing platform functionality - part of the Player Project" "playercommon
${ws2_32Lib}" "" "" "")
+ ELSE (PLAYER_OS_WIN)
+ PLAYER_MAKE_PKGCONFIG ("playerreplace" "Player library of replacements
for missing platform functionality - part of the Player Project" "playercommon"
"" "" "")
+ ENDIF (PLAYER_OS_WIN)
ENDIF (replaceSrcs)
Modified: code/player/trunk/server/drivers/laser/sicklms400.cc
===================================================================
--- code/player/trunk/server/drivers/laser/sicklms400.cc 2010-05-03
17:59:33 UTC (rev 8651)
+++ code/player/trunk/server/drivers/laser/sicklms400.cc 2010-05-03
18:03:12 UTC (rev 8652)
@@ -183,6 +183,7 @@
#include <libplayercore/playercore.h>
#include <libplayerinterface/playerxdr.h>
+#include <replace/replace.h> /* for round() that is not available everywhere */
// The SICK LMS 400 laser device class.
class SickLMS400 : public ThreadedDriver
Modified: code/player/trunk/server/drivers/position/snd/gap_nd_nav.cc
===================================================================
--- code/player/trunk/server/drivers/position/snd/gap_nd_nav.cc 2010-05-03
17:59:33 UTC (rev 8651)
+++ code/player/trunk/server/drivers/position/snd/gap_nd_nav.cc 2010-05-03
18:03:12 UTC (rev 8652)
@@ -20,6 +20,7 @@
*/
#include <libplayercore/playercore.h>
+#include <replace/replace.h> /* for round() that is not available everywhere */
#include <iostream>
#include <assert.h>
#include <time.h>
Modified: code/player/trunk/server/drivers/shell/gripcmd.cc
===================================================================
--- code/player/trunk/server/drivers/shell/gripcmd.cc 2010-05-03 17:59:33 UTC
(rev 8651)
+++ code/player/trunk/server/drivers/shell/gripcmd.cc 2010-05-03 18:03:12 UTC
(rev 8652)
@@ -75,13 +75,13 @@
*/
/** @} */
+#include <libplayercore/playercore.h>
#include <stddef.h> // for NULL and size_t
#include <string.h> // for memset()
#if !defined (WIN32)
#include <strings.h> // for strcasecmp()
#endif
#include <pthread.h>
-#include <libplayercore/playercore.h>
class GripCmd : public ThreadedDriver
{
Modified: code/player/trunk/utils/playerv/pv_dev_map.c
===================================================================
--- code/player/trunk/utils/playerv/pv_dev_map.c 2010-05-03 17:59:33 UTC
(rev 8651)
+++ code/player/trunk/utils/playerv/pv_dev_map.c 2010-05-03 18:03:12 UTC
(rev 8652)
@@ -140,6 +140,8 @@
{
int x,y;
double scale = map->proxy->resolution;
+ double color;
+ int8_t val;
rtk_fig_show(map->fig, 1);
rtk_fig_clear(map->fig);
@@ -160,12 +162,12 @@
for( x=0; x<map->proxy->width; x++ )
for( y=0; y<map->proxy->height; y++ )
{
- int8_t val = map->proxy->cells[ x + y * map->proxy->width ];
+ val = map->proxy->cells[ x + y * map->proxy->width ];
if (val == 0)
continue;
- double color = (double)val/map->proxy->data_range; // scale to[-1,1]
- color *= -1; //flip sign for coloring occupied to black
- color = (color+1)/2.0; // scale to [0,1]
+ color = (double)val/map->proxy->data_range; // scale to[-1,1]
+ color *= -1.0; //flip sign for coloring occupied to black
+ color = (color + 1.0)/2.0; // scale to [0,1]
rtk_fig_color(map->fig, color, color, color );
rtk_fig_rectangle(map->fig,
(x - map->proxy->width/2.0) * scale + scale/2.0,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
