From aa8bf49761b0ae6f916ed14601044368919cc16a Mon Sep 17 00:00:00 2001
From: Zaki A <zaki@live.ca>
Date: Wed, 17 Jul 2019 19:40:16 -0400
Subject: [PATCH] Specify length when reading 'AS' element

---
 src/DICOM.jl | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/DICOM.jl b/src/DICOM.jl
index 315c7b2..f500bec 100644
--- a/src/DICOM.jl
+++ b/src/DICOM.jl
@@ -55,7 +55,7 @@ _dcmdict_data_ = 0
 # These "empty" values are used internally. They are returned if a search fails.
 const emptyVR = "" # Can be any VR that doesn't exist
 const emptyVR_lookup = ["", emptyVR, ""] # Used in lookup_vr as failure state
-const emptyTag = (0x0000,0x0000) 
+const emptyTag = (0x0000,0x0000)
 const emptyDcmDict = Dict(DICOM.emptyTag => nothing)
 
 const VR_names = [ "AE","AS","AT","CS","DA","DS","DT","FL","FD","IS","LO","LT","OB","OF",
@@ -66,10 +66,10 @@ const meta_uids = Dict([("1.2.840.10008.1.2", (false, false)),
                   ("1.2.840.10008.1.2.1", (false, true)),
                   ("1.2.840.10008.1.2.1.99", (false, true)),
                   ("1.2.840.10008.1.2.2", (true, true))]);
-       
+
 """
     lookup_vr(tag::Tuple{Integer,Integer})
-    
+
 Return VR value for tag from DICOM dictionary
 
 # Example
@@ -214,9 +214,9 @@ function pixeldata_parse(st::IOStream, sz, vr::String, dcm=emptyDcmDict)
     f = get(dcm, (0x0028,0x0100), nothing)
     if f !== nothing
         bitType = Int(f)
-    else 
+    else
         f = get(dcm, (0x0028,0x0101), nothing)
-        bitType = f !== nothing ? Int(f) : 
+        bitType = f !== nothing ? Int(f) :
             vr == "OB" ? 8 : 16
     end
     if bitType == 8
@@ -248,7 +248,7 @@ function pixeldata_parse(st::IOStream, sz, vr::String, dcm=emptyDcmDict)
         zr *= Int(f)
     end
     if sz != 0xffffffff
-        data = 
+        data =
         zr > 1 ? Array{dtype}(undef, xr, yr, zr) : Array{dtype}(undef, xr, yr)
         read!(st, data)
     else
@@ -334,7 +334,7 @@ function element(st::IOStream, evr::Bool, dcm=emptyDcmDict, dVR=Dict{Tuple{UInt1
     elt = read(st, UInt16)
     gelt = (grp,elt)
     if grp <= 0x0002
-        evr = true 
+        evr = true
     end
     if evr && !always_implicit(grp,elt)
         vr = String(read!(st, Array{UInt8}(undef, 2)))
@@ -375,7 +375,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[] :
 
@@ -398,8 +398,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)) :
 
@@ -426,24 +424,24 @@ function element(st::IOStream, evr::Bool, dcm=emptyDcmDict, dVR=Dict{Tuple{UInt1
         if length(data) == 1
             data = data[1]
         end
-    end 
-    
+    end
+
     # Return vr by default
-    return(gelt, data, vr)   
+    return(gelt, data, vr)
 end
 
 # todo: support maxlen
 string_write(vals::Array{SubString{String}}, maxlen) = string_write(convert(Array{String}, vals), maxlen)
 string_write(vals::SubString{String}, maxlen) = string_write(convert(String, vals), maxlen)
 string_write(vals::Char, maxlen) = string_write(string(vals), maxlen)
-string_write(vals::String, maxlen) = string_write([vals], maxlen) 
+string_write(vals::String, maxlen) = string_write([vals], maxlen)
 string_write(vals::Array{String,1}, maxlen) = join(vals, '\\')
 
 element_write(st::IOStream, evr::Bool, gelt::Tuple{UInt16,UInt16}, data::Any) = element_write(st,evr,gelt,data,lookup_vr(gelt))
 function element_write(st::IOStream, evr::Bool, gelt::Tuple{UInt16,UInt16}, data::Any, vr::String)
     if vr === emptyVR
         # Element tags ending in 0x0000 are not included in dcm_dicm.jl, their vr is UL
-        if gelt[2] == 0x0000 
+        if gelt[2] == 0x0000
             vr = "UL"
         elseif isodd(gelt[1]) && gelt[1] > 0x0008 && 0x0010 <= gelt[2] <+ 0x00FF
                 # Private creator
@@ -494,8 +492,8 @@ end
 
 """
     dcm_parse(fn::AbstractString)
-    
-Reads file fn and returns a Dict 
+
+Reads file fn and returns a Dict
 """
 function dcm_parse(fn::AbstractString, giveVR=false; header=true, maxGrp=0xffff, dVR=Dict{Tuple{UInt16,UInt16},String}())
     st = open(fn)