Mercurial > hg > orthanc-stone
changeset 1296:86400fa16091
fix build
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sun, 23 Feb 2020 15:25:49 +0100 |
| parents | f050391249f0 |
| children | 6ab03e429f06 8a0a62189f46 |
| files | Framework/Loaders/OrthancMultiframeVolumeLoader.cpp Framework/Toolbox/ImageToolbox.cpp UnitTestsSources/ImageToolboxTests.cpp |
| diffstat | 3 files changed, 2 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- 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();
--- 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<const uint8_t*>( - 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<const uint8_t*>( - 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();
--- 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<Orthanc::Image> image(new Orthanc::Image( Format, W, H, false)); - typedef Orthanc::PixelTraits<Format>::PixelType PixelType; + typedef typename Orthanc::PixelTraits<Format>::PixelType PixelType; PixelType pixValue = 0; @@ -206,7 +206,7 @@ std::auto_ptr<Orthanc::Image> image(new Orthanc::Image( Format, W, H, false)); - typedef Orthanc::PixelTraits<Format>::PixelType PixelType; + typedef typename Orthanc::PixelTraits<Format>::PixelType PixelType; PixelType pixValue = 0;