From 7d3a02919a9f78f18df931ef2a9b00dfb5f5e5e5 Mon Sep 17 00:00:00 2001 From: Michael Miller Date: Sat, 21 Jan 2023 15:48:11 -0800 Subject: [PATCH] promote to int32_t (#623) --- src/internal/Rgb48Color.cpp | 6 +++--- src/internal/Rgbw64Color.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/internal/Rgb48Color.cpp b/src/internal/Rgb48Color.cpp index 6b881b9..789047e 100644 --- a/src/internal/Rgb48Color.cpp +++ b/src/internal/Rgb48Color.cpp @@ -135,9 +135,9 @@ void Rgb48Color::Lighten(uint16_t delta) Rgb48Color Rgb48Color::LinearBlend(const Rgb48Color& left, const Rgb48Color& right, float progress) { - return Rgb48Color( left.R + ((right.R - left.R) * progress), - left.G + ((right.G - left.G) * progress), - left.B + ((right.B - left.B) * progress)); + return Rgb48Color( left.R + (((int32_t)right.R - left.R) * progress), + left.G + (((int32_t)right.G - left.G) * progress), + left.B + (((int32_t)right.B - left.B) * progress)); } Rgb48Color Rgb48Color::BilinearBlend(const Rgb48Color& c00, diff --git a/src/internal/Rgbw64Color.cpp b/src/internal/Rgbw64Color.cpp index 9a2a849..a84077c 100644 --- a/src/internal/Rgbw64Color.cpp +++ b/src/internal/Rgbw64Color.cpp @@ -162,10 +162,10 @@ void Rgbw64Color::Lighten(uint16_t delta) Rgbw64Color Rgbw64Color::LinearBlend(const Rgbw64Color& left, const Rgbw64Color& right, float progress) { - return Rgbw64Color( left.R + ((right.R - left.R) * progress), - left.G + ((right.G - left.G) * progress), - left.B + ((right.B - left.B) * progress), - left.W + ((right.W - left.W) * progress) ); + return Rgbw64Color( left.R + (((int32_t)right.R - left.R) * progress), + left.G + (((int32_t)right.G - left.G) * progress), + left.B + (((int32_t)right.B - left.B) * progress), + left.W + (((int32_t)right.W - left.W) * progress) ); } Rgbw64Color Rgbw64Color::BilinearBlend(const Rgbw64Color& c00,