From 23d4826760b352b56bc699466222bce5751b291f Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Mon, 19 Jul 2021 10:03:32 +0100 Subject: [PATCH] Fix SVACE error in pixel-buffer-impl.cpp Change-Id: I06b14dc13dee75ebe09e2c786455f5a969e398aa --- dali/internal/imaging/common/pixel-buffer-impl.cpp | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dali/internal/imaging/common/pixel-buffer-impl.cpp b/dali/internal/imaging/common/pixel-buffer-impl.cpp index e69f2c8..6ed2e31 100644 --- a/dali/internal/imaging/common/pixel-buffer-impl.cpp +++ b/dali/internal/imaging/common/pixel-buffer-impl.cpp @@ -479,19 +479,23 @@ uint32_t PixelBuffer::GetBrightness() const { unsigned char* pixel = mBuffer; const uint32_t bufferSize = mWidth * mHeight; - uint64_t red = 0; - uint64_t green = 0; - uint64_t blue = 0; - for(uint32_t i = 0; i < bufferSize; ++i) + if(bufferSize) // avoid division by zero to calculate brightness { - red += ReadChannel(pixel, mPixelFormat, Adaptor::RED); - green += ReadChannel(pixel, mPixelFormat, Adaptor::GREEN); - blue += ReadChannel(pixel, mPixelFormat, Adaptor::BLUE); - pixel += bytesPerPixel; + uint64_t red = 0; + uint64_t green = 0; + uint64_t blue = 0; + + for(uint32_t i = 0; i < bufferSize; ++i) + { + red += ReadChannel(pixel, mPixelFormat, Adaptor::RED); + green += ReadChannel(pixel, mPixelFormat, Adaptor::GREEN); + blue += ReadChannel(pixel, mPixelFormat, Adaptor::BLUE); + pixel += bytesPerPixel; + } + // http://www.w3.org/TR/AERT#color-contrast + brightness = (red * BRIGHTNESS_CONSTANT_R + green * BRIGHTNESS_CONSTANT_G + blue * BRIGHTNESS_CONSTANT_B) / (1000uLL * bufferSize); } - // http://www.w3.org/TR/AERT#color-contrast - brightness = (red * BRIGHTNESS_CONSTANT_R + green * BRIGHTNESS_CONSTANT_G + blue * BRIGHTNESS_CONSTANT_B) / (1000uLL * bufferSize); } return brightness; -- 2.7.4