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

Corrected compilation errors Win

Browse Source
This commit is contained in:
Juan Manuel Perez 2013-09-24 22:21:31 +02:00 committed by Vadim Pisarevsky
parent ead966709d
commit 5a1e9876fc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/shape/src/aff_trans.cpp
View File

@ -82,13 +82,13 @@ public:
virtual void write(FileStorage& fs) const virtual void write(FileStorage& fs) const
{ {
fs << "name" << name_ fs << "name" << name_
<< "affine_type" << fullAffine; << "affine_type" << int(fullAffine);
} }
virtual void read(const FileNode& fn) virtual void read(const FileNode& fn)
{ {
CV_Assert( (String)fn["name"] == name_ ); CV_Assert( (String)fn["name"] == name_ );
fullAffine = (bool)int(fn["affine_type"]); fullAffine = int(fn["affine_type"])?true:false;
} }
private: private:

6
modules/shape/src/emdL1.cpp
View File

@ -393,9 +393,9 @@ bool EmdL1::greedySolution3()
//- determine which direction to move, either right or upward //- determine which direction to move, either right or upward
dFlow = D[i1][i2][i3]; dFlow = D[i1][i2][i3];
f1 = i1<(binsDim1-1)?(float)fabs(dFlow+d1s[i1+1]):VHIGH; f1 = i1<(binsDim1-1)?(float)fabs(float(dFlow+d1s[i1+1])):VHIGH;
f2 = i2<(binsDim2-1)?(float)fabs(dFlow+d2s[i2+1]):VHIGH; f2 = i2<(binsDim2-1)?(float)fabs(float(dFlow+d2s[i2+1])):VHIGH;
f3 = i3<(binsDim3-1)?(float)fabs(dFlow+d3s[i3+1]):VHIGH; f3 = i3<(binsDim3-1)?(float)fabs(float(dFlow+d3s[i3+1])):VHIGH;
if(f1<f2 && f1<f3) if(f1<f2 && f1<f3)
{ {