From f0445295bd4414a548462d7aed735985c12415b1 Mon Sep 17 00:00:00 2001 From: Dan Ben-Yosef Date: Mon, 15 Feb 2021 21:58:37 +0200 Subject: [PATCH] Merge pull request #19525 from danbey:Fix-cppcheck-error-in-carotete-lib * Reduce if statement as it has the same expression on both sides of '&&' If statement has the same expression on both sides so this can be reduce Signed-off-by: Dan Ben Yosef * The if statement is to check width and height --- 3rdparty/carotene/src/resize.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/carotene/src/resize.cpp b/3rdparty/carotene/src/resize.cpp index 49205573cd..aa5b756c75 100644 --- a/3rdparty/carotene/src/resize.cpp +++ b/3rdparty/carotene/src/resize.cpp @@ -758,7 +758,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, } else if (channels == 3) { - if ((wr == 2.0f) && (wr == 2.0f)) + if ((wr == 2.0f) && (hr == 2.0f)) { #ifndef __ANDROID__ size_t roiw16 = dsize.width >= 15 ? (dsize.width - 15) * 3 : 0; -- GitLab