Skip to content

Use error variable for non-item element in sequence #364

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

Draft
google-labs-jules wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use error variable for non-item element in sequence #364

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
5 changes: 2 additions & 3 deletions read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ var (
ErrorExpectedEvenLength = errors.New("field length is not even, in violation of DICOM spec")
ErrorExpectedDefinedLength = errors.New("unable to read field of undefined length")
ErrorExpectedSequenceDelimitation = errors.New("expected to find sequence delimitation item (fffe,e0dd)")
ErrorExpectedSequenceItem = errors.New("expected to find item element in sequence")
)

// reader is responsible for mid-level dicom parsing capabilities, like
Expand Down Expand Up @@ -600,9 +601,7 @@ func (r *reader) readSequence(t tag.Tag, vr string, vl uint32, d *Dataset) (Valu
}
if subElement.Tag != tag.Item || subElement.Value.ValueType() != SequenceItem {
// This is an error, should be an Item!
// TODO: use error var
log.Println("Tag is ", subElement.Tag)
return nil, fmt.Errorf("readSequence: error, non item element found in sequence. got: %v", subElement)
return nil, fmt.Errorf("readSequence: error, %w. got: %v", ErrorExpectedSequenceItem, subElement)
}

// Append the Item element's dataset of elements to this Sequence's sequencesValue.
Expand Down