Changes for indigo

Author: miquelmassot

bag_tools/CMakeLists.txt

@@ -1,9 +1,10 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bag_tools)
 
-find_package(catkin REQUIRED COMPONENTS rospy rosbag sensor_msgs cv_bridge message_filters image_proc stereo_image_proc image_geometry camera_calibration_parsers console_bridge)
+find_package(catkin REQUIRED COMPONENTS rospy rosbag sensor_msgs cv_bridge message_filters image_proc stereo_image_proc image_geometry camera_calibration_parsers)
 find_package(Boost REQUIRED COMPONENTS signals thread)
 find_package(OpenCV REQUIRED)
+find_package(console_bridge REQUIRED)
 
 catkin_package(
   INCLUDE_DIRS include
@@ -12,13 +13,13 @@ catkin_package(
 
 catkin_python_setup()
 
-include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
+include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS} ${console_bridge_INCLUDE_DIRS})
 
 add_executable(extract_images src/extract_images.cpp)
 add_executable(extract_stereo_images src/extract_stereo_images.cpp)
 add_executable(process_stereo src/process_stereo.cpp)
 
-target_link_libraries(extract_images ${Boost_LIBRARIES} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES})
-target_link_libraries(extract_stereo_images ${Boost_LIBRARIES} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES})
-target_link_libraries(process_stereo ${Boost_LIBRARIES} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES})
+target_link_libraries(extract_images ${Boost_LIBRARIES} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES})
+target_link_libraries(extract_stereo_images ${Boost_LIBRARIES} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES})
+target_link_libraries(process_stereo ${Boost_LIBRARIES} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES})
 

bag_tools/include/bag_tools/stereo_bag_processor.h

@@ -53,7 +53,7 @@ class BagSubscriber : public message_filters::SimpleFilter<M>
 public:
   void newMessage(const boost::shared_ptr<M const> &msg)
   {
-    signalMessage(msg);
+    this->signalMessage(msg);
   }
 };
 

bag_tools/package.xml

@@ -22,7 +22,7 @@
   <build_depend>stereo_image_proc</build_depend>
   <build_depend>image_geometry</build_depend>
   <build_depend>camera_calibration_parsers</build_depend>
-  <build_depend>console_bridge</build_depend>
+  <build_depend>libconsole_bridge_dev</build_depend>
   <run_depend>rospy</run_depend>
   <run_depend>rosbag</run_depend>
   <run_depend>sensor_msgs</run_depend>
@@ -32,7 +32,7 @@
   <run_depend>stereo_image_proc</run_depend>
   <run_depend>image_geometry</run_depend>
   <run_depend>camera_calibration_parsers</run_depend>
-  <run_depend>console_bridge</run_depend>
+  <run_depend>libconsole_bridge_dev</run_depend>
 
   <export>
   </export>