From 7490aaa3e47ad9ccb7e40acb794c59640bafae05 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Tue, 14 Nov 2017 00:15:42 -0600 Subject: [PATCH] Fixing brightness and Mask effects to calculate factor with a float type, giving more fine control --- src/effects/Brightness.cpp | 2 +- src/effects/Mask.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/effects/Brightness.cpp b/src/effects/Brightness.cpp index 497667e1..8a791f8f 100644 --- a/src/effects/Brightness.cpp +++ b/src/effects/Brightness.cpp @@ -91,7 +91,7 @@ std::shared_ptr Brightness::GetFrame(std::shared_ptr frame, int64_ int A = pixels[byte_index + 3]; // Adjust the contrast - int factor = (259 * (contrast_value + 255)) / (255 * (259 - contrast_value)); + float factor = (259 * (contrast_value + 255)) / (255 * (259 - contrast_value)); R = constrain((factor * (R - 128)) + 128); G = constrain((factor * (G - 128)) + 128); B = constrain((factor * (B - 128)) + 128); diff --git a/src/effects/Mask.cpp b/src/effects/Mask.cpp index d0fed124..f54abc11 100644 --- a/src/effects/Mask.cpp +++ b/src/effects/Mask.cpp @@ -88,7 +88,7 @@ void Mask::set_grayscale_mask(std::shared_ptr mask_frame_image, int widt int gray_value = qGray(R, G, B); // Adjust the contrast - int factor = (259 * (contrast + 255)) / (255 * (259 - contrast)); + float factor = (259 * (contrast + 255)) / (255 * (259 - contrast)); gray_value = constrain((factor * (gray_value - 128)) + 128); // Adjust the brightness