commit 864741bf189635fe13528448e0a67854d1a93dbc
author Alexander Galazin <alexander.galazin@arm.com> Wed Aug 16 18:18:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 16 18:18:24 2017 +0000
tree d0e5a53e4db2a69010362fc7c4bfe453b124a1b0
parent a70bf9807c91a70fbea9e494ac9c3fc9f431c887
parent 0cf17c4bf859434e7adf3bdb0c8fffe91b3eae2e

Merge "Fix error double accounting in fuzzyCompare()"
am: 0cf17c4bf8

Change-Id: Ie3cd66fceec9ac3a73d5d5fb237baf62660ed049

framework/common/tcuFuzzyImageCompare.cpp

diff --git a/framework/common/tcuFuzzyImageCompare.cpp b/framework/common/tcuFuzzyImageCompare.cpp
index 596ab83..4e76476 100644
--- a/framework/common/tcuFuzzyImageCompare.cpp
+++ b/framework/common/tcuFuzzyImageCompare.cpp
@@ -318,7 +318,7 @@
 
 	for (int y = 1; y < height-1; y++)
 	{
-		for (int x = 1; x < width-1; x += params.maxSampleSkip > 0 ? (int)rnd.getInt(0, params.maxSampleSkip) : 1)
+		for (int x = 1; x < width-1; x += 1 + (int)rnd.getInt(0, params.maxSampleSkip))
 		{
 			const deUint32	minDist2RefToCmp	= distSquaredToNeighbor<4>(rnd, readUnorm8<4>(refAccess, x, y), cmpAccess, x, y);
 			const deUint32	minDist2CmpToRef	= distSquaredToNeighbor<4>(rnd, readUnorm8<4>(cmpAccess, x, y), refAccess, x, y);