# HG changeset patch # User Sebastien Jodogne # Date 1779128702 -7200 # Node ID b28524cf93a9f77f0c5c8cd9b7d7d28bcd1e054c # Parent e98c73866fcb5458eccb1270fc689b268496d0da added keepRawBuffer to DicomDataSource::ReadWhole() diff -r e98c73866fcb -r b28524cf93a9 OrthancFramework/Sources/DataSource/DicomDataSource.cpp --- a/OrthancFramework/Sources/DataSource/DicomDataSource.cpp Mon May 18 15:15:32 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DicomDataSource.cpp Mon May 18 20:25:02 2026 +0200 @@ -39,6 +39,8 @@ { public: virtual StorageAreaDataSource::Range* ReadRange(DataSourceReader& reader) const = 0; + + virtual bool IsKeepRawBuffer() const = 0; }; @@ -46,12 +48,15 @@ { private: FileInfo attachment_; + bool keepRawBuffer_; bool checkMD5_; public: explicit WholeIdentifier(const FileInfo& attachment, + bool keepRawBuffer, bool checkMD5) : attachment_(attachment), + keepRawBuffer_(keepRawBuffer), checkMD5_(checkMD5) { } @@ -59,13 +64,22 @@ virtual bool GetCacheKey(std::string& key) const ORTHANC_OVERRIDE { key = (attachment_.GetUuid() + "|" + - boost::lexical_cast(attachment_.GetContentType())); + boost::lexical_cast(attachment_.GetContentType()) + "|" + + boost::lexical_cast(keepRawBuffer_)); return true; } virtual bool EstimateValueSize(size_t& target) const ORTHANC_OVERRIDE { - target = attachment_.GetUncompressedSize(); + if (keepRawBuffer_) + { + target = 2 * attachment_.GetUncompressedSize(); + } + else + { + target = attachment_.GetUncompressedSize(); + } + return true; } @@ -73,6 +87,11 @@ { return StorageAreaDataSource::ReadAttachment(reader, attachment_, true /* uncompress */, checkMD5_); } + + virtual bool IsKeepRawBuffer() const ORTHANC_OVERRIDE + { + return keepRawBuffer_; + } }; @@ -110,20 +129,28 @@ { return StorageAreaDataSource::ReadBeginning(reader, attachment_, pixelDataOffset_); } + + virtual bool IsKeepRawBuffer() const ORTHANC_OVERRIDE + { + return false; + } }; class DicomDataSource::Value : public IDynamicObject { private: - std::unique_ptr dicom_; - size_t size_; + std::unique_ptr dicom_; + size_t size_; + bool hasRawBuffer_; + std::string rawBuffer_; public: Value(ParsedDicomFile* dicom, size_t size) : dicom_(dicom), - size_(size) + size_(size), + hasRawBuffer_(false) { if (dicom == NULL) { @@ -131,15 +158,51 @@ } } - ParsedDicomFile& GetDicom() const + ParsedDicomFile& GetContent() const { return *dicom_; } - size_t GetSize() const + size_t GetRawBufferSize() const { return size_; } + + void SetRawBuffer(const void* data, + size_t size) + { + if (hasRawBuffer_) + { + throw OrthancException(ErrorCode_BadSequenceOfCalls); + } + else if (size != size_) + { + throw OrthancException(ErrorCode_ParameterOutOfRange); + } + else + { + hasRawBuffer_ = true; + rawBuffer_.assign(reinterpret_cast(data), size); + } + } + + bool HasRawBuffer() const + { + return hasRawBuffer_; + } + + const void* GetRawBufferData() const + { + if (hasRawBuffer_) + { + assert(rawBuffer_.size() == size_); + return rawBuffer_.empty() ? NULL : rawBuffer_.c_str(); + } + else + { + throw OrthancException(ErrorCode_BadSequenceOfCalls); + } + } }; @@ -159,21 +222,58 @@ std::unique_ptr range(id.ReadRange(*storageAreaReader_)); + const size_t size = range->GetSize(); + + { // Sanity check - size_t size; - if (!obj.EstimateValueSize(size) || - size != range->GetSize()) - { - throw OrthancException(ErrorCode_InternalError); + bool ok = false; + size_t estimatedSize; + if (obj.EstimateValueSize(estimatedSize)) + { + if (id.IsKeepRawBuffer()) + { + ok = (estimatedSize == 2 * size); + } + else + { + ok = (estimatedSize == size); + } + } + + if (!ok) + { + throw OrthancException(ErrorCode_InternalError); + } } - return new Value(new ParsedDicomFile(range->GetData(), range->GetSize()), range->GetSize()); + std::unique_ptr value(new Value(new ParsedDicomFile(range->GetData(), size), size)); + + if (id.IsKeepRawBuffer()) + { + value->SetRawBuffer(range->GetData(), size); + assert(GetValueSize(*value) == 2 * size); + } + else + { + assert(GetValueSize(*value) == size); + } + + return value.release(); } + size_t DicomDataSource::GetValueSize(const IDynamicObject& obj) const { const Value& value = dynamic_cast(obj); - return value.GetSize(); + + if (value.HasRawBuffer()) + { + return 2 * value.GetRawBufferSize(); + } + else + { + return value.GetRawBufferSize(); + } } @@ -189,15 +289,34 @@ ParsedDicomFile& DicomDataSource::Dicom::Lock::GetContent() const { - return dynamic_cast(*that_.value_).GetDicom(); + return dynamic_cast(*that_.value_).GetContent(); + } + + + bool DicomDataSource::Dicom::Lock::HasRawBuffer() const + { + return dynamic_cast(*that_.value_).HasRawBuffer(); + } + + + const void* DicomDataSource::Dicom::Lock::GetRawBufferData() const + { + return dynamic_cast(*that_.value_).GetRawBufferData(); + } + + + size_t DicomDataSource::Dicom::Lock::GetRawBufferSize() const + { + return dynamic_cast(*that_.value_).GetRawBufferSize(); } DicomDataSource::Dicom* DicomDataSource::ReadWhole(DataSourceReader& reader, const FileInfo& attachment, + bool keepRawBuffer, bool checkMD5) { - std::unique_ptr id(new WholeIdentifier(attachment, checkMD5)); + std::unique_ptr id(new WholeIdentifier(attachment, keepRawBuffer, checkMD5)); boost::shared_ptr value = reader.ReadSingle(id.release()); return new Dicom(value); } diff -r e98c73866fcb -r b28524cf93a9 OrthancFramework/Sources/DataSource/DicomDataSource.h --- a/OrthancFramework/Sources/DataSource/DicomDataSource.h Mon May 18 15:15:32 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DicomDataSource.h Mon May 18 20:25:02 2026 +0200 @@ -91,11 +91,18 @@ } ParsedDicomFile& GetContent() const; + + bool HasRawBuffer() const; + + const void* GetRawBufferData() const; + + size_t GetRawBufferSize() const; }; }; static Dicom* ReadWhole(DataSourceReader& reader, const FileInfo& attachment, + bool keepRawBuffer, // Must be set to "true" for transcoding bool checkMD5); static Dicom* ReadUntilPixelData(DataSourceReader& reader,