[nfft] 03/04: Merge tag 'upstream/3.3.0_beta1' into debian/experimental

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/experimental
in repository nfft.

commit 306bff364b960f7472c679ce5d5ebc1cb9e0305a
Merge: e636b23 8b76404
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Apr 17 16:17:37 2015 +0100

    Merge tag 'upstream/3.3.0_beta1' into debian/experimental
    
    Upstream version 3.3.0~beta1

 Makefile.am                                        |   3 +
 README                                             |  37 +++--
 .../fastgauss/{fastgauss.c => fastgauss.c.in}      | 178 ++++++++++-----------
 applications/fastsum/fastsum.c                     |   2 +-
 applications/mri/mri2d/construct_data_2d.c         |   1 -
 applications/mri/mri2d/construct_data_inh_2d1d.c   |   7 +-
 applications/mri/mri2d/construct_data_inh_3d.c     |   7 +-
 applications/mri/mri2d/reconstruct_data_2d.c       |  13 +-
 applications/mri/mri2d/reconstruct_data_gridding.c |   1 -
 applications/mri/mri2d/reconstruct_data_inh_2d1d.c |  19 ++-
 applications/mri/mri2d/reconstruct_data_inh_3d.c   |  19 ++-
 .../mri/mri2d/reconstruct_data_inh_nnfft.c         |  19 ++-
 applications/mri/mri3d/construct_data_2d1d.c       |   1 -
 applications/mri/mri3d/construct_data_3d.c         |   1 -
 applications/mri/mri3d/reconstruct_data_2d1d.c     |   1 -
 applications/mri/mri3d/reconstruct_data_3d.c       |   1 -
 applications/mri/mri3d/reconstruct_data_gridding.c |   1 -
 ...{linogram_fft_test.c => linogram_fft_test.c.in} | 158 +++++++++---------
 .../{mpolar_fft_test.c => mpolar_fft_test.c.in}    | 162 +++++++++----------
 .../{polar_fft_test.c => polar_fft_test.c.in}      |  86 +++++-----
 .../radon/{inverse_radon.c => inverse_radon.c.in}  |  78 +++++----
 applications/radon/{radon.c => radon.c.in}         |  74 +++++----
 configure.ac                                       |  28 +++-
 examples/fpt/simple_test.c                         |   9 +-
 examples/nfct/{simple_test.c => simple_test.c.in}  |  19 ++-
 examples/nfft/{simple_test.c => simple_test.c.in}  |  70 ++++----
 ...ple_test_threads.c => simple_test_threads.c.in} |  35 ++--
 examples/nfsft/simple_test.c                       |  14 +-
 examples/nfsft/simple_test_threads.c               |  16 +-
 examples/nfsoft/simple_test.c                      |  46 +++---
 examples/nfst/{simple_test.c => simple_test.c.in}  |  19 ++-
 examples/nnfft/accuracy.c                          |  13 +-
 examples/nnfft/simple_test.c                       |  22 +--
 examples/nsfft/nsfft_test.c                        |  38 ++---
 examples/nsfft/simple_test.c                       |   8 +-
 examples/solver/{glacier.c => glacier.c.in}        |  60 ++++---
 .../solver/{simple_test.c => simple_test.c.in}     |  33 ++--
 include/Makefile.am                                |   2 +-
 include/infft.h                                    |  32 ----
 include/nfft3.h                                    | 129 +++++++++++----
 include/nfft3mp.h                                  | 104 ++++++++++++
 kernel/nfct/nfct.c                                 |   2 +-
 kernel/nfft/nfft.c                                 |   2 +-
 kernel/nfsft/nfsft.c                               |   2 +-
 kernel/nfsoft/nfsoft.c                             |   2 +-
 kernel/nfst/nfst.c                                 |   2 +-
 kernel/nnfft/nnfft.c                               |   4 +-
 kernel/util/time.c                                 |  21 +++
 matlab/nfft/Makefile.am                            |   3 +-
 .../FG_PSI.m => nfft/NFFT_OMP_BLOCKWISE_ADJOINT.m} |  14 +-
 matlab/nfft/nfft.m                                 |   6 +-
 matlab/nfft/simple_test.m                          |   4 +-
 matlab/nfft/test_nfft1d.m                          |   2 +-
 matlab/nfft/test_nfft2d.m                          |   2 +-
 matlab/nfft/test_nfft3d.m                          |   2 +-
 matlab/nnfft/FFTW_ESTIMATE.m                       |  25 ---
 matlab/nnfft/FFTW_MEASURE.m                        |  25 ---
 matlab/nnfft/FFT_OUT_OF_PLACE.m                    |  25 ---
 matlab/nnfft/Makefile.am                           |  13 +-
 matlab/nnfft/PRE_FG_PSI.m                          |  28 ----
 matlab/nnfft/nnfft.m                               |  72 ++++-----
 matlab/nnfft/out.txt                               |  32 ----
 matlab/nnfft/test_nfft1d.m                         |  70 --------
 matlab/nnfft/test_nnfft1d.m                        |  19 ++-
 matlab/nnfft/test_nnfft2d.m                        |  55 +++++--
 matlab/nnfft/test_nnfft2d_N215.m                   |  86 ++++++++++
 nfft3.pc.in                                        |   4 +-
 support/Portfile                                   |  59 +++++++
 68 files changed, 1140 insertions(+), 1007 deletions(-)

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