[ismrmrd] 109/129: Merge tag 'upstream/1.2.0'
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:00:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository ismrmrd.
commit fa3f32bd314b365cd654e600e0807f08914b32b6
Merge: 6abe083 d57aef2
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed Jan 14 18:37:04 2015 +0000
Merge tag 'upstream/1.2.0'
Upstream version 1.2.0
Conflicts:
.gitignore
.gitignore | 6 +-
CMakeLists.txt | 248 +-
README.html | 1606 ----
README.md | 28 +
_clang-format | 48 +
bindings/CMakeLists.txt | 26 -
bindings/java/CMakeLists.txt | 41 -
bindings/java/JNILibLoader.java | 34 -
bindings/java/XMLString.java | 42 -
bindings/java/cfg.jxb | 10 -
bindings/java/ismrmrd_java.i | 780 --
bindings/java/make_jar.sh.in | 10 -
bindings/python/.gitignore | 3 +
bindings/python/CMakeLists.txt | 40 -
bindings/python/Makefile | 14 +
bindings/python/cismrmrd.pxd | 256 +
bindings/python/demo.py | 11 +
bindings/python/ismrmrd.pyx | 874 ++
bindings/python/ismrmrd_python.i | 302 -
bindings/python/setup.py | 23 +
bindings/python/test.py | 9 -
cmake/FindFFTW3.cmake | 41 +-
cmake/FindIsmrmrd.cmake | 26 +-
cmake/FindPugiXML.cmake | 27 +
cmake/FindXSD.cmake | 68 -
cmake/FindXercesC.cmake | 39 -
cmake/cpack_options.cmake.in | 39 +
cmake/ismrmrd_cpack.cmake | 33 +
doc/CMakeLists.txt | 38 +-
doc/Doxyfile.in | 2333 +++++
doc/Makefile.sphinx.in | 177 +
doc/doxygen/CMakeLists.txt | 8 -
doc/doxygen/Doxyfile.in | 1757 ----
doc/make.sphinx.bat.in | 242 +
doc/{ => source}/TODO.rst | 2 +-
doc/source/conf.py | 273 +
doc/{README.rst => source/index.rst} | 309 +-
examples/c++/CMakeLists-Standalone.txt | 43 -
examples/c++/CMakeLists.txt | 28 -
examples/c++/cmake/FindFFTW3.cmake | 93 -
examples/c++/cmake/FindIsmrmrd.cmake | 29 -
examples/c++/publication_recon_dataset.cpp | 206 -
examples/c++/test_create_dataset.cpp | 167 -
examples/c++/test_recon_dataset.cpp | 159 -
examples/c/CMakeLists.txt | 5 +
examples/c/README.txt | 11 +
examples/c/main.c | 192 +
examples/java/ismrmrd_test.java | 55 -
examples/matlab/old/ismrmrd_header2struct.m | 25 -
examples/matlab/old/simple_cartesian_recon.m | 127 -
examples/matlab/old/testsynth.m | 85 -
examples/matlab/old/xml2struct.m | 183 -
examples/matlab/{old => }/simple_gridder.m | 0
examples/matlab/{old => }/simple_spiral_recon.m | 24 +-
examples/matlab/test_create_dataset.m | 120 +-
examples/matlab/test_recon_dataset.m | 59 +-
examples/matlab/todo.txt | 1 +
examples/python/ismrmrd_create_dataset.py | 174 +
examples/python/ismrmrd_recon_dataset.py | 125 +
examples/python/ismrmrd_test.py | 22 -
include/ismrmrd/dataset.h | 175 +
ismrmrd_export.h => include/ismrmrd/export.h | 0
include/ismrmrd/ismrmrd.h | 813 ++
include/ismrmrd/meta.h | 259 +
include/ismrmrd/xml.h | 331 +
include/version.in | 10 +
ismrmrd.h | 1211 ---
ismrmrd_hdf5.cpp | 602 --
ismrmrd_hdf5.h | 242 -
ismrmrd_hdf5_datatypes.h | 339 -
ismrmrd_xsd_export.h | 21 -
libsrc/dataset.c | 1409 +++
libsrc/dataset.cpp | 161 +
libsrc/ismrmrd.c | 751 ++
libsrc/ismrmrd.cpp | 1163 +++
libsrc/meta.cpp | 59 +
libsrc/pugiconfig.hpp | 72 +
libsrc/pugixml.cpp | 10639 +++++++++++++++++++++
libsrc/pugixml.hpp | 1332 +++
libsrc/xml.cpp | 691 ++
matlab/+ismrmrd/+util/hdf5_datatypes.m | 133 +-
matlab/+ismrmrd/+util/includejar.m | 15 -
matlab/+ismrmrd/+xml/deserialize.m | 259 +
matlab/+ismrmrd/+xml/serialize.m | 281 +
matlab/+ismrmrd/+xml/validate.m | 20 +
matlab/+ismrmrd/Acquisition.m | 15 +-
matlab/+ismrmrd/AcquisitionHeader.m | 201 +-
matlab/+ismrmrd/{IsmrmrdDataset.m => Dataset.m} | 64 +-
matlab/+ismrmrd/ImageHeader.m | 124 +-
matlab/CMakeLists.txt | 72 -
matlab/XMLString.java | 42 -
matlab/cfg.jxb | 10 -
schema/ismrmrd.xsd | 115 +-
schema/ismrmrd_example_extended.xml | 376 +
tests/CMakeLists.txt | 2 -
tests/c++/CMakeLists.txt | 12 -
tests/c++/t_image.cpp | 30 -
tests/c++/t_ndarraycontainer.cpp | 152 -
tests/c++/t_template.cpp | 20 -
tests/c/CMakeLists.txt | 12 -
tests/c/t_cquaternions.cpp | 45 -
tests/c/t_cstructs.cpp | 137 -
utilities/CMakeLists.txt | 88 +-
utilities/generate_cartesian_shepp_logan.cpp | 242 +-
utilities/ismrmrd_fftw.h | 60 +-
utilities/ismrmrd_info.cpp | 10 +
utilities/ismrmrd_phantom.cpp | 183 +-
utilities/ismrmrd_phantom.h | 21 +-
utilities/ismrmrd_test_xml.cpp | 55 +
utilities/ismrmrd_utilities_export.h | 21 -
{examples/c++ => utilities}/read_timing_test.cpp | 15 +-
utilities/recon_cartesian_2d.cpp | 147 +
112 files changed, 25057 insertions(+), 9958 deletions(-)
diff --cc .gitignore
index e52b9ed,ea8261b..5cf3b9c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,8 +1,9 @@@
*~
*swp
+ *.so
build/
.DS_Store
- .pc
+
+ # autogenerated
+ cmake/cpack_options.cmake
++>>>>>>> upstream/1.2.0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git
More information about the debian-science-commits
mailing list