Merge pull request #246 from dm-jrae/master

result_set bugfix

COPYING

@@ -3,6 +3,7 @@ The BSD License
 
 Copyright (c) 2008-2011  Marius Muja (mariusm@cs.ubc.ca). All rights reserved.
 Copyright (c) 2008-2011  David G. Lowe (lowe@cs.ubc.ca). All rights reserved.
+Copyright (c) 2015       Google Inc (Jack Rae, jwrae@google.com). All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

src/cpp/flann/util/result_set.h

@@ -252,12 +252,10 @@ public:
 #endif
             {
                 // Check for duplicate indices
-                size_t j = i - 1;
-                while (dist_index_[j].dist_ == dist) {
+                for (size_t j = i - 1; dist_index_[j].dist_ == dist && j--;) {
                     if (dist_index_[j].index_ == index) {
                         return;
                     }
-                    --j;
                 }
                 break;
             }