This is an automated email from the git hooks/post-receive script. gert-guest pushed a commit to branch master in repository mia.
commit bf8dd83a3ad9ca1873f547001b1c2b7253815997 Merge: 134f6a8 93ea45f Author: Gert Wollny <[email protected]> Date: Wed Nov 27 12:40:11 2013 +0100 Merge tag 'upstream/2.0.12' Upstream version 2.0.12 CMakeLists.txt | 36 +++- ChangeLog | 25 +++ addons/CMakeLists.txt | 4 + addons/dicom/CMakeLists.txt | 1 + addons/dicom/dcm2d.cc | 5 + addons/dicom/dcm2d.hh | 1 + addons/dicom/dcm3d.cc | 30 ++- addons/dicom/dicom4mia.cc | 14 +- addons/dicom/dicom4mia.hh | 2 +- {mia/2d/rgbio => addons/jpg}/CMakeLists.txt | 32 ++-- mia/2d/io/jpg.cc => addons/jpg/jpg-gray.cc | 0 mia/2d/rgbio/jpg.cc => addons/jpg/jpg-rgb.cc | 0 .../core/minimizer => addons/nlopt}/CMakeLists.txt | 13 +- {mia/core/minimizer => addons/nlopt}/nlopt.cc | 2 +- {mia/core/minimizer => addons/nlopt}/nlopt.hh | 0 {mia/core/minimizer => addons/nlopt}/test_nlopt.cc | 2 +- addons/openexr/2dimgexr.cc | 7 +- addons/openexr/2dvfexr.cc | 8 +- addons/openexr/CMakeLists.txt | 2 +- {mia/2d/rgbio => addons/png}/CMakeLists.txt | 33 ++-- mia/2d/io/png.cc => addons/png/png-gray.cc | 0 mia/2d/rgbio/png.cc => addons/png/png-rgb.cc | 0 {mia/2d/rgbio => addons/tiff}/CMakeLists.txt | 29 +-- {mia/2d/io => addons/tiff}/tiff.cc | 0 addons/vistaio/CMakeLists.txt | 1 + addons/vistaio/test_vista4mia.cc | 5 +- addons/vtk/CMakeLists.txt | 1 + addons/vtk/vtkimage.cc | 2 +- addons/vtk/vtkmesh.cc | 3 +- addons/vtk/vtkvf.cc | 5 +- config.h.cmake | 14 ++ mia/2d/CMakeLists.txt | 32 ---- mia/2d/SegStar.cc | 3 +- mia/2d/cost/ngf.hh | 5 +- mia/2d/creator/circle.cc | 2 +- mia/2d/fftkernel.cc | 9 +- mia/2d/filter/aniso.cc | 5 +- mia/2d/filter/mask.cc | 3 +- mia/2d/filter/mean.cc | 14 +- mia/2d/filter/test_mlv.cc | 2 +- mia/2d/fuzzyClusterSolverCG.cc | 7 + mia/2d/io/CMakeLists.txt | 17 -- mia/2d/io/bmp.cc | 82 +++++--- mia/2d/model/navier.cc | 5 +- mia/2d/model/navier.hh | 2 +- mia/2d/model/naviera.hh | 2 +- mia/2d/perfusion.cc | 4 +- mia/2d/rgbio/CMakeLists.txt | 11 -- mia/2d/test_imageio.cc | 5 +- mia/2d/test_interpol.cc | 13 +- mia/2d/test_ppmatrix.cc | 11 +- mia/2d/test_rigidregister.cc | 58 ++---- mia/3d/camera.cc | 7 +- mia/3d/camera.hh | 2 +- mia/3d/cost/ngf.hh | 4 - mia/3d/creator/sphere.cc | 2 +- mia/3d/fifof/mlv.cc | 3 +- mia/3d/fifof/mlv.hh | 2 - mia/3d/fifof/regiongrow.cc | 3 +- mia/3d/filter/mask.cc | 3 +- mia/3d/filter/reorient.hh | 1 - mia/3d/filter/scale.cc | 87 +++++---- mia/3d/filter/test_mlv.cc | 2 +- mia/3d/fullcost/taggedssd.hh | 2 - mia/3d/fuzzyClusterSolverCG.cc | 7 + mia/3d/image.cc | 1 + mia/3d/io/analyze.cc | 22 ++- mia/3d/io/inria.cc | 1 + mia/3d/io/vff.cc | 15 +- mia/3d/landmark.cc | 6 +- mia/3d/reg3d/navier.cc | 6 +- mia/3d/reg3d/naviera.cc | 4 +- mia/3d/reg3d/navierasse.cc | 2 +- mia/3d/test_3d.cc | 5 +- mia/3d/test_imageio.cc | 5 +- mia/3d/test_ppmatrix.cc | 13 +- mia/3d/test_rigidregister.cc | 61 ++---- mia/3d/transform.cc | 3 +- mia/3d/transform/test_spline.cc | 4 +- mia/core/CMakeLists.txt | 1 - mia/core/attributes.hh | 10 +- mia/core/cmdlineparser.cc | 8 +- mia/core/fftslopeclassifier.cc | 7 +- mia/core/fifofilter.cxx | 2 + mia/core/fixedwidthoutput.cc | 2 +- mia/core/handler.cxx | 6 +- mia/core/histogram.hh | 2 +- mia/core/history.cc | 3 +- mia/core/iohandler.cxx | 13 +- mia/core/minimizer/CMakeLists.txt | 19 -- mia/core/minimizer/gsl.cc | 9 + mia/core/noise/gauss.cc | 3 +- mia/core/parameter.hh | 4 +- mia/core/plugin_base.cc | 19 ++ mia/core/plugin_base.hh | 15 ++ mia/core/slopestatistics.cc | 14 ++ mia/core/spacialkernel/gauss.cc | 7 +- mia/core/splineparzenmi.cc | 2 + mia/core/splineparzenmi.hh | 3 + mia/core/test_attributes.cc | 14 +- mia/core/test_cmdlineparser.cc | 25 ++- mia/core/test_filter.cc | 3 +- mia/core/test_histogram.cc | 11 ++ mia/core/test_iohandler.cc | 2 +- mia/core/test_shape.cc | 3 + mia/core/test_streamredir.cc | 15 +- mia/core/threadedmsg.cc | 4 +- mia/core/threadedmsg.hh | 1 - mia/core/waveletslopeclassifier.cc | 2 + mia/internal/autotest.hh | 6 +- mia/internal/main.hh | 48 ++--- mia/internal/plugintester.hh | 6 +- mia/template/mi.hh | 1 - mia/template/ssd.hh | 1 - src/2davgmasked.cc | 7 +- src/2deval-transformquantity.cc | 10 +- src/2dimagefilterstack.cc | 6 - src/2dmultiimageto3d.cc | 81 ++++++++ src/2dmyocard-segment.cc | 2 +- src/2dmyoica-nonrigid2.cc | 8 +- src/2dmyoperiodic-nonrigid.cc | 17 +- src/2dsegment-ahmed.cc | 4 +- src/2dseriescorr.cc | 2 + src/2dtransformation-to-strain.cc | 2 +- src/3dprealign-nonrigid.cc | 107 +++++++---- src/3dsegment-ahmed.cc | 4 +- src/CMakeLists.txt | 1 + src/fluid2d/main.cc | 2 +- src/fluid3d/sor_solver.cc | 3 +- src/fluid3d/vfluid.cc | 4 + src/raw2image.cc | 8 +- src/raw2volume.cc | 9 +- {addons => test}/CMakeLists.txt | 8 +- test/test_ioplugins.cc | 210 +++++++++++++++++++++ test/test_minimizer.cc | 191 +++++++++++++++++++ 135 files changed, 1263 insertions(+), 556 deletions(-) -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
