[ismrmrd] 102/177: Fixed memcpy error in c-api. Removed extra output from cartesian phantom utility.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.

commit f1b105c1365a8c457ce88fde463bce1d312f3604
Author: Souheil Inati <souheil.inati at nih.gov>
Date:   Thu Sep 25 22:35:29 2014 -0400

    Fixed memcpy error in c-api.  Removed extra output from cartesian phantom utility.
---
 libsrc/ismrmrd.c                             |  6 +++---
 utilities/generate_cartesian_shepp_logan.cpp | 18 ++----------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/libsrc/ismrmrd.c b/libsrc/ismrmrd.c
index 9c36382..30c7ff8 100644
--- a/libsrc/ismrmrd.c
+++ b/libsrc/ismrmrd.c
@@ -258,9 +258,9 @@ int ismrmrd_copy_image(ISMRMRD_Image *imdest, const ISMRMRD_Image *imsource) {
         ISMRMRD_THROW(ISMRMRD_RUNTIMEERROR, "Failed to make image consistent.");
         return ISMRMRD_RUNTIMEERROR;
     }
-    memcpy(&imdest->attribute_string, &imsource->attribute_string,
+    memcpy(imdest->attribute_string, imsource->attribute_string,
            ismrmrd_size_of_image_attribute_string(imdest));
-    memcpy(&imdest->data, &imsource->data, ismrmrd_size_of_image_data(imdest));
+    memcpy(imdest->data, imsource->data, ismrmrd_size_of_image_data(imdest));
     return ISMRMRD_NOERROR;
 }
 
@@ -424,7 +424,7 @@ int ismrmrd_copy_ndarray(ISMRMRD_NDArray *arrdest, const ISMRMRD_NDArray *arrsou
         ISMRMRD_THROW(ISMRMRD_RUNTIMEERROR, "Failed to make ndarray consistent.");
         return ISMRMRD_RUNTIMEERROR;        
     }
-    memcpy(&arrdest->data, &arrsource->data, ismrmrd_size_of_ndarray_data(arrdest));
+    memcpy(arrdest->data, arrsource->data, ismrmrd_size_of_ndarray_data(arrdest));
     return ISMRMRD_NOERROR;
 }
 
diff --git a/utilities/generate_cartesian_shepp_logan.cpp b/utilities/generate_cartesian_shepp_logan.cpp
index 6308065..42e19d8 100644
--- a/utilities/generate_cartesian_shepp_logan.cpp
+++ b/utilities/generate_cartesian_shepp_logan.cpp
@@ -109,18 +109,10 @@ int main(int argc, char** argv)
             d.appendAcquisition(acq);
 	}
 
-        NDArray<complex_float_t> cm(dims);
-        std::cout << "FFT number 0" << std::endl;
         for (unsigned int r = 0; r < repetitions; r++) {
             for (unsigned int a = 0; a < acc_factor; a++) {
-                //for (size_t n=0; n<coil_images.getNumberOfElements(); n++) {
-                //    cm.getData()[n] = coil_images.getData()[n];
-                //}
-                //NDArray<complex_float_t> cm = coil_images;
-                cm = coil_images;
+                NDArray<complex_float_t> cm = coil_images;
                 fft2c(cm);
-                std::cout << "FFT number 1" << std::endl;
-        
 
                 add_noise(cm,noise_level);
                 for (size_t i = a; i < matrix_size; i+=acc_factor) {
@@ -157,9 +149,6 @@ int main(int argc, char** argv)
             }
 	}
 
-        std::cout << "Wrote acquisitions" << std::endl;
-        
-
 	//Let's create a header, we will use the C++ classes in ismrmrd/xml.h
 	IsmrmrdHeader h;
 	h.experimentalConditions.H1resonanceFrequency_Hz = 63500000; //~1.5T        
@@ -205,14 +194,11 @@ int main(int argc, char** argv)
         std::stringstream str;
         ISMRMRD::serialize( h, str);
         std::string xml_header = str.str();
-        std::cout << xml_header << std::endl;
+        //std::cout << xml_header << std::endl;
         
 	//Write the header to the data file.
 	d.writeHeader(xml_header);
 
-        std::cout << "Generating Cartesian Shepp Logan Phantom!!!" << std::endl;
-                
-
         //Write out some arrays for convenience
         d.appendNDArray("phantom", ISMRMRD_BLOCKMODE_ARRAY, *phantom);
         d.appendNDArray("csm", ISMRMRD_BLOCKMODE_ARRAY, *coils);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git