Mercurial > hg > orthanc
changeset 2279:16e45af17a4d
Ability to retrieve raw frames encoded as unsigned 32-bits integers
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 19 May 2017 10:33:17 +0200 |
| parents | fd5869e3ed5e |
| children | 2e7a8ce24be2 |
| files | Core/DicomFormat/DicomImageInformation.cpp Core/DicomFormat/DicomIntegerPixelAccessor.cpp NEWS |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/DicomFormat/DicomImageInformation.cpp Wed May 17 22:05:34 2017 +0200 +++ b/Core/DicomFormat/DicomImageInformation.cpp Fri May 19 10:33:17 2017 +0200 @@ -200,13 +200,6 @@ throw OrthancException(ErrorCode_NotImplemented); } - if (bitsAllocated_ > 32 || - bitsStored_ >= 32) - { - // Not available, as the accessor internally uses int32_t values - throw OrthancException(ErrorCode_NotImplemented); - } - if (samplesPerPixel_ == 0) { throw OrthancException(ErrorCode_NotImplemented);
--- a/Core/DicomFormat/DicomIntegerPixelAccessor.cpp Wed May 17 22:05:34 2017 +0200 +++ b/Core/DicomFormat/DicomIntegerPixelAccessor.cpp Fri May 19 10:33:17 2017 +0200 @@ -54,6 +54,13 @@ pixelData_(pixelData), size_(size) { + if (information_.GetBitsAllocated() > 32 || + information_.GetBitsStored() >= 32) + { + // Not available, as the accessor internally uses int32_t values + throw OrthancException(ErrorCode_NotImplemented); + } + frame_ = 0; frameOffset_ = information_.GetFrameSize();