# HG changeset patch # User Sebastien Jodogne # Date 1582467949 -3600 # Node ID 86400fa16091899181c3f8e81080a23d98bb95e9 # Parent f050391249f02a46935fc371b5b468c47cde45b7 fix build diff -r f050391249f0 -r 86400fa16091 Framework/Loaders/OrthancMultiframeVolumeLoader.cpp --- a/Framework/Loaders/OrthancMultiframeVolumeLoader.cpp Fri Feb 21 15:27:42 2020 +0100 +++ b/Framework/Loaders/OrthancMultiframeVolumeLoader.cpp Sun Feb 23 15:25:49 2020 +0100 @@ -345,7 +345,6 @@ { ImageBuffer3D& target = volume_->GetPixelData(); - const uint64_t bpp = target.GetBytesPerPixel(); const uint64_t width = target.GetWidth(); const uint64_t height = target.GetHeight(); const uint64_t depth = target.GetDepth(); diff -r f050391249f0 -r 86400fa16091 Framework/Toolbox/ImageToolbox.cpp --- a/Framework/Toolbox/ImageToolbox.cpp Fri Feb 21 15:27:42 2020 +0100 +++ b/Framework/Toolbox/ImageToolbox.cpp Sun Feb 23 15:25:49 2020 +0100 @@ -99,12 +99,6 @@ ORTHANC_ASSERT(Format == img.GetFormat(), "Internal error. Wrong template histogram type"); - const uint8_t* buffer = reinterpret_cast( - img.GetConstBuffer()); - - const size_t pitch = img.GetPitch(); - const size_t bytesPerPix = img.GetBytesPerPixel(); - const size_t height = img.GetHeight(); const size_t width = img.GetHeight(); @@ -153,12 +147,6 @@ ORTHANC_ASSERT(Format == img.GetFormat(), "Internal error. Wrong template histogram type"); - const uint8_t* buffer = reinterpret_cast( - img.GetConstBuffer()); - - const size_t pitch = img.GetPitch(); - const size_t bytesPerPix = img.GetBytesPerPixel(); - const size_t height = img.GetHeight(); const size_t width = img.GetHeight(); diff -r f050391249f0 -r 86400fa16091 UnitTestsSources/ImageToolboxTests.cpp --- a/UnitTestsSources/ImageToolboxTests.cpp Fri Feb 21 15:27:42 2020 +0100 +++ b/UnitTestsSources/ImageToolboxTests.cpp Sun Feb 23 15:25:49 2020 +0100 @@ -136,7 +136,7 @@ std::auto_ptr image(new Orthanc::Image( Format, W, H, false)); - typedef Orthanc::PixelTraits::PixelType PixelType; + typedef typename Orthanc::PixelTraits::PixelType PixelType; PixelType pixValue = 0; @@ -206,7 +206,7 @@ std::auto_ptr image(new Orthanc::Image( Format, W, H, false)); - typedef Orthanc::PixelTraits::PixelType PixelType; + typedef typename Orthanc::PixelTraits::PixelType PixelType; PixelType pixValue = 0;