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

Fixed several warnings on various platforms

Browse Source
This commit is contained in:
Andrey Kamaev
2012-04-11 11:11:39 +00:00
parent 07f8bf9226
commit b756033206
14 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/contrib/src/colormap.cpp
View File

@@ -47,7 +47,7 @@ static void sortMatrixRowsByIndices(InputArray _src, InputArray _indices, Output
Mat dst = _dst.getMat();
for(size_t idx = 0; idx < indices.size(); idx++) {
Mat originalRow = src.row(indices[idx]);
Mat sortedRow = dst.row(idx);
Mat sortedRow = dst.row((int)idx);
originalRow.copyTo(sortedRow);
}
}
@@ -127,8 +127,9 @@ static Mat interp1(InputArray _x, InputArray _Y, InputArray _xi)
case CV_32SC1: return interp1_<int>(x,Y,xi); break;
case CV_32FC1: return interp1_<float>(x,Y,xi); break;
case CV_64FC1: return interp1_<double>(x,Y,xi); break;
default: CV_Error(CV_StsUnsupportedFormat, ""); return Mat();
default: CV_Error(CV_StsUnsupportedFormat, ""); break;
}
return Mat();
}
namespace colormap