Mercurial > hg > orthanc

comparison Core/DicomParsing/ParsedDicomFile.cpp @ 2512:4dcafa8d6633

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 28 Mar 2018 15:20:50 +0200
parents 83b8b6743531
children 6db878376018
comparison
equal deleted inserted replaced
2511:8a0d3044ef53 2512:4dcafa8d6633
85 #include "ToDcmtkBridge.h" 85 #include "ToDcmtkBridge.h"
86 #include "Internals/DicomFrameIndex.h" 86 #include "Internals/DicomFrameIndex.h"
87 #include "../Logging.h" 87 #include "../Logging.h"
88 #include "../OrthancException.h" 88 #include "../OrthancException.h"
89 #include "../Toolbox.h" 89 #include "../Toolbox.h"
90 #include "../SystemToolbox.h" 90
91 #if ORTHANC_SANDBOXED == 0
92 # include "../SystemToolbox.h"
93 #endif
91 94
92 #if ORTHANC_ENABLE_JPEG == 1 95 #if ORTHANC_ENABLE_JPEG == 1
93 # include "../Images/JpegReader.h" 96 # include "../Images/JpegReader.h"
94 #endif 97 #endif
95 98
883 { 886 {
884 FromDcmtkBridge::SaveToMemoryBuffer(buffer, *pimpl_->file_->getDataset()); 887 FromDcmtkBridge::SaveToMemoryBuffer(buffer, *pimpl_->file_->getDataset());
885 } 888 }
886 889
887 890
891 #if ORTHANC_SANDBOXED == 0
888 void ParsedDicomFile::SaveToFile(const std::string& path) 892 void ParsedDicomFile::SaveToFile(const std::string& path)
889 { 893 {
890 // TODO Avoid using a temporary memory buffer, write directly on disk 894 // TODO Avoid using a temporary memory buffer, write directly on disk
891 std::string content; 895 std::string content;
892 SaveToMemoryBuffer(content); 896 SaveToMemoryBuffer(content);
893 SystemToolbox::WriteFile(content, path); 897 SystemToolbox::WriteFile(content, path);
894 } 898 }
899 #endif
895 900
896 901
897 ParsedDicomFile::ParsedDicomFile(bool createIdentifiers) : pimpl_(new PImpl) 902 ParsedDicomFile::ParsedDicomFile(bool createIdentifiers) : pimpl_(new PImpl)
898 { 903 {
899 pimpl_->file_.reset(new DcmFileFormat); 904 pimpl_->file_.reset(new DcmFileFormat);