Mercurial > hg > orthanc-stone

comparison Framework/Toolbox/DicomInstanceParameters.cpp @ 1298:8a0a62189f46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 16:31:30 +0100
parents ea6c2254536d
children 257f2c9a02ac
comparison
equal deleted inserted replaced
1296:86400fa16091 1298:8a0a62189f46
367 } 367 }
368 368
369 369
370 Orthanc::ImageAccessor* DicomInstanceParameters::ConvertToFloat(const Orthanc::ImageAccessor& pixelData) const 370 Orthanc::ImageAccessor* DicomInstanceParameters::ConvertToFloat(const Orthanc::ImageAccessor& pixelData) const
371 { 371 {
372 std::auto_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_Float32, 372 std::unique_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_Float32,
373 pixelData.GetWidth(), 373 pixelData.GetWidth(),
374 pixelData.GetHeight(), 374 pixelData.GetHeight(),
375 false)); 375 false));
376 Orthanc::ImageProcessing::Convert(*converted, pixelData); 376 Orthanc::ImageProcessing::Convert(*converted, pixelData);
377 377
402 return new ColorTextureSceneLayer(pixelData); 402 return new ColorTextureSceneLayer(pixelData);
403 } 403 }
404 else 404 else
405 { 405 {
406 // This is the case of a grayscale frame. Convert it to Float32. 406 // This is the case of a grayscale frame. Convert it to Float32.
407 std::auto_ptr<FloatTextureSceneLayer> texture; 407 std::unique_ptr<FloatTextureSceneLayer> texture;
408 408
409 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32) 409 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32)
410 { 410 {
411 texture.reset(new FloatTextureSceneLayer(pixelData)); 411 texture.reset(new FloatTextureSceneLayer(pixelData));
412 } 412 }
413 else 413 else
414 { 414 {
415 std::auto_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData)); 415 std::unique_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
416 texture.reset(new FloatTextureSceneLayer(*converted)); 416 texture.reset(new FloatTextureSceneLayer(*converted));
417 } 417 }
418 418
419 if (data_.hasDefaultWindowing_) 419 if (data_.hasDefaultWindowing_)
420 { 420 {
440 440
441 441
442 LookupTableTextureSceneLayer* DicomInstanceParameters::CreateLookupTableTexture 442 LookupTableTextureSceneLayer* DicomInstanceParameters::CreateLookupTableTexture
443 (const Orthanc::ImageAccessor& pixelData) const 443 (const Orthanc::ImageAccessor& pixelData) const
444 { 444 {
445 std::auto_ptr<FloatTextureSceneLayer> texture; 445 std::unique_ptr<FloatTextureSceneLayer> texture;
446 446
447 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32) 447 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32)
448 { 448 {
449 return new LookupTableTextureSceneLayer(pixelData); 449 return new LookupTableTextureSceneLayer(pixelData);
450 } 450 }
451 else 451 else
452 { 452 {
453 std::auto_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData)); 453 std::unique_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
454 return new LookupTableTextureSceneLayer(*converted); 454 return new LookupTableTextureSceneLayer(*converted);
455 } 455 }
456 } 456 }
457 457
458 458