Skip to content

Commit

Permalink
Fixes for julia-0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
timholy committed Apr 20, 2016
1 parent e8ee069 commit 4429104
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/RFFT.jl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function RCpair{T<:AbstractFloat}(realtype::Type{T}, realsize, region=1:length(r
C = Array(Complex{T}, sz...)
sz[firstdim] *= 2
R = reinterpret(T, C, tuple(sz...))
RCpair(sub(R, map(n->1:n, realsize)), C, [region...])
RCpair(sub(R, map(n->1:n, realsize)...), C, [region...])
end
RCpair{T<:AbstractFloat}(A::Array{T}, region=1:ndims(A)) = copy!(RCpair(T, size(A), region), A)

Expand Down Expand Up @@ -75,7 +75,7 @@ else

function plan_rfft!{T}(RC::RCpair{T}; flags::Integer = FFTW.ESTIMATE, timelimit::Real = FFTW.NO_TIMELIMIT)
p = rplan_fwd(RC.R, RC.C, RC.region, flags, timelimit)
return Z::RCpair{T} -> begin
return Z::RCpair -> begin
FFTW.assert_applicable(p, Z.R, Z.C)
FFTW.unsafe_execute!(p, Z.R, Z.C)
return Z
Expand All @@ -84,7 +84,7 @@ else

function plan_irfft!{T}(RC::RCpair{T}; flags::Integer = FFTW.ESTIMATE, timelimit::Real = FFTW.NO_TIMELIMIT)
p = rplan_inv(RC.C, RC.R, RC.region, flags, timelimit)
return Z::RCpair{T} -> begin
return Z::RCpair -> begin
FFTW.assert_applicable(p, Z.C, Z.R)
FFTW.unsafe_execute!(p, Z.C, Z.R)
scale!(Z.R, 1 / prod(size(Z.R)[Z.region]))
Expand Down

0 comments on commit 4429104

Please sign in to comment.