[Personalrobots-commit] SF.net SVN: personalrobots:[9828] pkg/trunk

[<mee...@us...>]

Revision: 9828
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=9828&view=rev
Author:   meeussen
Date:     2009-01-21 00:15:40 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
patch to fix issue caused by previous rosrecord patch

Modified Paths:
--------------
    pkg/trunk/util/logsetta/carmen/genlog_carmen/genlog_carmen.cpp
    pkg/trunk/util/logsetta/imu/imu_extract.cpp
    pkg/trunk/util/logsetta/localize_extract/localize_extract.cpp
    pkg/trunk/util/logsetta/odom/odom_extract.cpp
    pkg/trunk/vision/calib_converter/src/calib_converter.cpp

Modified: pkg/trunk/util/logsetta/carmen/genlog_carmen/genlog_carmen.cpp
===================================================================
--- pkg/trunk/util/logsetta/carmen/genlog_carmen/genlog_carmen.cpp	2009-01-21 00:15:13 UTC (rev 9827)
+++ pkg/trunk/util/logsetta/carmen/genlog_carmen/genlog_carmen.cpp	2009-01-21 00:15:40 UTC (rev 9828)
@@ -42,7 +42,7 @@
 FILE *test_log = NULL;
 double prev_x = 0, prev_y = 0, prev_th = 0, dumb_rv = 0, dumb_tv = 0, prev_time;
 
-void odom_callback(string name, std_msgs::RobotBase2DOdom* odom, ros::Time t, void* n)
+void odom_callback(string name, std_msgs::RobotBase2DOdom* odom, ros::Time t, ros::Time t_no_use, void* n)
 {
   double rel_time = t.to_double();
 
@@ -84,7 +84,7 @@
           dumb_tv, dumb_rv, rel_time, rel_time);
 }
 
-void scan_callback(string name, std_msgs::LaserScan* scan, ros::Time t, void* n)
+void scan_callback(string name, std_msgs::LaserScan* scan, ros::Time t, ros::Time t_no_use, void* n)
 {
 
   double rel_time = t.to_double();

Modified: pkg/trunk/util/logsetta/imu/imu_extract.cpp
===================================================================
--- pkg/trunk/util/logsetta/imu/imu_extract.cpp	2009-01-21 00:15:13 UTC (rev 9827)
+++ pkg/trunk/util/logsetta/imu/imu_extract.cpp	2009-01-21 00:15:40 UTC (rev 9828)
@@ -36,7 +36,7 @@
 #include <string>
 #include "rosrecord/Player.h"
 
-void imu_callback(std::string name, std_msgs::PoseWithRatesStamped* imu, ros::Time t, void* f)
+void imu_callback(std::string name, std_msgs::PoseWithRatesStamped* imu, ros::Time t, ros::Time t_no_use, void* f)
 {
   FILE* file = (FILE*)f;
 

Modified: pkg/trunk/util/logsetta/localize_extract/localize_extract.cpp
===================================================================
--- pkg/trunk/util/logsetta/localize_extract/localize_extract.cpp	2009-01-21 00:15:13 UTC (rev 9827)
+++ pkg/trunk/util/logsetta/localize_extract/localize_extract.cpp	2009-01-21 00:15:40 UTC (rev 9828)
@@ -36,7 +36,7 @@
 #include <string>
 #include "rosrecord/Player.h"
 
-void localize_callback(std::string name, std_msgs::RobotBase2DOdom* bL, ros::Time t, void* f)
+void localize_callback(std::string name, std_msgs::RobotBase2DOdom* bL, ros::Time t, ros::Time t_no_use, void* f)
 {
   FILE* file = (FILE*)f;
 

Modified: pkg/trunk/util/logsetta/odom/odom_extract.cpp
===================================================================
--- pkg/trunk/util/logsetta/odom/odom_extract.cpp	2009-01-21 00:15:13 UTC (rev 9827)
+++ pkg/trunk/util/logsetta/odom/odom_extract.cpp	2009-01-21 00:15:40 UTC (rev 9828)
@@ -36,7 +36,7 @@
 #include <string>
 #include "rosrecord/Player.h"
 
-void odom_callback(std::string name, std_msgs::RobotBase2DOdom* odom, ros::Time t, void* f)
+void odom_callback(std::string name, std_msgs::RobotBase2DOdom* odom, ros::Time t, ros::Time t_no_use, void* f)
 {
   FILE* file = (FILE*)f;
 

Modified: pkg/trunk/vision/calib_converter/src/calib_converter.cpp
===================================================================
--- pkg/trunk/vision/calib_converter/src/calib_converter.cpp	2009-01-21 00:15:13 UTC (rev 9827)
+++ pkg/trunk/vision/calib_converter/src/calib_converter.cpp	2009-01-21 00:15:40 UTC (rev 9828)
@@ -35,7 +35,7 @@
 }
 
 template <class T>
-void copyMsg(string name, ros::Message* m, ros::Time t, void* n)
+void copyMsg(string name, ros::Message* m, ros::Time t, ros::Time t_no_use, void* n)
 {
   if (m != 0) {
     g_names.insert(name);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.