[<hugin-cvs@li...>]

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/0dd018ab252a
changeset: 4853:0dd018ab252a
user:      tmodes
date:       Mon Jan 17 17:55:26 2011 +0100
description:
Merged

diffstat:

 src/hugin1/hugin/xrc/data/upstream.txt                        |   1 +
 src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp |  10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r a7cd27506f76 -r 0dd018ab252a src/hugin1/hugin/xrc/data/upstream.txt
--- a/src/hugin1/hugin/xrc/data/upstream.txt	Mon Jan 17 17:53:45 2011 +0100
+++ b/src/hugin1/hugin/xrc/data/upstream.txt	Mon Jan 17 17:55:26 2011 +0100
@@ -5,6 +5,7 @@
 
 VIGRA: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
 levmar by Manolis Lourakis http://www.ics.forth.gr/~lourakis/levmar
+FLANN by Marius Muja and David G. Lowe, http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN (used unmodified)
 ANN: by David M. Mount and Sunil Arya http://www.cs.umd.edu/~mount/ANN/
 
 The camera response estimation uses the EMoR response model developed 
diff -r a7cd27506f76 -r 0dd018ab252a src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp
--- a/src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp	Mon Jan 17 17:53:45 2011 +0100
+++ b/src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp	Mon Jan 17 17:55:26 2011 +0100
@@ -55,18 +55,18 @@
 	if (rings.size() == 0) {
 		rings.push_back(1);
 		ring_radius.push_back(0);
-		ring_gradient_width.push_back(0.5);
+		ring_gradient_width.push_back(2);
 		rings.push_back(6);
-		ring_radius.push_back(2.3);
-		ring_gradient_width.push_back(1.3);
+		ring_radius.push_back(4.2);
+		ring_gradient_width.push_back(1.9);
 		/*
 		rings.push_back(6);
 		ring_radius.push_back(5);
 		ring_gradient_width.push_back(3);
 		*/
 		rings.push_back(6);
-		ring_radius.push_back(9);
-		ring_gradient_width.push_back(9);
+		ring_radius.push_back(8);
+		ring_gradient_width.push_back(3.2);
 	}
 
 	assert(rings.size() == ring_radius.size());