Adding fixes suggested by simonster

JuliaDSP · Apr 23, 2015 · 3349186 · 3349186
1 parent e5a0d01
commit 3349186
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/src/periodograms.jl b/src/periodograms.jl
@@ -162,20 +162,6 @@ function fft2oneortwosided!{T}(out::Array{Complex{T}}, s_fft::Vector{Complex{T}}
     out
 end
 
-# Calculate sum of abs2
-# Remove this once we drop support for Julia 0.2
-if isdefined(Base, :sumabs2)
-    sumabs2(x) = Base.sumabs2(x)
-else
-    function sumabs2(s)
-        x = zero(eltype(s))
-        for i = 1:length(s)
-            @inbounds x += abs2(s[i])
-        end
-        x
-    end
-end
-
 ## PERIODOGRAMS
 abstract TFR{T}
 immutable Periodogram{T,F<:Union(Frequencies,Range)} <: TFR{T}

diff --git a/src/util.jl b/src/util.jl
@@ -104,7 +104,7 @@ function istft{T<:Union(Float32, Float64)}(S::AbstractMatrix{Complex{T}}, wlen::
     nframes = size(S,2)-1
     outlen = nfft + nframes*winc
     out = zeros(T, outlen)
-    tmp1 = similar(S[:,1])
+    tmp1 = Array(eltype(S), size(S, 1))
     tmp2 = zeros(T, nfft)
     p = backward_plan(tmp1, tmp2)
     wsum = zeros(outlen)