Mercurial > hg > orthanc-stone
changeset 171:01e32beee56c wasm
upgrade to cairo 1.14.12
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 06 Mar 2018 15:43:57 +0100 |
| parents | 0261909fa6f0 |
| children | 316324f42848 |
| files | Framework/Toolbox/GeometryToolbox.h Framework/Volumes/VolumeReslicer.cpp Resources/CMake/CairoConfiguration.cmake |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/Toolbox/GeometryToolbox.h Fri Mar 02 14:24:47 2018 +0100 +++ b/Framework/Toolbox/GeometryToolbox.h Tue Mar 06 15:43:57 2018 +0100 @@ -131,7 +131,7 @@ float f10, float f11) { - // This function works on fractional parts + // This function only works on fractional parts assert(x >= 0 && y >= 0 && x < 1 && y < 1); // https://en.wikipedia.org/wiki/Bilinear_interpolation#Unit_square
--- a/Framework/Volumes/VolumeReslicer.cpp Fri Mar 02 14:24:47 2018 +0100 +++ b/Framework/Volumes/VolumeReslicer.cpp Tue Mar 06 15:43:57 2018 +0100 @@ -409,7 +409,7 @@ if (GetNearestCoordinates(sourceX, sourceY, sourceZ, worldX, worldY, worldZ)) { float f00, f10, f01, f11; - SampleVoxels(f00, f10, f01, f11, sourceX, sourceY, sourceZ); + SampleVoxels(f00, f10, f01, f11, sourceX, sourceY, sourceZ); return GeometryToolbox::ComputeBilinearInterpolation(worldX, worldY, f00, f01, f10, f11); } else
--- a/Resources/CMake/CairoConfiguration.cmake Fri Mar 02 14:24:47 2018 +0100 +++ b/Resources/CMake/CairoConfiguration.cmake Tue Mar 06 15:43:57 2018 +0100 @@ -21,9 +21,9 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_CAIRO) - SET(CAIRO_SOURCES_DIR ${CMAKE_BINARY_DIR}/cairo-1.14.8) - SET(CAIRO_URL "http://www.orthanc-server.com/downloads/third-party/Stone/cairo-1.14.8.tar.xz") - SET(CAIRO_MD5 "4ef0db2eacb271c74f8a3fd87822aa98") + SET(CAIRO_SOURCES_DIR ${CMAKE_BINARY_DIR}/cairo-1.14.12) + SET(CAIRO_URL "http://www.orthanc-server.com/downloads/third-party/Stone/cairo-1.14.12.tar.xz") + SET(CAIRO_MD5 "9f0db9dbfca0966be8acd682e636d165") DownloadPackage(${CAIRO_MD5} ${CAIRO_URL} "${CAIRO_SOURCES_DIR}")