From 6b876e6a279076f0621591789ff915678398859e Mon Sep 17 00:00:00 2001 From: Olivier Prat Date: Wed, 3 Apr 2019 12:05:29 +0200 Subject: [PATCH] Fixed warnings on Mac & Ubuntu --- libraries/image/src/image/Image.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/image/src/image/Image.cpp b/libraries/image/src/image/Image.cpp index f2a7e9a58e..df5ed15867 100644 --- a/libraries/image/src/image/Image.cpp +++ b/libraries/image/src/image/Image.cpp @@ -7,7 +7,7 @@ using namespace image; Image Image::getScaled(glm::uvec2 dstSize, AspectRatioMode ratioMode, TransformationMode transformMode) const { - if (_data.format() == Image::Format_PACKED_FLOAT) { + if ((Image::Format)_data.format() == Image::Format_PACKED_FLOAT) { // Start by converting to full float glm::vec4* floatPixels = new glm::vec4[getWidth()*getHeight()]; auto unpackFunc = getHDRUnpackingFunction(); @@ -33,7 +33,7 @@ Image Image::getScaled(glm::uvec2 dstSize, AspectRatioMode ratioMode, Transforma if (transformMode == Qt::TransformationMode::FastTransformation) { filter = nvtt::ResizeFilter_Box; } - surface.resize(dstSize.x, dstSize.y, 1, nvtt::ResizeFilter_Box); + surface.resize(dstSize.x, dstSize.y, 1, filter); // And convert back to original format QImage resizedImage((int)dstSize.x, (int)dstSize.y, (QImage::Format)Image::Format_PACKED_FLOAT);