Skip to content

Commit 24564ec

Browse files
kescoboKevin Bonham
and
Kevin Bonham
authored
Fix array constructor (#416)
* eltype -> T * add tests * undo auto-format * add compat for Images * only use `RGB` from images * try colors * back to images * fix Fill ambiguity * original formatting * Replace testset * oops, begin * bump patch version --------- Co-authored-by: Kevin Bonham <[email protected]>
1 parent 836da5c commit 24564ec

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

Project.toml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "BlockArrays"
22
uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
3-
version = "1.1.0"
3+
version = "1.1.1"
44

55
[deps]
66
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -20,6 +20,7 @@ ArrayLayouts = "1.0.8"
2020
BandedMatrices = "1.0"
2121
Documenter = "1.0"
2222
FillArrays = "1.11"
23+
Images = "0.26"
2324
LinearAlgebra = "1.6"
2425
OffsetArrays = "1.0"
2526
Random = "1.6"
@@ -32,11 +33,22 @@ julia = "1.6"
3233
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
3334
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
3435
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
36+
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
3537
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
3638
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
3739
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
3840
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
3941
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
4042

4143
[targets]
42-
test = ["Aqua", "BandedMatrices", "Documenter", "OffsetArrays", "SparseArrays", "StaticArrays", "Test", "Random"]
44+
test = [
45+
"Aqua",
46+
"BandedMatrices",
47+
"Documenter",
48+
"Images",
49+
"OffsetArrays",
50+
"SparseArrays",
51+
"StaticArrays",
52+
"Test",
53+
"Random",
54+
]

src/blockarray.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ function Base.Array(zerodim::BlockArray{T, 0}) where {T}
549549
end
550550

551551
function Base.Array(block_array::BlockArray{T, N, R}) where {T,N,R}
552-
arr = Array{eltype(T)}(undef, size(block_array))
552+
arr = Array{T}(undef, size(block_array))
553553
for block_index in Iterators.product(blockaxes(block_array)...)
554554
indices = getindex.(axes(block_array), block_index)
555555
arr[indices...] = @view block_array[block_index...]

test/test_blockarrays.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
module TestBlockArrays
22

3-
using SparseArrays, BlockArrays, FillArrays, LinearAlgebra, Test, OffsetArrays
3+
using SparseArrays, BlockArrays, FillArrays, LinearAlgebra, Test, OffsetArrays, Images
44
import BlockArrays: _BlockArray
55

6+
const Fill = FillArrays.Fill
7+
68
function test_error_message(f, needle, expected = Exception)
79
err = nothing
810
try

0 commit comments

Comments
 (0)