Don't include the external pointer for niftiHeader objects, as it won…

…'t be updated on retrieval
jonclayden · Oct 19, 2018 · 8c51670 · 8c51670
1 parent 8d2337a
commit 8c51670
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/inst/include/lib/NiftiImage.h b/inst/include/lib/NiftiImage.h
@@ -1950,7 +1950,7 @@ inline Rcpp::RObject NiftiImage::headerToList () const
     result["intent_name"] = std::string(header.intent_name, 16);
     result["magic"] = std::string(header.magic, 4);
 
-    internal::addAttributes(result, *this, false);
+    internal::addAttributes(result, *this, false, false);
     result.attr("class") = Rcpp::CharacterVector::create("niftiHeader");
 
     return result;

diff --git a/inst/include/lib/NiftiImage_internal.h b/inst/include/lib/NiftiImage_internal.h
@@ -460,7 +460,7 @@ inline Rcpp::RObject imageDataToArray (const nifti_image *source)
     }
 }
 
-inline void addAttributes (const SEXP pointer, const NiftiImage &source, const bool realDim = true)
+inline void addAttributes (const SEXP pointer, const NiftiImage &source, const bool realDim = true, const bool includeXptr = true)
 {
     const int nDims = source->dim[0];
     Rcpp::RObject object(pointer);
@@ -486,8 +486,11 @@ inline void addAttributes (const SEXP pointer, const NiftiImage &source, const b
         object.attr("pixunits") = pixunits;
     }
 
-    Rcpp::XPtr<NiftiImage> xptr(new NiftiImage(source,false));
-    object.attr(".nifti_image_ptr") = xptr;
+    if (includeXptr)
+    {
+        Rcpp::XPtr<NiftiImage> xptr(new NiftiImage(source,false));
+        object.attr(".nifti_image_ptr") = xptr;
+    }
 }
 
 #endif // USING_R