From f014fb0a0e1f7894ce8f4da5a8699c1804e7f9bb Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Wed, 28 Mar 2012 13:07:44 +0000
Subject: [PATCH] restored the ordering of SURF constructor parameters (ticket
 #1704)

---
 modules/nonfree/include/opencv2/nonfree/features2d.hpp | 4 ++--
 modules/nonfree/src/surf.cpp                           | 2 +-
 modules/nonfree/test/test_detectors.cpp                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/nonfree/include/opencv2/nonfree/features2d.hpp b/modules/nonfree/include/opencv2/nonfree/features2d.hpp
index c283f11d21..f5c6e7d6f2 100644
--- a/modules/nonfree/include/opencv2/nonfree/features2d.hpp
+++ b/modules/nonfree/include/opencv2/nonfree/features2d.hpp
@@ -111,8 +111,8 @@ public:
     SURF();
     //! the full constructor taking all the necessary parameters
     explicit SURF(double _hessianThreshold,
-                  bool _extended=true, bool _upright=false,
-                  int _nOctaves=4, int _nOctaveLayers=2);
+                  int _nOctaves=4, int _nOctaveLayers=2,
+                  bool _extended=true, bool _upright=false);
 
     //! returns the descriptor size in float's (64 or 128)
     int descriptorSize() const;
diff --git a/modules/nonfree/src/surf.cpp b/modules/nonfree/src/surf.cpp
index 66856a1d3e..5fbdcbc84f 100644
--- a/modules/nonfree/src/surf.cpp
+++ b/modules/nonfree/src/surf.cpp
@@ -819,7 +819,7 @@ SURF::SURF()
     nOctaveLayers = 2;
 }
 
-SURF::SURF(double _threshold, bool _extended, bool _upright, int _nOctaves, int _nOctaveLayers)
+SURF::SURF(double _threshold, int _nOctaves, int _nOctaveLayers, bool _extended, bool _upright)
 {
     hessianThreshold = _threshold;
     extended = _extended;
diff --git a/modules/nonfree/test/test_detectors.cpp b/modules/nonfree/test/test_detectors.cpp
index d9f7a8eeab..75bc521801 100644
--- a/modules/nonfree/test/test_detectors.cpp
+++ b/modules/nonfree/test/test_detectors.cpp
@@ -297,7 +297,7 @@ void CV_DetectorsTest::run( int /*start_from*/ )
     if (exp.empty())
         return;
 
-    if (!testDetector(to_test, SurfNoMaskWrap(SURF(1536+512+512, true, false, 2)), exp))
+    if (!testDetector(to_test, SurfNoMaskWrap(SURF(1536+512+512, 2)), exp))
         return;
     
     LoadExpected(string(ts->get_data_path()) + "detectors/star.xml", exp);