Replaced dynamic_cas with Ptr::dynamicCast<>, and & with &&

This commit is contained in:
Juan Manuel Perez
2013-09-25 18:30:33 +02:00
committed by Vadim Pisarevsky
parent 1bf4298251
commit 4672a70c1f
5 changed files with 22 additions and 22 deletions

View File

@@ -60,7 +60,7 @@
float EmdL1::getEMDL1(cv::Mat &sig1, cv::Mat &sig2)
{
// Initialization
CV_Assert((sig1.rows==sig2.rows) & (sig1.cols==sig2.cols) & (!sig1.empty()) & (!sig2.empty()));
CV_Assert((sig1.rows==sig2.rows) && (sig1.cols==sig2.cols) && (!sig1.empty()) && (!sig2.empty()));
if(!initBaseTrees(sig1.rows, 1))
return -1;