From 8d0b625538a9eee2600b31a2a1caea68638c1ccd Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 1 Feb 2019 11:30:28 +0100 Subject: [PATCH] xcf: Fix fix for opacity being out of bounds If max opacity is 255 we want the min between opacity and 255 and not the max --- src/imageformats/xcf.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/imageformats/xcf.cpp b/src/imageformats/xcf.cpp index 24edea5..04a2251 100644 --- a/src/imageformats/xcf.cpp +++ b/src/imageformats/xcf.cpp @@ -676,7 +676,7 @@ bool XCFImageFormat::loadLayerProperties(QDataStream &xcf_io, Layer &layer) case PROP_OPACITY: property >> layer.opacity; - layer.opacity = std::max(layer.opacity, 255u); + layer.opacity = std::min(layer.opacity, 255u); break; case PROP_VISIBLE: @@ -1302,7 +1302,7 @@ bool XCFImageFormat::loadChannelProperties(QDataStream &xcf_io, Layer &layer) case PROP_OPACITY: property >> layer.mask_channel.opacity; - layer.mask_channel.opacity = std::max(layer.mask_channel.opacity, 255u); + layer.mask_channel.opacity = std::min(layer.mask_channel.opacity, 255u); break; case PROP_VISIBLE: