Revision: 6351
http://playerstage.svn.sourceforge.net/playerstage/?rev=6351&view=rev
Author: gbiggs
Date: 2008-04-17 23:20:03 -0700 (Thu, 17 Apr 2008)
Log Message:
-----------
Merging changes 4422:4424 from trunk
Modified Paths:
--------------
code/player/branches/cmake/libplayercore/message.cc
code/player/branches/cmake/utils/pmap/lodo.cpp
code/player/branches/cmake/utils/pmap/lodo.h
code/player/branches/cmake/utils/pmap/pmap.h
code/player/branches/cmake/utils/pmap/rmap.h
Modified: code/player/branches/cmake/libplayercore/message.cc
===================================================================
--- code/player/branches/cmake/libplayercore/message.cc 2008-04-18 00:00:54 UTC
(rev 6350)
+++ code/player/branches/cmake/libplayercore/message.cc 2008-04-18 06:20:03 UTC
(rev 6351)
@@ -127,6 +127,10 @@
PLAYER_ERROR3 ("failed to clone message %s: %s, %d", interf_to_str
(Header.addr.interf), msgtype_to_str (Header.type), Header.subtype);
}
}
+ else
+ {
+ PLAYER_ERROR3 ("failed to clone message %s: %s, %d", interf_to_str
(Header.addr.interf), msgtype_to_str (Header.type), Header.subtype);
+ }
}
else
{
Modified: code/player/branches/cmake/utils/pmap/lodo.cpp
===================================================================
--- code/player/branches/cmake/utils/pmap/lodo.cpp 2008-04-18 00:00:54 UTC
(rev 6350)
+++ code/player/branches/cmake/utils/pmap/lodo.cpp 2008-04-18 06:20:03 UTC
(rev 6351)
@@ -164,6 +164,7 @@
// Initialize the new scan
scan.opose = odom_pose;
assert(num_ranges == self->num_ranges);
+ assert(num_ranges <= LODO_MAX_RANGES);
memcpy(scan.ranges, ranges, num_ranges * sizeof(ranges[0]));
if (self->scan_count == 0)
Modified: code/player/branches/cmake/utils/pmap/lodo.h
===================================================================
--- code/player/branches/cmake/utils/pmap/lodo.h 2008-04-18 00:00:54 UTC
(rev 6350)
+++ code/player/branches/cmake/utils/pmap/lodo.h 2008-04-18 06:20:03 UTC
(rev 6351)
@@ -105,7 +105,7 @@
/// Limits
-#define LODO_MAX_RANGES 401
+#define LODO_MAX_RANGES 1024
/// @brief Data pertaining to an individual scan
Modified: code/player/branches/cmake/utils/pmap/pmap.h
===================================================================
--- code/player/branches/cmake/utils/pmap/pmap.h 2008-04-18 00:00:54 UTC
(rev 6350)
+++ code/player/branches/cmake/utils/pmap/pmap.h 2008-04-18 06:20:03 UTC
(rev 6351)
@@ -66,7 +66,7 @@
/// Limits
-#define PMAP_MAX_RANGES 401
+#define PMAP_MAX_RANGES 1024
/// @brief Structure for neighborhood lookup table
Modified: code/player/branches/cmake/utils/pmap/rmap.h
===================================================================
--- code/player/branches/cmake/utils/pmap/rmap.h 2008-04-18 00:00:54 UTC
(rev 6350)
+++ code/player/branches/cmake/utils/pmap/rmap.h 2008-04-18 06:20:03 UTC
(rev 6351)
@@ -40,7 +40,7 @@
#include "slap.h"
/// Limits
-#define RMAP_MAX_RANGES 401
+#define RMAP_MAX_RANGES 1024
/// @brief Data for a single scan
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
