make sure dimensions match in complex(). fixes #3090

JuliaLang · May 13, 2013 · c8cd71d · c8cd71d
1 parent ef61047
commit c8cd71d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/base/array.jl b/base/array.jl
@@ -967,6 +967,7 @@ end
 ## promotion to complex ##
 
 function complex{S<:Real,T<:Real}(A::Array{S}, B::Array{T})
+    if size(A) != size(B); error("argument dimensions must match"); end
     F = similar(A, typeof(complex(zero(S),zero(T))))
     for i=1:length(A)
         F[i] = complex(A[i], B[i])

diff --git a/test/dsp.jl b/test/dsp.jl
@@ -2,7 +2,7 @@
 a = [1., 2., 1., 2.]
 b = [1., 2., 3.]
 @test_approx_eq conv(a, b) [1., 4., 8., 10., 7., 6.]
-@test_approx_eq conv(complex(a, ones(4)), complex(b)) complex([1., 4., 8., 10., 7., 6.], [1. 3. 6. 6. 5. 3.])
+@test_approx_eq conv(complex(a, ones(4)), complex(b)) complex([1., 4., 8., 10., 7., 6.], [1., 3., 6., 6., 5., 3.])
 
 # Discrete cosine transform (DCT) tests