[ismrmrd] 08/12: fix unwanted storage of patched files

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository ismrmrd.

commit 90b29ac74dedbc0ee39e73937b2b535236d5c8f8
Author: Ghislain Vaillant <ghisvail at gmail.com>
Date:   Mon Apr 28 23:34:38 2014 +0100

    fix unwanted storage of patched files
---
 CMakeLists.txt                   | 10 ----------
 tests/c++/t_ndarraycontainer.cpp | 35 +++++++++++++++++++++--------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 287a574..9d0de14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,16 +36,6 @@ target_link_libraries(dummy ${XERCESC_LIBRARIES})
 # Add library ismrmrd
 add_library(ismrmrd SHARED ismrmrd_hdf5.cpp)
 
-# Add version string info
-set(ISMRMRD_VERSION_MAJOR 0)
-set(ISMRMRD_VERSION_MINOR 5)
-set(ISMRMRD_VERSION_PATCH 0)
-set(ISMRMRD_VERSION_STRING
-	${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR}.${ISMRMRD_VERSION_PATCH})
-set_target_properties(ismrmrd PROPERTIES
-	VERSION ${ISMRMRD_VERSION_STRING}
-	SOVERSION ${ISMRMRD_VERSION_MAJOR})
-
 #The findHDF5.cmake does not work very well on Windows, let's help it out
 IF(WIN32)
 	SET(HDF5_LIB_DIR ${HDF5_INCLUDE_DIR}/../lib)
diff --git a/tests/c++/t_ndarraycontainer.cpp b/tests/c++/t_ndarraycontainer.cpp
index 5feed2b..0b30314 100644
--- a/tests/c++/t_ndarraycontainer.cpp
+++ b/tests/c++/t_ndarraycontainer.cpp
@@ -17,8 +17,9 @@ template<> struct populate <float> {
     static void random (NDArrayContainer<type>& ndac) {
         type mi = (type) std::numeric_limits<int>::max();
         assert (ndac.is_consistent());
-        size_t j = ndac.elements();
-        for (size_t i=0; i<j; i++)
+        size_t i = ndac.elements();
+        size_t j = ndac.data_.size();
+        for (; i>=1; i--)
             ndac[i] = 1.0 - 2.0 * (type)rand() / mi;
     }
 
@@ -31,8 +32,9 @@ template<> struct populate <double> {
     static void random (NDArrayContainer<type>& ndac) {
         type mi = (type) std::numeric_limits<int>::max();
         assert (ndac.is_consistent());
-        size_t j = ndac.elements();
-        for (size_t i=0; i<j; i++)
+        size_t i = ndac.elements();
+        size_t j = ndac.data_.size();
+        for (; i>=1; i--)
             ndac[i] = 1.0 - 2.0 * (type)rand() / mi;
     }
 
@@ -46,8 +48,9 @@ template<> struct populate <std::complex<float> > {
     static void random (NDArrayContainer<type>& ndac) {
         rtype mi = std::numeric_limits<int>::max();
         assert (ndac.is_consistent());
-        size_t j = ndac.elements();
-        for (size_t i=0; i<j; i++)
+        size_t i = ndac.elements();
+        size_t j = ndac.data_.size();
+        for (; i>=1; i--)
             ndac[i] = type(1.0, 1.0) - type(2.0 * (rtype)rand() / mi, 2.0 * (rtype)rand() / mi);
     }
     
@@ -61,8 +64,9 @@ template<> struct populate <std::complex<double> > {
     static void random (NDArrayContainer<type>& ndac) {
         rtype mi = std::numeric_limits<int>::max();
         assert (ndac.is_consistent());
-        size_t j = ndac.elements();
-        for (size_t i=0; i<j; i++)
+        size_t i = ndac.elements();
+        size_t j = ndac.data_.size();
+        for (; i>=1; i--)
             ndac[i] = type(1.0, 1.0) - type(2.0 * (rtype)rand() / mi, 2.0 * (rtype)rand() / mi);
     }
     
@@ -75,8 +79,9 @@ template<> struct populate <int> {
     static void random (NDArrayContainer<type>& ndac) {
         type mi = (type) std::numeric_limits<type>::max();
         assert (ndac.is_consistent());
-        size_t j = ndac.elements();
-        for (size_t i=0; i<j; i++)
+        size_t i = ndac.elements();
+        size_t j = ndac.data_.size();
+        for (; i>=1; i--)
             ndac[i] = rand();
     }
     
@@ -89,8 +94,9 @@ template<> struct populate <short> {
     static void random (NDArrayContainer<type>& ndac) {
         type mi = (type) std::numeric_limits<type>::max();
         assert (ndac.is_consistent());
-        size_t j = ndac.elements();
-        for (size_t i=0; i<j; i++)
+        size_t i = ndac.elements();
+        size_t j = ndac.data_.size();
+        for (; i>=1; i--)
             ndac[i] = rand();
     }
     
@@ -103,8 +109,9 @@ template<> struct populate <long> {
     static void random (NDArrayContainer<type>& ndac) {
         type mi = (type) std::numeric_limits<type>::max();
         assert (ndac.is_consistent());
-        size_t j = ndac.elements();
-        for (size_t i=0; i<j; i++)
+        size_t i = ndac.elements();
+        size_t j = ndac.data_.size();
+        for (; i>=1; i--)
             ndac[i] = rand();
     }
     

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