From d538fbf17513d905331a85cc0206f8da4da78a42 Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Mon, 1 Apr 2013 19:26:27 -0400 Subject: [PATCH] code tweaks --- openbr/plugins/quantize.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openbr/plugins/quantize.cpp b/openbr/plugins/quantize.cpp index e120f4d..66ddc0d 100644 --- a/openbr/plugins/quantize.cpp +++ b/openbr/plugins/quantize.cpp @@ -309,16 +309,13 @@ class RecursiveProductQuantizationDistance : public Distance similarity += lut[j*256*256 + aData[j]*256+bData[j]]; evidence += similarity; - if (evidence < t) return 0; - - // similarity = max(similarity, 0.f); const int subSize = (size-1)/4; - if (subSize == 0) return similarity; - return max(similarity + if ((evidence < t) || (subSize == 0)) return similarity; + return similarity + compareRecursive(a, b, i+1+0*subSize, subSize, evidence) + compareRecursive(a, b, i+1+1*subSize, subSize, evidence) + compareRecursive(a, b, i+1+2*subSize, subSize, evidence) - + compareRecursive(a, b, i+1+3*subSize, subSize, evidence),0.f); + + compareRecursive(a, b, i+1+3*subSize, subSize, evidence); } }; -- libgit2 0.21.4