orthanc: Core/DicomParsing/FromDcmtkBridge.cpp comparison

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 3748:ca36e3f1112c transcoding

transcoding to uncompressed transfer syntaxes

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 13 Mar 2020 16:50:13 +0100
parents	33c19a6643e1
children	4a25727401cd

comparison

equal deleted inserted replaced

-:7b6058f8f7aa
+:ca36e3f1112c
 #    include <dcmtk/dcmjpls/djencode.h>
 #  endif
 #endif
+#include <dcmtk/dcmdata/dcrledrg.h>
+#if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
+#  include <dcmtk/dcmdata/dcrleerg.h>
+#endif
 namespace Orthanc
 {
 static bool IsBinaryTag(const DcmTag& key)
 {
 return (key.isUnknownVR() ||
 default:
 throw OrthancException(ErrorCode_ParameterOutOfRange);
 }
 }
+static bool SaveToMemoryBufferInternal(std::string& buffer,
+DcmFileFormat& dicom,
+E_TransferSyntax xfer)
+{
+E_EncodingType encodingType = /*opt_sequenceType*/ EET_ExplicitLength;
+// Create a memory buffer with the proper size
+{
+const uint32_t estimatedSize = dicom.calcElementLength(xfer, encodingType);  // (*)
+buffer.resize(estimatedSize);
+}
+DcmOutputBufferStream ob(&buffer[0], buffer.size());
+// Fill the memory buffer with the meta-header and the dataset
+dicom.transferInit();
+OFCondition c = dicom.write(ob, xfer, encodingType, NULL,
+/*opt_groupLength*/ EGL_recalcGL,
+/*opt_paddingType*/ EPD_withoutPadding);
+dicom.transferEnd();
+if (c.good())
+{
+// The DICOM file is successfully written, truncate the target
+// buffer if its size was overestimated by (*)
+ob.flush();
+size_t effectiveSize = static_cast<size_t>(ob.tell());
+if (effectiveSize < buffer.size())
+{
+buffer.resize(effectiveSize);
+}
+return true;
+}
+else
+{
+// Error
+buffer.clear();
+return false;
+}
+}
 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer,
 DcmDataset& dataSet)
 {
 // Determine the transfer syntax which shall be used to write the
 // information to the file. We always switch to the Little Endian
 // No information about the original transfer syntax: This is
 // most probably a DICOM dataset that was read from memory.
 xfer = EXS_LittleEndianExplicit;
 }
-E_EncodingType encodingType = /*opt_sequenceType*/ EET_ExplicitLength;
 // Create the meta-header information
 DcmFileFormat ff(&dataSet);
 ff.validateMetaInfo(xfer);
 ff.removeInvalidGroups();
-// Create a memory buffer with the proper size
+return SaveToMemoryBufferInternal(buffer, ff, xfer);
-{
+}
-const uint32_t estimatedSize = ff.calcElementLength(xfer, encodingType);  // (*)
-buffer.resize(estimatedSize);
-}
+bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer,
+DcmFileFormat& dicom)
-DcmOutputBufferStream ob(&buffer[0], buffer.size());
+{
+E_TransferSyntax xfer = dicom.getDataset()->getOriginalXfer();
-// Fill the memory buffer with the meta-header and the dataset
+if (xfer == EXS_Unknown)
-ff.transferInit();
+{
-OFCondition c = ff.write(ob, xfer, encodingType, NULL,
+throw OrthancException(ErrorCode_InternalError,
-/*opt_groupLength*/ EGL_recalcGL,
+"Cannot write a DICOM instance with unknown transfer syntax");
-/*opt_paddingType*/ EPD_withoutPadding);
+}
-ff.transferEnd();
+else if (!dicom.validateMetaInfo(xfer).good())
+{
-if (c.good())
+throw OrthancException(ErrorCode_InternalError,
-{
+"Cannot setup the transfer syntax to write a DICOM instance");
-// The DICOM file is successfully written, truncate the target
-// buffer if its size was overestimated by (*)
-ob.flush();
-size_t effectiveSize = static_cast<size_t>(ob.tell());
-if (effectiveSize < buffer.size())
-{
-buffer.resize(effectiveSize);
-}
-return true;
 }
 else
 {
-// Error
+return SaveToMemoryBufferInternal(buffer, dicom, xfer);
-buffer.clear();
+}
-return false;
+}
+bool FromDcmtkBridge::Transcode(std::string& buffer,
+DcmFileFormat& dicom,
+DicomTransferSyntax syntax,
+const DcmRepresentationParameter* representation)
+{
+E_TransferSyntax xfer;
+if (!LookupDcmtkTransferSyntax(xfer, syntax))
+{
+throw OrthancException(ErrorCode_InternalError);
+}
+else
+{
+return (dicom.getDataset()->chooseRepresentation(xfer, representation).good() &&
+dicom.getDataset()->canWriteXfer(xfer) &&
+SaveToMemoryBufferInternal(buffer, dicom, xfer));
 }
 }
 ValueRepresentation FromDcmtkBridge::LookupValueRepresentation(const DicomTag& tag)
 DJDecoderRegistration::registerCodecs();
 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
 DJEncoderRegistration::registerCodecs();
 # endif
 #endif
+LOG(INFO) << "Registering RLE codecs in DCMTK";
+DcmRLEDecoderRegistration::registerCodecs();
+#if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
+DcmRLEEncoderRegistration::registerCodecs();
+#endif
 }
 void FromDcmtkBridge::FinalizeCodecs()
 {
 // Unregister JPEG codecs
 DJDecoderRegistration::cleanup();
 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
 DJEncoderRegistration::cleanup();
 # endif
+#endif
+DcmRLEDecoderRegistration::cleanup();
+#if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
+DcmRLEEncoderRegistration::cleanup();
 #endif
 }

Mercurial > hg > orthanc

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 3748:ca36e3f1112c transcoding