comparison OrthancServer/ParsedDicomFile.cpp @ 1788:6a2d507ef064 worklists

getting rid of opaque data structures
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 18 Nov 2015 16:11:28 +0100
parents 1b1d5470233f
children 30e97a1f4093
comparison
equal deleted inserted replaced
1787:1b1d5470233f 1788:6a2d507ef064
861 // Create a new instance-level identifier 861 // Create a new instance-level identifier
862 Replace(DICOM_TAG_SOP_INSTANCE_UID, FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType_Instance)); 862 Replace(DICOM_TAG_SOP_INSTANCE_UID, FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType_Instance));
863 } 863 }
864 864
865 865
866 ParsedDicomFile::ParsedDicomFile(DcmDataset& dicom) : pimpl_(new PImpl)
867 {
868 pimpl_->file_.reset(new DcmFileFormat(&dicom));
869 }
870
871
872 ParsedDicomFile::ParsedDicomFile(DcmFileFormat& dicom) : pimpl_(new PImpl)
873 {
874 pimpl_->file_.reset(new DcmFileFormat(dicom));
875 }
876
877
866 ParsedDicomFile::~ParsedDicomFile() 878 ParsedDicomFile::~ParsedDicomFile()
867 { 879 {
868 delete pimpl_; 880 delete pimpl_;
869 } 881 }
870 882
871 883
872 void* ParsedDicomFile::GetDcmtkObject() 884 DcmFileFormat& ParsedDicomFile::GetDcmtkObject()
873 { 885 {
874 return pimpl_->file_.get(); 886 return *pimpl_->file_.get();
875 } 887 }
876 888
877 889
878 ParsedDicomFile* ParsedDicomFile::Clone() 890 ParsedDicomFile* ParsedDicomFile::Clone()
879 { 891 {