[Jderobot-admin] jderobot-r984 - trunk/src/stable/components/rgbdCalibrator

[frivas en jderobot.org]

Author: frivas
Date: 2013-09-18 15:25:36 +0200 (Wed, 18 Sep 2013)
New Revision: 984

Modified:
   trunk/src/stable/components/rgbdCalibrator/viewer.cpp
Log:
#43 solved name conflicts between eigen and boost


Modified: trunk/src/stable/components/rgbdCalibrator/viewer.cpp
===================================================================
--- trunk/src/stable/components/rgbdCalibrator/viewer.cpp	2013-09-16 19:33:31 UTC (rev 983)
+++ trunk/src/stable/components/rgbdCalibrator/viewer.cpp	2013-09-18 13:25:36 UTC (rev 984)
@@ -29,7 +29,6 @@
 #define DEGTORAD     (3.14159264 / 180.0)
 #define DEBUG TRUE
 
-using namespace boost::filesystem; 
 using namespace cv;
 using namespace cvb;
 
@@ -382,9 +381,9 @@
     {
 
       // Check the directory
-      if ( !exists(pathImage)) 
+      if ( !boost::filesystem::exists(pathImage)) 
       {
-	path dir(pathImage);
+	boost::filesystem::path dir(pathImage);
 	if (!boost::filesystem::create_directory(dir))
 	  std::cout << "Error to create directory" << std::endl;
       }
@@ -444,8 +443,8 @@
     flag |= CV_CALIB_FIX_ASPECT_RATIO;
 
     // List of images
-    directory_iterator end_itr; 
-    for ( directory_iterator itr( pathImage ); itr != end_itr; ++itr )
+    boost::filesystem::directory_iterator end_itr; 
+    for ( boost::filesystem::directory_iterator itr( pathImage ); itr != end_itr; ++itr )
     {
 
       Mat view;