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

[<rdi...@us...>]

Revision: 20803
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=20803&view=rev
Author:   rdiankov
Date:     2009-08-05 18:49:29 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
caminfo->camerainfo changes

Modified Paths:
--------------
    pkg/trunk/openrave_planning/orrosplanning/src/objecttransformsystem.h
    pkg/trunk/stacks/visual_feature_detectors/checkerboard_detector/checkerboard_detector.cpp

Modified: pkg/trunk/openrave_planning/orrosplanning/src/objecttransformsystem.h
===================================================================
--- pkg/trunk/openrave_planning/orrosplanning/src/objecttransformsystem.h	2009-08-05 18:40:36 UTC (rev 20802)
+++ pkg/trunk/openrave_planning/orrosplanning/src/objecttransformsystem.h	2009-08-05 18:49:29 UTC (rev 20803)
@@ -46,6 +46,7 @@
     {
     }
     virtual ~ObjectTransformSystem() {
+        _tf.reset();
         stopsubscriptions(); // need to stop the subscriptions because the virtual destructor will not call the overridden stopsubscriptions
         ROSSensorSystem<checkerboard_detector::ObjectDetection, ObjectTransformXMLID>::Destroy();
     }

Modified: pkg/trunk/stacks/visual_feature_detectors/checkerboard_detector/checkerboard_detector.cpp
===================================================================
--- pkg/trunk/stacks/visual_feature_detectors/checkerboard_detector/checkerboard_detector.cpp	2009-08-05 18:40:36 UTC (rev 20802)
+++ pkg/trunk/stacks/visual_feature_detectors/checkerboard_detector/checkerboard_detector.cpp	2009-08-05 18:49:29 UTC (rev 20803)
@@ -166,7 +166,7 @@
 
         lasttime = ros::Time::now();
         s_pmasternode->advertise<checkerboard_detector::ObjectDetection>("ObjectDetection",1);
-        s_pmasternode->subscribe("CamInfo", _caminfomsg, &CheckerboardDetector::caminfo_cb,this,1);
+        s_pmasternode->subscribe("CameraInfo", _caminfomsg, &CheckerboardDetector::caminfo_cb,this,1);
         s_pmasternode->subscribe("Image", _imagemsg, &CheckerboardDetector::image_cb,this,1);
     }
     ~CheckerboardDetector()
@@ -176,7 +176,7 @@
         if( intrinsic_matrix )
             cvReleaseMat(&intrinsic_matrix);
 
-        s_pmasternode->unsubscribe("CamInfo");
+        s_pmasternode->unsubscribe("CameraInfo");
         s_pmasternode->unsubscribe("Image");
         s_pmasternode->unadvertise("ObjectDetection");
     }


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