Mercurial > hg > orthanc
diff OrthancServer/SliceOrdering.cpp @ 1737:ec66a16aa398
removal of DicomStringValue and DicomNullValue
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 22 Oct 2015 07:52:24 +0200 |
parents | b80e76dd1d56 |
children | 697ae8d0e287 |
line wrap: on
line diff
--- a/OrthancServer/SliceOrdering.cpp Wed Oct 21 16:52:23 2015 +0200 +++ b/OrthancServer/SliceOrdering.cpp Thu Oct 22 07:52:24 2015 +0200 @@ -82,13 +82,14 @@ const DicomValue* value = map.TestAndGetValue(tag); if (value == NULL || - value->IsNull()) + value->IsNull() || + value->IsBinary()) { return false; } else { - return TokenizeVector(result, value->AsString(), expectedSize); + return TokenizeVector(result, value->GetContent(), expectedSize); } } @@ -117,11 +118,12 @@ const DicomValue* frames = instance.TestAndGetValue(DICOM_TAG_NUMBER_OF_FRAMES); if (frames != NULL && - !frames->IsNull()) + !frames->IsNull() && + !frames->IsBinary()) { try { - framesCount_ = boost::lexical_cast<unsigned int>(frames->AsString()); + framesCount_ = boost::lexical_cast<unsigned int>(frames->GetContent()); } catch (boost::bad_lexical_cast&) {