merged trunk r8815:8827

modules/core/include/opencv2/core/core.hpp

@@ -4320,6 +4320,7 @@ public:
     CV_WRAP_AS(setMat) void set(const string& name, const Mat& value);
     CV_WRAP_AS(setMatVector) void set(const string& name, const vector<Mat>& value);
     CV_WRAP_AS(setAlgorithm) void set(const string& name, const Ptr<Algorithm>& value);
+    template<typename _Tp> void set(const string& name, const Ptr<_Tp>& value);
 
     void set(const char* name, int value);
     void set(const char* name, double value);
@@ -4328,6 +4329,7 @@ public:
     void set(const char* name, const Mat& value);
     void set(const char* name, const vector<Mat>& value);
     void set(const char* name, const Ptr<Algorithm>& value);
+    template<typename _Tp> void set(const char* name, const Ptr<_Tp>& value);
 
     CV_WRAP string paramHelp(const string& name) const;
     int paramType(const char* name) const;

modules/core/include/opencv2/core/mat.hpp

@@ -759,7 +759,8 @@ inline SVD::SVD() {}
 inline SVD::SVD( InputArray m, int flags ) { operator ()(m, flags); }
 inline void SVD::solveZ( InputArray m, OutputArray _dst )
 {
-    SVD svd(m);
+    Mat mtx = m.getMat();
+    SVD svd(mtx, (mtx.rows >= mtx.cols ? 0 : SVD::FULL_UV));
     _dst.create(svd.vt.cols, 1, svd.vt.type());
     Mat dst = _dst.getMat();
     svd.vt.row(svd.vt.rows-1).reshape(1,svd.vt.cols).copyTo(dst);

modules/core/include/opencv2/core/operations.hpp

@@ -3842,6 +3842,22 @@ template<typename _Tp> inline Ptr<_Tp> Algorithm::create(const string& name)
     return _create(name).ptr<_Tp>();
 }
 
+template<typename _Tp>
+void Algorithm::set(const char* _name, const Ptr<_Tp>& value)
+{
+    Ptr<Algorithm> algo_ptr = value. template ptr<cv::Algorithm>();
+    if (algo_ptr.empty()) {
+        CV_Error( CV_StsUnsupportedFormat, "unknown/unsupported Ptr type of the second parameter of the method Algorithm::set");
+    }
+    info()->set(this, _name, ParamType<Algorithm>::type, &algo_ptr);
+}
+template<typename _Tp>
+void Algorithm::set(const string& _name, const Ptr<_Tp>& value)
+{
+    this->set<_Tp>(_name.c_str(), value);
+}
+    
+
 template<typename _Tp> inline typename ParamType<_Tp>::member_type Algorithm::get(const string& _name) const
 {
     typename ParamType<_Tp>::member_type value;

modules/core/test/test_operations.cpp

@@ -75,6 +75,7 @@ protected:
     bool TestVec();
     bool TestMatxMultiplication();
     bool TestSubMatAccess();
+    bool TestSVD();
     bool operations1();
 
     void checkDiff(const Mat& m1, const Mat& m2, const string& s)
@@ -934,6 +935,29 @@ bool CV_OperationsTest::operations1()
     return true;
 }
 
+
+bool CV_OperationsTest::TestSVD()
+{    
+    try 
+    {
+        Mat A = (Mat_<double>(3,4) << 1, 2, -1, 4, 2, 4, 3, 5, -1, -2, 6, 7);
+        Mat x;
+        SVD::solveZ(A,x);
+        if( norm(A*x, CV_C) > FLT_EPSILON )
+            throw test_excep();
+
+        SVD svd(A, SVD::FULL_UV); 
+        if( norm(A*svd.vt.row(3).t(), CV_C) > FLT_EPSILON )
+            throw test_excep();
+    }
+    catch(const test_excep&)
+    {
+        ts->set_failed_test_info(cvtest::TS::FAIL_MISMATCH);
+        return false;
+    }
+    return true;
+}
+
 void CV_OperationsTest::run( int /* start_from */)
 {
     if (!TestMat())
@@ -959,6 +983,9 @@ void CV_OperationsTest::run( int /* start_from */)
     
     if (!TestSubMatAccess())
         return;
+    
+    if (!TestSVD())
+        return;
 
     if (!operations1())
         return;

modules/java/CMakeLists.txt

@@ -248,9 +248,9 @@ if(ANDROID)
       # build the library project
       # normally we should do this after a native part, but for a library project we can build the java part first
       add_custom_command(
-        OUTPUT "${OpenCV_BINARY_DIR}/bin/classes.jar"
+        OUTPUT "${OpenCV_BINARY_DIR}/bin/classes.jar" "${OpenCV_BINARY_DIR}/bin/.classes.jar.dephelper"
         COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug
-        COMMAND ${CMAKE_COMMAND} -E touch "${OpenCV_BINARY_DIR}/bin/classes.jar" # needed because ant does not update the timestamp of updated jar
+        COMMAND ${CMAKE_COMMAND} -E touch "${OpenCV_BINARY_DIR}/bin/.classes.jar.dephelper" # can not rely on classes.jar because different versions of SDK update timestamp at different times
         WORKING_DIRECTORY "${OpenCV_BINARY_DIR}"
         DEPENDS ${lib_proj_files} ${lib_target_files} ${java_files}
         COMMENT "Building OpenCV Android library project"

modules/nonfree/CMakeLists.txt

@@ -1,2 +1,6 @@
+if(BUILD_ANDROID_PACKAGE)
+  ocv_module_disable(nonfree)
+endif()
+
 set(the_description "Functionality with possible limitations on the use")
 ocv_define_module(nonfree opencv_imgproc opencv_features2d)