Revision: 7076
http://playerstage.svn.sourceforge.net/playerstage/?rev=7076&view=rev
Author: thjc
Date: 2008-10-07 10:54:51 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
Merge from trunk to 2-1
7062 PTrunk Applied patch 2129287
Modified Paths:
--------------
code/player/branches/release-2-1-patches/client_libs/libplayerc/dev_laser.c
Property Changed:
----------------
code/player/branches/release-2-1-patches/
Property changes on: code/player/branches/release-2-1-patches
___________________________________________________________________
Added: svn:mergeinfo
+ /code/player/trunk:7062
Modified:
code/player/branches/release-2-1-patches/client_libs/libplayerc/dev_laser.c
===================================================================
--- code/player/branches/release-2-1-patches/client_libs/libplayerc/dev_laser.c
2008-10-07 10:42:15 UTC (rev 7075)
+++ code/player/branches/release-2-1-patches/client_libs/libplayerc/dev_laser.c
2008-10-07 10:54:51 UTC (rev 7076)
@@ -164,7 +164,6 @@
{
player_laser_data_scanpose_t* scan_data =
(player_laser_data_scanpose_t*)data;
- assert(scan_data->scan.ranges_count <= sizeof(device->scan) /
sizeof(device->scan[0]));
b = scan_data->scan.min_angle;
db = scan_data->scan.resolution;
@@ -282,7 +281,7 @@
device->size[0] = config->size.sl;
device->size[1] = config->size.sw;
player_laser_geom_t_free(config);
-
+
return 0;
}
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 Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
