← Back to branch summary

~ubuntu-branches/ubuntu/wily/octave-ltfat/wily

« back to all changes in this revision

Viewing changes to oct/comp_col2diag.cc

  • Committer: Package Import Robot
  • Author(s): Sébastien Villemot, Rafael Laboissiere
  • Date: 2015-07-18 23:36:41 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20150718233641-jhuf3f551a3523qc
Tags: 2.1.0+dfsg-1
* Team upload.

[ Rafael Laboissiere ]
* Imported Upstream version 2.1.0+dfsg
* d/rules: Prevent unit testing on armhf and mips.
  This avoids FTBFS on theses architectures (see Bug#765545).
* Unit testing does not need X-window anymore
  + d/rules: Do not use xfvb-run to run the tests.
  + d/control: Drop xauth, xvfb, and gnuplot-nox from Build-Depends.
    Also, the versioned dependency on octave-pkg-dev is relaxed.
* Drop .jar file from upstream tarball, complying with the Debian Policy
  + d/copyright: Exclude file blockproc.jar
  + d/rules: Add get-orig-source target
  + d/watch: Mangle upstream version to cope with "+dfsg" tag
* Build blockproc.jar, which is deleted from the upstream tarball
  + d/rules: Add commands for building blockproc.jar
  + d/control: Build-depend on default-jdk
  + d/p/fix-path-of-included-makefile.patch: New patch
* Bump Standard-Versions to 3.9.6 (no changes needed)
* d/p/autoload-yes.patch: Remove patch (deprecated upstream)
* Bump Build-Depends on octave to >> 4.0.0~rc4-1 (for sndfile support)
* d/check.m: Avoid verbose output of unit tests
* d/watch: Add the repacksuffix option
* d/p/add-hardening-flags.patch: Drop patch (applied upstream)
* d/p/fix-path-of-included-makefile.patch: Drop patch (applied upstream)

Show diffs side-by-side

added added

removed removed

Lines of Context:
oct/comp_col2diag.cc
14
14
static inline void
15
15
fwd_col2diag(const Complex *cin, const octave_idx_type L, Complex *cout)
16
16
{
17
 
    col2diag_cd(reinterpret_cast<const double _Complex*>(cin), L,
18
 
                reinterpret_cast<double _Complex*>(cout));
 
17
    col2diag_cd(reinterpret_cast<const fftw_complex*>(cin), L,
 
18
                reinterpret_cast<fftw_complex*>(cout));
19
19
}
20
20
 
21
21
static inline void
22
22
fwd_col2diag(const FloatComplex *cin, const octave_idx_type L,
23
23
             FloatComplex *cout)
24
24
{
25
 
    col2diag_cs(reinterpret_cast<const float _Complex*>(cin), L,
26
 
                reinterpret_cast<float _Complex*>(cout));
 
25
    col2diag_cs(reinterpret_cast<const fftwf_complex*>(cin), L,
 
26
                reinterpret_cast<fftwf_complex*>(cout));
27
27
}
28
28
 
29
29
static inline void