Mercurial > hg > orthanc-wsi

comparison Applications/DicomToTiff.cpp @ 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 b0bd22077cd8
children 1e864138f0da
comparison
equal deleted inserted replaced
198:2d3fe6967894 199:a1c265cb2174
24 #include "../Framework/Inputs/DicomPyramid.h" 24 #include "../Framework/Inputs/DicomPyramid.h"
25 #include "../Framework/Inputs/TiledPyramidStatistics.h" 25 #include "../Framework/Inputs/TiledPyramidStatistics.h"
26 #include "../Framework/Outputs/HierarchicalTiffWriter.h" 26 #include "../Framework/Outputs/HierarchicalTiffWriter.h"
27 #include "../Resources/Orthanc/Stone/OrthancHttpConnection.h" 27 #include "../Resources/Orthanc/Stone/OrthancHttpConnection.h"
28 28
29 #include <Compatibility.h> // For std::unique_ptr
29 #include <Logging.h> 30 #include <Logging.h>
30 #include <OrthancException.h> 31 #include <OrthancException.h>
31 32
32 #include "ApplicationToolbox.h" 33 #include "ApplicationToolbox.h"
33 34
157 158
158 159
159 static Orthanc::ImageAccessor* CreateEmptyTile(const OrthancWSI::IPyramidWriter& writer, 160 static Orthanc::ImageAccessor* CreateEmptyTile(const OrthancWSI::IPyramidWriter& writer,
160 const boost::program_options::variables_map& options) 161 const boost::program_options::variables_map& options)
161 { 162 {
162 std::auto_ptr<Orthanc::ImageAccessor> tile 163 std::unique_ptr<Orthanc::ImageAccessor> tile
163 (OrthancWSI::ImageToolbox::Allocate(writer.GetPixelFormat(), 164 (OrthancWSI::ImageToolbox::Allocate(writer.GetPixelFormat(),
164 writer.GetTileWidth(), 165 writer.GetTileWidth(),
165 writer.GetTileHeight())); 166 writer.GetTileHeight()));
166 167
167 uint8_t red = 255; 168 uint8_t red = 255;
211 } 212 }
212 213
213 LOG(WARNING) << "Source photometric interpretation: " << EnumerationToString(source.GetPhotometricInterpretation()); 214 LOG(WARNING) << "Source photometric interpretation: " << EnumerationToString(source.GetPhotometricInterpretation());
214 LOG(WARNING) << "Target photometric interpretation: " << EnumerationToString(targetPhotometric); 215 LOG(WARNING) << "Target photometric interpretation: " << EnumerationToString(targetPhotometric);
215 216
216 std::auto_ptr<Orthanc::ImageAccessor> empty(CreateEmptyTile(target, options)); 217 std::unique_ptr<Orthanc::ImageAccessor> empty(CreateEmptyTile(target, options));
217 218
218 for (unsigned int level = 0; level < source.GetLevelCount(); level++) 219 for (unsigned int level = 0; level < source.GetLevelCount(); level++)
219 { 220 {
220 LOG(WARNING) << "Creating level " << level << " of size " 221 LOG(WARNING) << "Creating level " << level << " of size "
221 << source.GetLevelWidth(level) << "x" << source.GetLevelHeight(level); 222 << source.GetLevelWidth(level) << "x" << source.GetLevelHeight(level);
252 // Transcoding of JPEG tiles 253 // Transcoding of JPEG tiles
253 target.WriteRawTile(tile, compression, level, tileX, tileY); 254 target.WriteRawTile(tile, compression, level, tileX, tileY);
254 } 255 }
255 else if (reencode) 256 else if (reencode)
256 { 257 {
257 std::auto_ptr<Orthanc::ImageAccessor> decoded; 258 std::unique_ptr<Orthanc::ImageAccessor> decoded;
258 259
259 if (compression == OrthancWSI::ImageCompression_None) 260 if (compression == OrthancWSI::ImageCompression_None)
260 { 261 {
261 decoded.reset(OrthancWSI::ImageToolbox::DecodeRawTile(tile, source.GetPixelFormat(), 262 decoded.reset(OrthancWSI::ImageToolbox::DecodeRawTile(tile, source.GetPixelFormat(),
262 source.GetTileWidth(), source.GetTileHeight())); 263 source.GetTileWidth(), source.GetTileHeight()));