Merge pull request flann-lib#246 from dm-jrae/master

mariusmuja · mariusmuja · commit c2d2e473ec53 · 2015-07-16T23:36:45.000-07:00
result_set bugfix
diff --git a/COPYING b/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:
 
diff --git a/src/cpp/flann/util/result_set.h b/src/cpp/flann/util/result_set.h
@@ -252,12 +252,10 @@ class KNNResultSet : public ResultSet<DistanceType>
 #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;
             }

-Original file line number
+Diff line change
 Copyright (c) 2008-2011  Marius Muja ([email protected]). All rights reserved.
 Copyright (c) 2008-2011  David G. Lowe ([email protected]). All rights reserved.
 +Copyright (c) 2015       Google Inc (Jack Rae, [email protected]). All Rights Reserved.
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Original file line number	Diff line number	Diff line change
`@@ -252,12 +252,10 @@ class KNNResultSet : public ResultSet<DistanceType>`
`252`	`252`	`#endif`
`253`	`253`	`{`
`254`	`254`	`// Check for duplicate indices`
`255`		`- size_t j = i - 1;`
`256`		`- while (dist_index_[j].dist_ == dist) {`
	`255`	`+ for (size_t j = i - 1; dist_index_[j].dist_ == dist && j--;) {`
`257`	`256`	`if (dist_index_[j].index_ == index) {`
`258`	`257`	`return;`
`259`	`258`	`}`
`260`		`- --j;`
`261`	`259`	`}`
`262`	`260`	`break;`
`263`	`261`	`}`