Mercurial > hg > orthanc
diff Plugins/Engine/OrthancPlugins.cpp @ 3712:2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 15:32:45 +0100 |
parents | 1f4910999fe7 |
children | 56f2397f027a |
line wrap: on
line diff
--- a/Plugins/Engine/OrthancPlugins.cpp Fri Feb 28 13:23:11 2020 +0100 +++ b/Plugins/Engine/OrthancPlugins.cpp Mon Mar 02 15:32:45 2020 +0100 @@ -367,7 +367,7 @@ public: DicomWebBinaryFormatter(const _OrthancPluginEncodeDicomWeb& parameters) : - callback_(parameters.callback) + callback_(parameters.callback) { } @@ -435,7 +435,7 @@ }; HttpOutput& output_; - std::auto_ptr<std::string> errorDetails_; + std::unique_ptr<std::string> errorDetails_; bool logDetails_; MultipartState multipartState_; std::string multipartSubType_; @@ -665,8 +665,8 @@ public: ChunkedRestCallback(_OrthancPluginChunkedRestCallback parameters) : - parameters_(parameters), - regex_(parameters.pathRegularExpression) + parameters_(parameters), + regex_(parameters.pathRegularExpression) { } @@ -690,8 +690,8 @@ public: ServerContextLock(PImpl& that) : - lock_(that.contextMutex_), - context_(that.context_) + lock_(that.contextMutex_), + context_(that.context_) { if (context_ == NULL) { @@ -740,7 +740,7 @@ IncomingHttpRequestFilters incomingHttpRequestFilters_; IncomingHttpRequestFilters2 incomingHttpRequestFilters2_; RefreshMetricsCallbacks refreshMetricsCallbacks_; - std::auto_ptr<StorageAreaFactory> storageArea_; + std::unique_ptr<StorageAreaFactory> storageArea_; boost::recursive_mutex restCallbackMutex_; boost::recursive_mutex storedCallbackMutex_; @@ -755,7 +755,7 @@ Properties properties_; int argc_; char** argv_; - std::auto_ptr<OrthancPluginDatabase> database_; + std::unique_ptr<OrthancPluginDatabase> database_; PluginsErrorDictionary dictionary_; PImpl() : @@ -775,8 +775,8 @@ { private: OrthancPlugins& that_; - std::auto_ptr<HierarchicalMatcher> matcher_; - std::auto_ptr<ParsedDicomFile> filtered_; + std::unique_ptr<HierarchicalMatcher> matcher_; + std::unique_ptr<ParsedDicomFile> filtered_; ParsedDicomFile* currentQuery_; void Reset() @@ -889,7 +889,7 @@ } ParsedDicomFile f(dicom, size); - std::auto_ptr<ParsedDicomFile> summary(matcher_->Extract(f)); + std::unique_ptr<ParsedDicomFile> summary(matcher_->Extract(f)); reinterpret_cast<DicomFindAnswers*>(answers)->Add(*summary); } }; @@ -899,7 +899,7 @@ { private: OrthancPlugins& that_; - std::auto_ptr<DicomArray> currentQuery_; + std::unique_ptr<DicomArray> currentQuery_; void Reset() { @@ -1351,7 +1351,7 @@ public: RestCallbackMatcher(const UriComponents& uri) : - flatUri_(Toolbox::FlattenUri(uri)) + flatUri_(Toolbox::FlattenUri(uri)) { } @@ -2356,7 +2356,7 @@ std::string result; { - std::auto_ptr<DeflateBaseCompressor> compressor; + std::unique_ptr<DeflateBaseCompressor> compressor; switch (p.compression) { @@ -2406,14 +2406,14 @@ } - static OrthancPluginImage* ReturnImage(std::auto_ptr<ImageAccessor>& image) + static OrthancPluginImage* ReturnImage(std::unique_ptr<ImageAccessor>& image) { // Images returned to plugins are assumed to be writeable. If the // input image is read-only, we return a copy so that it can be modified. if (image->IsReadOnly()) { - std::auto_ptr<Image> copy(new Image(image->GetFormat(), image->GetWidth(), image->GetHeight(), false)); + std::unique_ptr<Image> copy(new Image(image->GetFormat(), image->GetWidth(), image->GetHeight(), false)); ImageProcessing::Copy(*copy, *image); image.reset(NULL); return reinterpret_cast<OrthancPluginImage*>(copy.release()); @@ -2429,7 +2429,7 @@ { const _OrthancPluginUncompressImage& p = *reinterpret_cast<const _OrthancPluginUncompressImage*>(parameters); - std::auto_ptr<ImageAccessor> image; + std::unique_ptr<ImageAccessor> image; switch (p.format) { @@ -2813,7 +2813,7 @@ const _OrthancPluginConvertPixelFormat& p = *reinterpret_cast<const _OrthancPluginConvertPixelFormat*>(parameters); const ImageAccessor& source = *reinterpret_cast<const ImageAccessor*>(p.source); - std::auto_ptr<ImageAccessor> target(new Image(Plugins::Convert(p.targetFormat), source.GetWidth(), source.GetHeight(), false)); + std::unique_ptr<ImageAccessor> target(new Image(Plugins::Convert(p.targetFormat), source.GetWidth(), source.GetHeight(), false)); ImageProcessing::Convert(*target, source); *(p.target) = ReturnImage(target); @@ -2866,7 +2866,7 @@ const _OrthancPluginDicomToJson& p = *reinterpret_cast<const _OrthancPluginDicomToJson*>(parameters); - std::auto_ptr<ParsedDicomFile> dicom; + std::unique_ptr<ParsedDicomFile> dicom; if (service == _OrthancPluginService_DicomBufferToJson) { @@ -2931,7 +2931,7 @@ privateCreator = lock.GetConfiguration().GetDefaultPrivateCreator(); } - std::auto_ptr<ParsedDicomFile> file + std::unique_ptr<ParsedDicomFile> file (ParsedDicomFile::CreateFromJson(json, static_cast<DicomFromJsonFlags>(p.flags), privateCreator)); @@ -2995,7 +2995,7 @@ const _OrthancPluginCreateImage& p = *reinterpret_cast<const _OrthancPluginCreateImage*>(parameters); - std::auto_ptr<ImageAccessor> result; + std::unique_ptr<ImageAccessor> result; switch (service) { @@ -4481,7 +4481,7 @@ }; - bool OrthancPlugins::CreateChunkedRequestReader(std::auto_ptr<IChunkedRequestReader>& target, + bool OrthancPlugins::CreateChunkedRequestReader(std::unique_ptr<IChunkedRequestReader>& target, RequestOrigin origin, const char* remoteIp, const char* username,