Basic update

Author: dcwhite

src/Core/Algorithms/Legacy/DataIO/DataIOAlgo.cc

@@ -156,8 +156,8 @@ bool DataIOAlgo::ReadNrrd(const std::string& filename, NrrdDataHandle& nrrd, con
     const std::string ext = filename.substr(filename.size()-5,5);
     if (ext == ".nhdr" || ext == ".nrrd")
     {
-      nrrd = new NrrdData;
-      if (nrrd.get_rep() == 0) return (false);
+      nrrd.reset(new NrrdData);
+      if (!nrrd) return (false);
 
       NrrdData::lock_teem(); 
       if (nrrdLoad(nrrd->nrrd_, airStrdup(filename.c_str()), 0)) 
@@ -185,7 +185,7 @@ bool DataIOAlgo::ReadNrrd(const std::string& filename, NrrdDataHandle& nrrd, con
 
   // Read the file through Pio
   Pio(*stream, nrrd);
-  if (!nrrd.get_rep() || stream->error())
+  if (!nrrd || stream->error())
   {
     error("Error reading data from file '" + filename +"'.");
     return (false);
@@ -421,9 +421,9 @@ bool DataIOAlgo::WriteBundle(const std::string& filename, BundleHandle& bundle,
 #endif
 
 
-bool DataIOAlgo::WriteNrrd(const std::string& filename, NrrdDataHandle& nrrd, const std::string& exporter)
+bool DataIOAlgo::WriteNrrd(const std::string& filename, NrrdDataHandle nrrd, const std::string& exporter)
 {
-  if (nrrd.get_rep() == 0) return (false);
+  if (!nrrd) return (false);
 
   if ((exporter == "text")||(exporter == "Text"))
   {
@@ -439,7 +439,7 @@ bool DataIOAlgo::WriteNrrd(const std::string& filename, NrrdDataHandle& nrrd, co
       Pio(*stream, nrrd);
     } 
   }
-  else if (exporter == "")
+  else if (exporter.empty())
   {
 
     if (filename.size() > 4)
@@ -626,7 +626,7 @@ bool DataIOAlgo::WritePath(const std::string& filename, PathHandle& path, const
 }
 #endif
 
-AlgorithmOutput DataIOAlgo::run_generic(const AlgorithmInput& input) const override
+AlgorithmOutput DataIOAlgo::run_generic(const AlgorithmInput& input) const
 {
   throw "not implemented";
 }

src/Core/Algorithms/Legacy/DataIO/DataIOAlgo.h

@@ -47,31 +47,31 @@ class SCISHARE DataIOAlgo : public AlgorithmBase {
 
 #ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
   bool ReadField(const std::string& filename, FieldHandle& field, const std::string& importer = "");
-  bool WriteField(const std::string& filename, FieldHandle& field, const std::string& exporter = "");
+  bool WriteField(const std::string& filename, FieldHandle field, const std::string& exporter = "");
 
   bool ReadMatrix(const std::string& filename, Datatypes::MatrixHandle& matrix, const std::string& importer = "");
-  bool WriteMatrix(const std::string& filename, Datatypes::MatrixHandle& matrix, const std::string& exporter = "");
+  bool WriteMatrix(const std::string& filename, Datatypes::MatrixHandle matrix, const std::string& exporter = "");
 #endif
 
   bool ReadNrrd(const std::string& filename, NrrdDataHandle& nrrd, const std::string& importer = "");
-  bool WriteNrrd(const std::string& filename, NrrdDataHandle& nrrd, const std::string& exporter = "");
+  bool WriteNrrd(const std::string& filename, NrrdDataHandle nrrd, const std::string& exporter = "");
 
 #ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
   bool ReadBundle(const std::string& filename, Datatypes::BundleHandle& bundle, const std::string& importer = "");
-  bool WriteBundle(const std::string& filename, Datatypes::BundleHandle& bundle, const std::string& exporter = "");
+  bool WriteBundle(const std::string& filename, Datatypes::BundleHandle bundle, const std::string& exporter = "");
 
   bool ReadColorMap(const std::string& filename, Datatypes::ColorMapHandle& colorMap, const std::string& importer = "");
-  bool WriteColorMap(const std::string& filename, Datatypes::ColorMapHandle& colorMap, const std::string& exporter = "");
+  bool WriteColorMap(const std::string& filename, Datatypes::ColorMapHandle colorMap, const std::string& exporter = "");
 #endif
 
   virtual AlgorithmOutput run_generic(const AlgorithmInput& input) const override;
 
 #ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
   bool ReadColorMap2(const std::string& filename, ColorMap2Handle& colorMap2, const std::string& importer = "");
-  bool WriteColorMap2(const std::string& filename, ColorMap2Handle& colorMap2, const std::string& exporter = "");
+  bool WriteColorMap2(const std::string& filename, ColorMap2Handle colorMap2, const std::string& exporter = "");
 
   bool ReadPath(const std::string& filename, PathHandle& path, const std::string& importer = "");
-  bool WritePath(const std::string& filename, PathHandle& path, const std::string& exporter = "");
+  bool WritePath(const std::string& filename, PathHandle path, const std::string& exporter = "");
 #endif
 private:
   Core::Logging::LoggerHandle pr_;