Merge branch 'master' of https://github.com/Itseez/opencv

2014-08-18 22:30:00 +02:00
parent 211a8d31d5 0ffc53bafe
commit 7e2bb63378
260 changed files with 8973 additions and 8241 deletions
--- a/samples/cpp/tutorial_code/calib3d/stereoBM/SBM_Sample.cpp
+++ b/samples/cpp/tutorial_code/calib3d/stereoBM/SBM_Sample.cpp
@@ -33,7 +33,7 @@ int main( int argc, char** argv )
  Mat imgDisparity16S = Mat( imgLeft.rows, imgLeft.cols, CV_16S );
  Mat imgDisparity8U = Mat( imgLeft.rows, imgLeft.cols, CV_8UC1 );

-  if( !imgLeft.data || !imgRight.data )
+  if( imgLeft.empty() || imgRight.empty() )
  { std::cout<< " --(!) Error reading images " << std::endl; return -1; }

  //-- 2. Call the constructor for StereoBM