Skip to content

More efficient eager Array conversion for OffsetArray #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnnychen94 merged 1 commit into from
Oct 22, 2021
Merged

More efficient eager Array conversion for OffsetArray #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/showmime.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,19 @@ csnormalize(c::Colorant) = RGBA(c)

# Unless we have PNG IO backend that works on generic array types, we have to eagerly
# convert it to dense array types
# On performance: if the array type(e.g., OffsetArray) has efficient convert method to Array
# then this is almost a no-op
enforce_standard_dense_array(A::AbstractArray) = convert(Array, A)
# On performance: if the array type has efficient convert method to Array then this is
# almost a no-op
function enforce_standard_dense_array(A::AbstractArray)
if Base.has_offset_axes(A)
convert(Array, OffsetArrays.no_offset_view(A))
else
convert(Array, A)
end
end
enforce_standard_dense_array(A::DenseArray) = A
enforce_standard_dense_array(A::OffsetArray) = enforce_standard_dense_array(parent(A))
# TODO(johnnychen94): Uncomment this when we set direct dependency to PNGFiles.
# enforce_standard_dense_array(A::IndirectArray) = A # PNGFiles has built-in support for IndirectArray.

const ColorantMatrix{T<:Colorant} = AbstractMatrix{T}

Expand Down