Mercurial > hg > orthanc-wsi

comparison Framework/Outputs/MultiframeDicomWriter.h @ 199:a1c265cb2174

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing deprecated std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 06 Jul 2020 16:29:41 +0200
parents f299c191cd76
children 1e864138f0da
comparison
equal deleted inserted replaced
198:2d3fe6967894 199:a1c265cb2174
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "../Enumerations.h" 24 #include "../Enumerations.h"
25
26 #include <Compatibility.h> // For std::unique_ptr
25 #include <ChunkedBuffer.h> 27 #include <ChunkedBuffer.h>
26 28
27 #include <boost/noncopyable.hpp> 29 #include <boost/noncopyable.hpp>
28 #include <memory> 30 #include <memory>
29 #include <stdint.h> 31 #include <stdint.h>
45 size_t uncompressedFrameSize_; 47 size_t uncompressedFrameSize_;
46 unsigned int width_; 48 unsigned int width_;
47 unsigned int height_; 49 unsigned int height_;
48 50
49 Orthanc::ChunkedBuffer uncompressedPixelData_; 51 Orthanc::ChunkedBuffer uncompressedPixelData_;
50 std::auto_ptr<DcmSequenceOfItems> perFrameFunctionalGroups_; 52 std::unique_ptr<DcmSequenceOfItems> perFrameFunctionalGroups_;
51 std::auto_ptr<DcmPixelSequence> compressedPixelSequence_; 53 std::unique_ptr<DcmPixelSequence> compressedPixelSequence_;
52 DcmPixelItem* offsetTable_; 54 DcmPixelItem* offsetTable_;
53 std::auto_ptr<DcmOffsetList> offsetList_; 55 std::unique_ptr<DcmOffsetList> offsetList_;
54 56
55 void ResetImage(); 57 void ResetImage();
56 58
57 void InjectUncompressedPixelData(DcmFileFormat& dicom); 59 void InjectUncompressedPixelData(DcmFileFormat& dicom);
58 60