generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrections for compiling issues in Win, And and Doc

Browse Source
This commit is contained in:
Juan Manuel Perez
2013-09-23 21:24:27 +02:00
committed by Vadim Pisarevsky
parent 61c27ac81e
commit fe7bab499f
14 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/shape/src/hist_cost.cpp
View File

@@ -156,7 +156,7 @@ void NormHistogramCostExtractorImpl::buildCostMatrix(InputArray _descriptors1, I
if (i<scd1.rows && j<scd2.rows)
{
Mat columnDiff = scd1.row(i)-scd2.row(j);
costMatrix.at<float>(i,j)=norm(columnDiff, flag);
costMatrix.at<float>(i,j)=(float)norm(columnDiff, flag);
}
else
{
@@ -288,11 +288,11 @@ void EMDHistogramCostExtractorImpl::buildCostMatrix(InputArray _descriptors1, In
sig2.col(0)=scd2.row(j).t();
for (int k=0; k<sig1.rows; k++)
{
sig1.at<float>(k,1)=k;
sig1.at<float>(k,1)=float(k);
}
for (int k=0; k<sig2.rows; k++)
{
sig2.at<float>(k,1)=k;
sig2.at<float>(k,1)=float(k);
}
costMatrix.at<float>(i,j) = cv::EMD(sig1, sig2, flag);
@@ -543,5 +543,3 @@ Ptr <HistogramCostExtractor> createEMDL1HistogramCostExtractor(int nDummies, flo
}
} // cv