Mercurial > hg > orthanc
diff OrthancServer/ParsedDicomFile.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 | b953c6eef28d |
children | 5ad4e4d92ecb |
line wrap: on
line diff
--- a/OrthancServer/ParsedDicomFile.cpp Wed Oct 21 16:52:23 2015 +0200 +++ b/OrthancServer/ParsedDicomFile.cpp Thu Oct 22 07:52:24 2015 +0200 @@ -90,8 +90,6 @@ #include "../Core/Images/ImageBuffer.h" #include "../Core/Images/PngWriter.h" #include "../Core/Uuid.h" -#include "../Core/DicomFormat/DicomString.h" -#include "../Core/DicomFormat/DicomNullValue.h" #include "../Core/DicomFormat/DicomIntegerPixelAccessor.h" #include "../Core/Images/PngReader.h" @@ -766,13 +764,15 @@ std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement (*element, DicomToJsonFlags_Default, GetEncoding())); - if (v.get() == NULL) + if (v.get() == NULL || + v->IsNull()) { value = ""; } else { - value = v->AsString(); + // TODO v->IsBinary() + value = v->GetContent(); } return true;