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

[<tf...@us...>]

Revision: 14048
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=14048&view=rev
Author:   tfoote
Date:     2009-04-18 00:36:41 +0000 (Sat, 18 Apr 2009)

Log Message:
-----------
moving CvBridge.h from image_msgs to opencv_latest

Modified Paths:
--------------
    pkg/trunk/3rdparty/opencv_latest/manifest.xml
    pkg/trunk/drivers/cam/camera_trigger_test/src/trigger_test.cpp
    pkg/trunk/drivers/cam/prosilica_cam/src/nodes/prosilica_grab.cpp
    pkg/trunk/drivers/cam/prosilica_cam/src/nodes/prosilica_node.cpp
    pkg/trunk/image_msgs/manifest.xml
    pkg/trunk/mapping/door_handle_detector/src/handle_detector_vision.cpp
    pkg/trunk/mapping/door_stereo_detector/src/door_stereo_detector.cpp
    pkg/trunk/vision/checkerboard_detector/checkerboard_calibration.cpp
    pkg/trunk/vision/checkerboard_detector/checkerboard_detector.cpp
    pkg/trunk/vision/color_calib/calib_node_dcam.cpp
    pkg/trunk/vision/cv_mech_turk/src/cv_mturk.cpp
    pkg/trunk/vision/image_view/image_view.cpp
    pkg/trunk/vision/led_detection/include/led_detection/led_detector.h
    pkg/trunk/vision/led_detection/src/led_detector.cpp
    pkg/trunk/vision/outlet_detection/include/outlet_detection/plug_tracker.h
    pkg/trunk/vision/outlet_detection/src/outlet_node.cpp
    pkg/trunk/vision/outlet_detection/src/outlet_spotting.cpp
    pkg/trunk/vision/people/src/face_detection.cpp
    pkg/trunk/vision/people/src/stereo_face_color_tracker.cpp
    pkg/trunk/vision/people/src/track_starter_gui.cpp
    pkg/trunk/vision/recognition_lambertian/src/publish_scene.cpp
    pkg/trunk/vision/recognition_lambertian/src/recognition_lambertian.cpp
    pkg/trunk/vision/stereo_capture/src/stereo_capture.cpp
    pkg/trunk/vision/stereo_view/stereo_view.cpp
    pkg/trunk/vision/stereo_view/stereo_view_pixel_info.cpp

Added Paths:
-----------
    pkg/trunk/3rdparty/opencv_latest/include/
    pkg/trunk/3rdparty/opencv_latest/include/opencv_latest/
    pkg/trunk/3rdparty/opencv_latest/include/opencv_latest/CvBridge.h

