pkgsrc-ng/graphics/autopano-sift-C/patches/patch-APSCpp_ANN_kd__split.cpp
2016-11-18 22:39:22 +01:00

34 lines
1.3 KiB
C++

$NetBSD: patch-APSCpp_ANN_kd__split.cpp,v 1.1 2016/04/14 11:46:39 jperkin Exp $
Avoid redefining ERR.
--- APSCpp/ANN/kd_split.cpp.orig 2009-10-06 20:51:08.000000000 +0000
+++ APSCpp/ANN/kd_split.cpp
@@ -31,7 +31,7 @@
// Constants
//----------------------------------------------------------------------
-const double ERR = 0.001; // a small value
+const double MYERR = 0.001; // a small value
const double FS_ASPECT_RATIO = 3.0; // maximum allowed aspect ratio
// in fair split. Must be >= 2.
@@ -95,7 +95,7 @@ void midpt_split(
ANNcoord max_spread = -1; // find long side with most spread
for (d = 0; d < dim; d++) {
// is it among longest?
- if (double(bnds.hi[d] - bnds.lo[d]) >= (1-ERR)*max_length) {
+ if (double(bnds.hi[d] - bnds.lo[d]) >= (1-MYERR)*max_length) {
// compute its spread
ANNcoord spr = annSpread(pa, pidx, n, d);
if (spr > max_spread) { // is it max so far?
@@ -165,7 +165,7 @@ void sl_midpt_split(
ANNcoord max_spread = -1; // find long side with most spread
for (d = 0; d < dim; d++) {
// is it among longest?
- if ((bnds.hi[d] - bnds.lo[d]) >= (1-ERR)*max_length) {
+ if ((bnds.hi[d] - bnds.lo[d]) >= (1-MYERR)*max_length) {
// compute its spread
ANNcoord spr = annSpread(pa, pidx, n, d);
if (spr > max_spread) { // is it max so far?