From a79e7a258762f0c9ac2bb89d723212c36463ddd3 Mon Sep 17 00:00:00 2001 From: Olivier Prat Date: Wed, 3 Apr 2019 11:18:15 +0200 Subject: [PATCH 1/2] Fixed warning --- libraries/image/src/image/Image.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/image/src/image/Image.cpp b/libraries/image/src/image/Image.cpp index 25e9ac3f59..f2a7e9a58e 100644 --- a/libraries/image/src/image/Image.cpp +++ b/libraries/image/src/image/Image.cpp @@ -12,8 +12,8 @@ Image Image::getScaled(glm::uvec2 dstSize, AspectRatioMode ratioMode, Transforma glm::vec4* floatPixels = new glm::vec4[getWidth()*getHeight()]; auto unpackFunc = getHDRUnpackingFunction(); auto floatDataIt = floatPixels; - for (auto lineNb = 0; lineNb < getHeight(); lineNb++) { - const glm::uint32* srcPixelIt = reinterpret_cast(getScanLine(lineNb)); + for (glm::uint32 lineNb = 0; lineNb < getHeight(); lineNb++) { + const glm::uint32* srcPixelIt = reinterpret_cast(getScanLine((int)lineNb)); const glm::uint32* srcPixelEnd = srcPixelIt + getWidth(); while (srcPixelIt < srcPixelEnd) { @@ -42,8 +42,8 @@ Image Image::getScaled(glm::uvec2 dstSize, AspectRatioMode ratioMode, Transforma auto srcRedIt = reinterpret_cast(surface.channel(0)); auto srcGreenIt = reinterpret_cast(surface.channel(1)); auto srcBlueIt = reinterpret_cast(surface.channel(2)); - for (auto lineNb = 0; lineNb < dstSize.y; lineNb++) { - glm::uint32* dstPixelIt = reinterpret_cast(resizedImage.scanLine(lineNb)); + for (glm::uint32 lineNb = 0; lineNb < dstSize.y; lineNb++) { + glm::uint32* dstPixelIt = reinterpret_cast(resizedImage.scanLine((int)lineNb)); glm::uint32* dstPixelEnd = dstPixelIt + dstSize.x; while (dstPixelIt < dstPixelEnd) { From 6b876e6a279076f0621591789ff915678398859e Mon Sep 17 00:00:00 2001 From: Olivier Prat Date: Wed, 3 Apr 2019 12:05:29 +0200 Subject: [PATCH 2/2] 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);