Revision: 8235
http://playerstage.svn.sourceforge.net/playerstage/?rev=8235&view=rev
Author: gbiggs
Date: 2009-08-26 23:42:03 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Changed fmin() to <
Modified Paths:
--------------
code/player/trunk/server/drivers/shell/readlog.cc
Modified: code/player/trunk/server/drivers/shell/readlog.cc
===================================================================
--- code/player/trunk/server/drivers/shell/readlog.cc 2009-08-26 23:41:05 UTC
(rev 8234)
+++ code/player/trunk/server/drivers/shell/readlog.cc 2009-08-26 23:42:03 UTC
(rev 8235)
@@ -1909,7 +1909,9 @@
data.data.ranges = new double[ data.data.ranges_count ];
count = 0;
- int loop_size=fmin(token_count, total_count+data.data.ranges_count);
+ int loop_size = token_count;
+ if (total_count + (int)data.data.ranges_count < loop_size)
+ loop_size = total_count + (int)data.data.ranges_count;
for (i = total_count; i < loop_size; i += 2)
{
data.data.ranges[count] = static_cast<double> (atof(tokens[i]));
@@ -1964,7 +1966,9 @@
data.geom.element_poses = new player_pose3d_t [
data.geom.element_poses_count ];
count = 0;
- loop_size=fmin(token_count,
total_count+data.geom.element_poses_count*6);
+ loop_size = token_count;
+ if (total_count + (int)data.geom.element_poses_count*6 <
loop_size)
+ loop_size = total_count +
(int)data.geom.element_poses_count*6;
for (i = total_count; i < loop_size; i += 6)
{
data.geom.element_poses[count].px = static_cast<double>
(atof(tokens[i]));
@@ -1998,7 +2002,9 @@
data.geom.element_sizes = new player_bbox3d_t [
data.geom.element_sizes_count ];
count = 0;
- loop_size=fmin(token_count,
total_count+data.geom.element_sizes_count*3);
+ loop_size = token_count;
+ if (total_count + (int)data.geom.element_sizes_count*3 <
loop_size)
+ loop_size = total_count +
(int)data.geom.element_sizes_count*3;
for (i = total_count; i < loop_size; i += 3)
{
data.geom.element_sizes[count].sw = static_cast<double>
(atof(tokens[i]));
@@ -2135,7 +2141,9 @@
data.data.intensities = new double[ data.data.intensities_count ];
count = 0;
- int loop_size=fmin(token_count,
total_count+data.data.intensities_count);
+ int loop_size = token_count;
+ if (total_count + (int)data.data.intensities_count < loop_size)
+ loop_size = total_count + (int)data.data.intensities_count;
for (i = total_count; i < loop_size; i += 2)
{
data.data.intensities[count] = static_cast<double>
(atof(tokens[i]));
@@ -2190,7 +2198,9 @@
data.geom.element_poses = new player_pose3d_t [
data.geom.element_poses_count ];
count = 0;
- loop_size=fmin(token_count,
total_count+data.geom.element_poses_count*6);
+ loop_size=token_count;
+ if (total_count + (int)data.geom.element_poses_count*6 <
loop_size)
+ loop_size = total_count +
(int)data.geom.element_poses_count*6;
for (i = total_count; i < loop_size; i += 6)
{
data.geom.element_poses[count].px = static_cast<double>
(atof(tokens[i]));
@@ -2224,7 +2234,9 @@
data.geom.element_sizes = new player_bbox3d_t [
data.geom.element_sizes_count ];
count = 0;
- loop_size=fmin(token_count,
total_count+data.geom.element_sizes_count*3);
+ loop_size=token_count;
+ if (total_count + (int)data.geom.element_sizes_count*3 <
loop_size)
+ loop_size = total_count +
(int)data.geom.element_sizes_count*3;
for (i = total_count; i < loop_size; i += 3)
{
data.geom.element_sizes[count].sw = static_cast<double>
(atof(tokens[i]));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