Copied: pkg/trunk/3rdparty/opencv_latest/include/opencv_latest/CvBridge.h (from rev 10561, pkg/trunk/image_msgs/include/image_msgs/CvBridge.h)
===================================================================
--- pkg/trunk/3rdparty/opencv_latest/include/opencv_latest/CvBridge.h	                        (rev 0)
+++ pkg/trunk/3rdparty/opencv_latest/include/opencv_latest/CvBridge.h	2009-04-18 00:36:41 UTC (rev 14048)
@@ -0,0 +1,158 @@
+/*********************************************************************
+* Software License Agreement (BSD License)
+* 
+*  Copyright (c) 2008, Willow Garage, Inc.
+*  All rights reserved.
+* 
+*  Redistribution and use in source and binary forms, with or without
+*  modification, are permitted provided that the following conditions
+*  are met:
+* 
+*   * Redistributions of source code must retain the above copyright
+*     notice, this list of conditions and the following disclaimer.
+*   * Redistributions in binary form must reproduce the above
+*     copyright notice, this list of conditions and the following
+*     disclaimer in the documentation and/or other materials provided
+*     with the distribution.
+*   * Neither the name of the Willow Garage nor the names of its
+*     contributors may be used to endorse or promote products derived
+*     from this software without specific prior written permission.
+* 
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+*  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+*  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+*  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+*  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+*  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+*  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+*  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+*  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+*  POSSIBILITY OF SUCH DAMAGE.
+*********************************************************************/
+
+#ifndef CVBRIDGE_HH
+#define CVBRIDGE_HH
+
+#include "image_msgs/Image.h"
+#include "opencv/cxcore.h"
+#include "opencv/cv.h"
+
+namespace image_msgs
+{
+
+  class CvBridge
+  {
+    IplImage* img_;
+    IplImage* rosimg_;
+    IplImage* cvtimg_;
+
+    void reallocIfNeeded_(IplImage** img, CvSize sz, int depth, int channels)
+    {
+      if ((*img) != 0)
+        if ((*img)->width     != sz.width  || 
+            (*img)->height    != sz.height || 
+            (*img)->depth     != depth     ||
+            (*img)->nChannels != channels)
+        {
+          cvReleaseImage(img);
+          *img = 0;
+        }
+
+      if (*img == 0)
+      {
+        *img = cvCreateImage(sz, depth, channels);
+      }      
+    }
+
+  public:
+
+    CvBridge() : img_(0), rosimg_(0), cvtimg_(0)
+    {
+      rosimg_ = cvCreateImageHeader( cvSize(0,0), IPL_DEPTH_8U, 1 );
+    }
+
+    ~CvBridge()
+    {
+      if (rosimg_) {
+        cvReleaseImageHeader(&rosimg_);
+	rosimg_ = 0;
+      }
+      
+      if (cvtimg_) {
+        cvReleaseImage(&cvtimg_);
+	cvtimg_ = 0;
+      }
+    }
+
+
+    inline IplImage* toIpl()
+    {
+      return img_;
+    }
+
+    bool fromImage(Image& rosimg, std::string encoding = "")
+    {
+      if (rosimg.depth == "uint8")
+      {
+        cvInitImageHeader(rosimg_, cvSize(rosimg.uint8_data.layout.dim[1].size, rosimg.uint8_data.layout.dim[0].size),
+                          IPL_DEPTH_8U, rosimg.uint8_data.layout.dim[2].size);
+        cvSetData(rosimg_, &(rosimg.uint8_data.data[0]), rosimg.uint8_data.layout.dim[1].stride);
+        img_ = rosimg_;
+      } else if (rosimg.depth == "uint16") {
+        cvInitImageHeader(rosimg_, cvSize(rosimg.uint16_data.layout.dim[1].size, rosimg.uint16_data.layout.dim[0].size),
+                          IPL_DEPTH_16U, rosimg.uint16_data.layout.dim[2].size);
+        cvSetData(rosimg_, &(rosimg.uint16_data.data[0]), rosimg.uint16_data.layout.dim[1].stride*sizeof(uint16_t));
+        img_ = rosimg_;
+      } else {
+        return false;
+      }
+
+      if (encoding != "" && (encoding != rosimg.encoding))
+      {
+        if (encoding == "bgr" && rosimg.encoding == "rgb")
+        {
+          reallocIfNeeded(&cvtimg_, IPL_DEPTH_8U, 3);
+          cvCvtColor(rosimg_, cvtimg_, CV_RGB2BGR);
+          img_ = cvtimg_;
+        }
+        else if (encoding == "bgr" && rosimg.encoding == "mono" )
+        {
+          reallocIfNeeded(&cvtimg_, IPL_DEPTH_8U, 3);
+          cvCvtColor(rosimg_, cvtimg_, CV_GRAY2BGR);
+          img_ = cvtimg_;
+        }
+        else if (encoding == "mono" && rosimg.encoding == "rgb" )
+        {
+          reallocIfNeeded(&cvtimg_, IPL_DEPTH_8U, 1);
+          cvCvtColor(rosimg_, cvtimg_, CV_RGB2GRAY);
+          img_ = cvtimg_;
+        }
+        else if (encoding == "mono" && rosimg.encoding == "bgr" )
+        {
+          reallocIfNeeded(&cvtimg_, IPL_DEPTH_8U, 1);
+          cvCvtColor(rosimg_, cvtimg_, CV_BGR2GRAY);
+          img_ = cvtimg_;
+        }
+        else
+        {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    void reallocIfNeeded(IplImage** img, int depth = -1, int channels = -1)
+    {
+      if (depth == -1)
+        depth = img_->depth;
+      if (channels == -1)
+        channels = img_->nChannels;
+      reallocIfNeeded_(img, cvGetSize(img_), depth, channels);
+    }
+  };
+}
+
+
+#endif

Modified: pkg/trunk/3rdparty/opencv_latest/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/opencv_latest/manifest.xml	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/3rdparty/opencv_latest/manifest.xml	2009-04-18 00:36:41 UTC (rev 14048)
@@ -12,9 +12,10 @@
 <review status="3rdparty" notes=""/>
 <url>http://opencvlibrary.sourceforge.net</url>
 <export>
-  <cpp cflags="-I${prefix}/opencv/include -I${prefix}/opencv/include/opencv" lflags="-L${prefix}/opencv/lib -Wl,-rpath,${prefix}/opencv/lib -lcvaux -lcv -lcxcore -lhighgui -lml"/>
+  <cpp cflags="-I${prefix}/opencv/include -I${prefix}/opencv/include/opencv -I${prefix}/include" lflags="-L${prefix}/opencv/lib -Wl,-rpath,${prefix}/opencv/lib -lcvaux -lcv -lcxcore -lhighgui -lml"/>
   <doxymaker external="http://opencvlibrary.sourceforge.net/" />
 </export>
+<depend package="image_msgs" />
 <sysdepend os="ubuntu" version="7.04-feisty" package="libavformat-dev"/>
 <sysdepend os="ubuntu" version="8.04-hardy" package="libavformat-dev"/>
 <sysdepend os="ubuntu" version="7.04-feisty" package="libavcodec-dev"/>

Modified: pkg/trunk/drivers/cam/camera_trigger_test/src/trigger_test.cpp
===================================================================
--- pkg/trunk/drivers/cam/camera_trigger_test/src/trigger_test.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/drivers/cam/camera_trigger_test/src/trigger_test.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -34,7 +34,7 @@
 
 #include "ros/node.h"
 #include "image_msgs/Image.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 #include <stdio.h>
 #include <signal.h>
 #include <robot_mechanism_controllers/SetWaveform.h>

Modified: pkg/trunk/drivers/cam/prosilica_cam/src/nodes/prosilica_grab.cpp
===================================================================
--- pkg/trunk/drivers/cam/prosilica_cam/src/nodes/prosilica_grab.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/drivers/cam/prosilica_cam/src/nodes/prosilica_grab.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -1,5 +1,5 @@
 #include "ros/node.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 #include "opencv/cv.h"
 #include "opencv/highgui.h"

Modified: pkg/trunk/drivers/cam/prosilica_cam/src/nodes/prosilica_node.cpp
===================================================================
--- pkg/trunk/drivers/cam/prosilica_cam/src/nodes/prosilica_node.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/drivers/cam/prosilica_cam/src/nodes/prosilica_node.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -38,7 +38,7 @@
 #include <image_msgs/Image.h>
 #include <image_msgs/CamInfo.h>
 #include <image_msgs/FillImage.h>
-#include <image_msgs/CvBridge.h>
+#include <opencv_latest/CvBridge.h>
 #include <diagnostic_updater/diagnostic_updater.h>
 
 #include <cv.h>

Modified: pkg/trunk/image_msgs/manifest.xml
===================================================================
--- pkg/trunk/image_msgs/manifest.xml	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/image_msgs/manifest.xml	2009-04-18 00:36:41 UTC (rev 14048)
@@ -4,7 +4,6 @@
   <license>BSD</license>
   <review status="unreviewed" notes=""/>
   <depend package="std_msgs"/>
-  <depend package="opencv_latest"/>
   <export>
     <cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp"/>
   </export>

Modified: pkg/trunk/mapping/door_handle_detector/src/handle_detector_vision.cpp
===================================================================
--- pkg/trunk/mapping/door_handle_detector/src/handle_detector_vision.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/mapping/door_handle_detector/src/handle_detector_vision.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -42,7 +42,7 @@
 #include <iomanip>
 
 
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 #include "opencv/cxcore.h"
 #include "opencv/cv.h"

Modified: pkg/trunk/mapping/door_stereo_detector/src/door_stereo_detector.cpp
===================================================================
--- pkg/trunk/mapping/door_stereo_detector/src/door_stereo_detector.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/mapping/door_stereo_detector/src/door_stereo_detector.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -53,7 +53,7 @@
 #include <robot_msgs/VisualizationMarker.h>
 
 
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 #include "image_msgs/StereoInfo.h"
 #include "image_msgs/DisparityInfo.h"
 #include "image_msgs/CamInfo.h"

Modified: pkg/trunk/vision/checkerboard_detector/checkerboard_calibration.cpp
===================================================================
--- pkg/trunk/vision/checkerboard_detector/checkerboard_calibration.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/checkerboard_detector/checkerboard_calibration.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -31,7 +31,7 @@
 
 #include "opencv/cv.h"
 #include "opencv/highgui.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 #include "image_msgs/Image.h"
 #include "math.h"
 

Modified: pkg/trunk/vision/checkerboard_detector/checkerboard_detector.cpp
===================================================================
--- pkg/trunk/vision/checkerboard_detector/checkerboard_detector.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/checkerboard_detector/checkerboard_detector.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -31,7 +31,7 @@
 
 #include "opencv/cv.h"
 #include "opencv/highgui.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 #include "image_msgs/CamInfo.h"
 #include "image_msgs/Image.h"
 #include "checkerboard_detector/ObjectDetection.h"

Modified: pkg/trunk/vision/color_calib/calib_node_dcam.cpp
===================================================================
--- pkg/trunk/vision/color_calib/calib_node_dcam.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/color_calib/calib_node_dcam.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -41,7 +41,7 @@
 #include "ros/node.h"
 #include "boost/thread/mutex.hpp"
 #include "image_msgs/Image.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 #include <sys/stat.h>
 

Modified: pkg/trunk/vision/cv_mech_turk/src/cv_mturk.cpp
===================================================================
--- pkg/trunk/vision/cv_mech_turk/src/cv_mturk.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/cv_mech_turk/src/cv_mturk.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -11,7 +11,7 @@
 #include "opencv/highgui.h"
 #include "ros/node.h"
 #include "image_msgs/Image.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 #include <stdlib.h>
 
 using namespace std;

Modified: pkg/trunk/vision/image_view/image_view.cpp
===================================================================
--- pkg/trunk/vision/image_view/image_view.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/image_view/image_view.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -37,7 +37,7 @@
 
 #include "ros/node.h"
 #include "image_msgs/Image.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 class ImageView
 {

Modified: pkg/trunk/vision/led_detection/include/led_detection/led_detector.h
===================================================================
--- pkg/trunk/vision/led_detection/include/led_detection/led_detector.h	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/led_detection/include/led_detection/led_detector.h	2009-04-18 00:36:41 UTC (rev 14048)
@@ -38,7 +38,7 @@
 #define LED_DETECTION_LED_DETECTOR_H_
 
 
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 #include "image_msgs/Image.h"
 #include "image_msgs/CamInfo.h"

Modified: pkg/trunk/vision/led_detection/src/led_detector.cpp
===================================================================
--- pkg/trunk/vision/led_detection/src/led_detector.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/led_detection/src/led_detector.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -67,7 +67,7 @@
 
 /**
  * Converts an openCV IPL image into a ros image message
- * \todo Robustify and move this function into image_msgs/CvBridge.h
+ * \todo Robustify and move this function into opencv_latest/CvBridge.h
  * \param cv_image input: The IPL image to be converted
  * \param ros_image output: The location of the destination image
  */

Modified: pkg/trunk/vision/outlet_detection/include/outlet_detection/plug_tracker.h
===================================================================
--- pkg/trunk/vision/outlet_detection/include/outlet_detection/plug_tracker.h	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/outlet_detection/include/outlet_detection/plug_tracker.h	2009-04-18 00:36:41 UTC (rev 14048)
@@ -1,7 +1,7 @@
 #include <ros/node.h>
 #include <image_msgs/Image.h>
 #include <image_msgs/CamInfo.h>
-#include <image_msgs/CvBridge.h>
+#include <opencv_latest/CvBridge.h>
 #include <robot_msgs/PoseStamped.h>
 #include <prosilica_cam/PolledImage.h>
 #include <tf/transform_broadcaster.h>

Modified: pkg/trunk/vision/outlet_detection/src/outlet_node.cpp
===================================================================
--- pkg/trunk/vision/outlet_detection/src/outlet_node.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/outlet_detection/src/outlet_node.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -1,7 +1,7 @@
 #include <ros/node.h>
 #include <image_msgs/Image.h>
 #include <image_msgs/CamInfo.h>
-#include <image_msgs/CvBridge.h>
+#include <opencv_latest/CvBridge.h>
 #include <robot_msgs/PoseStamped.h>
 #include <prosilica_cam/PolledImage.h>
 #include <tf/transform_broadcaster.h>

Modified: pkg/trunk/vision/outlet_detection/src/outlet_spotting.cpp
===================================================================
--- pkg/trunk/vision/outlet_detection/src/outlet_spotting.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/outlet_detection/src/outlet_spotting.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -41,7 +41,7 @@
 #include <string>
 #include <limits>
 
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 // opencv
 #include "opencv/cxcore.h"

Modified: pkg/trunk/vision/people/src/face_detection.cpp
===================================================================
--- pkg/trunk/vision/people/src/face_detection.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/people/src/face_detection.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -47,7 +47,7 @@
 #include "image_msgs/DisparityInfo.h"
 #include "image_msgs/CamInfo.h"
 #include "image_msgs/Image.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 #include "image_msgs/ColoredLine.h"
 #include "image_msgs/ColoredLines.h"
 #include "topic_synchronizer/topic_synchronizer.h"

Modified: pkg/trunk/vision/people/src/stereo_face_color_tracker.cpp
===================================================================
--- pkg/trunk/vision/people/src/stereo_face_color_tracker.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/people/src/stereo_face_color_tracker.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -47,7 +47,7 @@
 #include "image_msgs/DisparityInfo.h"
 #include "image_msgs/CamInfo.h"
 #include "image_msgs/Image.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 #include "image_msgs/ColoredLines.h"
 #include "topic_synchronizer/topic_synchronizer.h"
 #include "tf/transform_listener.h"

Modified: pkg/trunk/vision/people/src/track_starter_gui.cpp
===================================================================
--- pkg/trunk/vision/people/src/track_starter_gui.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/people/src/track_starter_gui.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -45,7 +45,7 @@
 #include "image_msgs/DisparityInfo.h"
 #include "image_msgs/CamInfo.h"
 #include "image_msgs/Image.h"
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 #include "CvStereoCamModel.h"
 #include <robot_msgs/PositionMeasurement.h>
 #include "color_calib.h"

Modified: pkg/trunk/vision/recognition_lambertian/src/publish_scene.cpp
===================================================================
--- pkg/trunk/vision/recognition_lambertian/src/publish_scene.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/recognition_lambertian/src/publish_scene.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -48,7 +48,7 @@
 #include <robot_msgs/PointCloud.h>
 
 #include <image_msgs/Image.h>
-#include <image_msgs/CvBridge.h>
+#include <opencv_latest/CvBridge.h>
 #include <image_msgs/FillImage.h>
 #include <std_msgs/String.h>
 

Modified: pkg/trunk/vision/recognition_lambertian/src/recognition_lambertian.cpp
===================================================================
--- pkg/trunk/vision/recognition_lambertian/src/recognition_lambertian.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/recognition_lambertian/src/recognition_lambertian.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -43,7 +43,7 @@
 #include <queue>
 
 
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 #include "opencv/cxcore.h"
 #include "opencv/cv.h"

Modified: pkg/trunk/vision/stereo_capture/src/stereo_capture.cpp
===================================================================
--- pkg/trunk/vision/stereo_capture/src/stereo_capture.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/stereo_capture/src/stereo_capture.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -40,7 +40,7 @@
 #include <iomanip>
 
 
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 #include "opencv/cxcore.h"
 #include "opencv/cv.h"

Modified: pkg/trunk/vision/stereo_view/stereo_view.cpp
===================================================================
--- pkg/trunk/vision/stereo_view/stereo_view.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/stereo_view/stereo_view.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -34,7 +34,7 @@
 
 #include <vector>
 
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 #include "opencv/cxcore.h"
 #include "opencv/cv.h"

Modified: pkg/trunk/vision/stereo_view/stereo_view_pixel_info.cpp
===================================================================
--- pkg/trunk/vision/stereo_view/stereo_view_pixel_info.cpp	2009-04-18 00:29:49 UTC (rev 14047)
+++ pkg/trunk/vision/stereo_view/stereo_view_pixel_info.cpp	2009-04-18 00:36:41 UTC (rev 14048)
@@ -43,7 +43,7 @@
 
 #include <vector>
 
-#include "image_msgs/CvBridge.h"
+#include "opencv_latest/CvBridge.h"
 
 #include "opencv/cxcore.h"
 #include "opencv/cv.h"


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