Merge branch 2.4

diff --cc modules/contrib/src/facerec.cpp
index 7a8ab74,fbf124a..bc41a86
--- 1/modules/contrib/src/facerec.cpp
--- 2/modules/contrib/src/facerec.cpp
+++ b/modules/contrib/src/facerec.cpp
@@@ -300,7 -300,13 +300,13 @@@ public
  //------------------------------------------------------------------------------
  // FaceRecognizer
  //------------------------------------------------------------------------------
- void FaceRecognizer::update(InputArrayOfArrays, InputArray) {
+ void FaceRecognizer::update(InputArrayOfArrays src, InputArray labels ) {
+     if( dynamic_cast<LBPH*>(this) != 0 )
+     {
+         dynamic_cast<LBPH*>(this)->update( src, labels );
+         return;
+     }
 -    
++
      string error_msg = format("This FaceRecognizer (%s) does not support updating, you have to use FaceRecognizer::train to update it.", this->name().c_str());
      CV_Error(CV_StsNotImplemented, error_msg);
  }

diff --cc modules/core/src/opengl_interop.cpp
Simple merge

diff --cc modules/core/test/test_math.cpp
index 91ac425,1203961..0558ab0
--- 1/modules/core/test/test_math.cpp
--- 2/modules/core/test/test_math.cpp
+++ b/modules/core/test/test_math.cpp
@@@ -2546,6 -2453,21 +2546,21 @@@ REGISTER_TYPED_TEST_CASE_P(Core_CheckRa
  typedef ::testing::Types<signed char,unsigned char, signed short, unsigned short, signed int> mat_data_types;
  INSTANTIATE_TYPED_TEST_CASE_P(Negative_Test, Core_CheckRange, mat_data_types);
  
 -    
+ TEST(Core_Invert, small)
+ {
+     cv::Mat a = (cv::Mat_<float>(3,3) << 2.42104644730331, 1.81444796521479, -3.98072565304758, 0, 7.08389214348967e-3, 5.55326770986007e-3, 0,0, 7.44556154284261e-3);
+     //cv::randu(a, -1, 1);
++
+     cv::Mat b = a.t()*a;
+     cv::Mat c, i = Mat_<float>::eye(3, 3);
+     cv::invert(b, c, cv::DECOMP_LU); //std::cout << b*c << std::endl;
+     ASSERT_LT( cv::norm(b*c, i, CV_C), 0.1 );
+     cv::invert(b, c, cv::DECOMP_SVD); //std::cout << b*c << std::endl;
+     ASSERT_LT( cv::norm(b*c, i, CV_C), 0.1 );
+     cv::invert(b, c, cv::DECOMP_CHOLESKY); //std::cout << b*c << std::endl;
+     ASSERT_LT( cv::norm(b*c, i, CV_C), 0.1 );
+ }
+ 
  /////////////////////////////////////////////////////////////////////////////////////////////////////
  
  TEST(Core_CovarMatrix, accuracy) { Core_CovarMatrixTest test; test.safe_run(); }

diff --cc modules/gpu/src/pyrlk.cpp
Simple merge