Skip to content

Commit

Permalink
Merge pull request #1 from JuliaIO/master
Browse files Browse the repository at this point in the history
pull from upstream
  • Loading branch information
vsaase authored Sep 23, 2019
2 parents b49ae78 + ba85142 commit 6cbed83
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/DICOM.jl
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ function element(st::IOStream, evr::Bool, dcm=emptyDcmDict, dVR=Dict{Tuple{UInt1
end

data =
vr=="ST" || vr=="LT" || vr=="UT" ? String(read!(st, Array{UInt8}(undef, sz))) :
vr=="ST" || vr=="LT" || vr=="UT" || vr=="AS" ? String(read!(st, Array{UInt8}(undef, sz))) :

sz==0 || vr=="XX" ? Any[] :

Expand All @@ -380,8 +380,6 @@ function element(st::IOStream, evr::Bool, dcm=emptyDcmDict, dVR=Dict{Tuple{UInt1

vr == "AT" ? [ read!(st, Array{UInt16}(undef, 2)) for n=1:div(sz,4) ] :

vr == "AS" ? String(read!(st, Array{UInt8}(undef, 4))) :

vr == "DS" ? map(x->parse(Float64,x), string_parse(st, sz, 16, false)) :
vr == "IS" ? map(x->parse(Int,x), string_parse(st, sz, 12, false)) :

Expand Down

0 comments on commit 6cbed83

Please sign in to comment.