Updating the interface of Softs to handle shared pointers on data.

sources/softs/brdf2data/main.cpp

@@ -58,7 +58,7 @@ int main(int argc, char** argv)
 	}
 	
 	// Get the associated data object and load the file is any
-	data* d = NULL ;
+	ptr<data> d = NULL ;
 	d = plugins_manager::get_data(args["data"]) ;
 	if(args.is_defined("data-file"))
 	{
@@ -67,14 +67,14 @@ int main(int argc, char** argv)
 
     // Get the output object. In the case where it is not a VS file, we use
     // the load object.
-    data* d_out = NULL;
-    if(dynamic_cast<vertical_segment*>(d) == NULL)
+    ptr<data> d_out = NULL;
+    if(!dynamic_pointer_cast<vertical_segment>(d))
     {
         d_out = d;
     }
     else
     {
-        d_out = new vertical_segment();
+        d_out = ptr<data>(new vertical_segment());
         d_out->setDimX(d->dimX());
         d_out->setDimY(d->dimY());
         d_out->setParametrization(d->input_parametrization());
@@ -89,7 +89,7 @@ int main(int argc, char** argv)
 		return 1;
 	}
 
-	if(d != NULL && f != NULL)
+	if(d && f != NULL)
 	{
 		vec temp(f->dimX());
 		for(int i=0; i<d->size(); ++i)

sources/softs/brdf2gnuplot/main.cpp

@@ -67,11 +67,11 @@ int main(int argc, char** argv)
 
 
 	// Load a data file
-	data* d = NULL ;
+	ptr<data> d = NULL ;
 	if(args.is_defined("data") || args.is_defined("in-data"))
 	{
 		d = plugins_manager::get_data(args["data"]);
-		if(dynamic_cast<vertical_segment*>(d) != NULL)
+		if(dynamic_pointer_cast<vertical_segment>(d))
 		{
 			d->load(args["in-data"]);
 		}
@@ -97,7 +97,7 @@ int main(int argc, char** argv)
 			linear_plot = true;
 		}
 
-		if(d != NULL)
+		if(d)
         {
 			for(int i=0; i<d->size(); ++i)
 			{

sources/softs/data2data/main.cpp

@@ -99,20 +99,20 @@ int main(int argc, char** argv)
 	
 	
 	// Import data
-	data* d_in = NULL ;
+	ptr<data> d_in = NULL ;
 	d_in = plugins_manager::get_data(args["in-data"]) ;
 	d_in->load(args["input"], args);
 
-	data* d_out = NULL;
+	ptr<data> d_out = NULL;
 	d_out = plugins_manager::get_data(args["out-data"]) ;
 	
-	if(d_in == NULL && d_out == NULL)
+	if(!d_in && !d_out)
 	{
 		std::cerr << "<<ERROR>> cannot import or export data" << std::endl ;
 		return 1;
 	}
 
-	if(dynamic_cast<vertical_segment*>(d_out) != NULL)
+	if(dynamic_pointer_cast<vertical_segment>(d_out))
 	{
 		params::input param = params::parse_input(args["param"]);
         if(param == params::UNKNOWN_INPUT && d_in->input_parametrization() != params::UNKNOWN_INPUT)

sources/softs/data2diff/main.cpp

@@ -43,7 +43,7 @@ int main(int argc, char** argv)
 	}
 
 	// Import data
-	data* d = NULL ;
+	ptr<data> d = NULL ;
     d = plugins_manager::get_data(args["data"]) ;
 	d->load(args["input"]);
 
@@ -62,7 +62,7 @@ int main(int argc, char** argv)
 	}	
 
 	// Get the output data object
-    data* out_d = plugins_manager::get_data(args["data"]);
+    ptr<data> out_d = plugins_manager::get_data(args["data"]);
 
 	if(d != NULL)
 	{

sources/softs/data2gnuplot/main.cpp

@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 		return 1 ;
 	}
 
-	data* d = plugins_manager::get_data(args["data"]) ;
+	ptr<data> d = plugins_manager::get_data(args["data"]) ;
 	d->load(args["input"], args);
 
 	// Create output file

sources/softs/data2moments/main.cpp

@@ -68,10 +68,10 @@ int main(int argc, char** argv)
 	}
 
 	// Import data
-	data* d = NULL ;
+	ptr<data> d = NULL ;
 	d = plugins_manager::get_data(args["data"]) ;
 
-	if(dynamic_cast<const vertical_segment*>(d) != NULL) {
+	if(dynamic_pointer_cast<vertical_segment>(d)) {
 		std::cerr << "<<ERROR>> this data object is not interpolant." << std::endl;
 		return 1;
 	}
@@ -80,7 +80,7 @@ int main(int argc, char** argv)
 	// Create output file
 	std::ofstream file(args["output"].c_str(), std::ios_base::trunc);
 
-	if(d != NULL)
+	if(d)
 	{
 		// Data parametrization
 		params::input data_param = d->parametrization();

sources/softs/fourieranalysis/main.cpp

@@ -39,7 +39,7 @@ int main(int argc, char** argv)
 		return 1 ;
 	}
 
-	data* d = NULL ;
+	ptr<data> d = NULL ;
 	d = manager.get_data(args["loader"]) ;
 	d->load(args["input"]);