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

Fix Windows build warnings

Browse Source
This commit is contained in:
Andrey Kamaev 2012-11-08 03:15:43 +04:00
parent 4d059e9e5b
commit 0a4ed2bc01
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/test/test_mat.cpp
View File

@ -863,17 +863,17 @@ template <class ElemType>
int calcDiffElemCountImpl(const vector<Mat>& mv, const Mat& m) int calcDiffElemCountImpl(const vector<Mat>& mv, const Mat& m)
{ {
int diffElemCount = 0; int diffElemCount = 0;
const size_t mChannels = m.channels(); const int mChannels = m.channels();
for(int y = 0; y < m.rows; y++) for(int y = 0; y < m.rows; y++)
{ {
for(int x = 0; x < m.cols; x++) for(int x = 0; x < m.cols; x++)
{ {
const ElemType* mElem = &m.at<ElemType>(y,x*mChannels); const ElemType* mElem = &m.at<ElemType>(y,x*mChannels);
size_t loc = 0; int loc = 0;
for(size_t i = 0; i < mv.size(); i++) for(size_t i = 0; i < mv.size(); i++)
{ {
const size_t mvChannel = mv[i].channels(); const size_t mvChannel = mv[i].channels();
const ElemType* mvElem = &mv[i].at<ElemType>(y,x*mvChannel); const ElemType* mvElem = &mv[i].at<ElemType>(y,x*(int)mvChannel);
for(size_t li = 0; li < mvChannel; li++) for(size_t li = 0; li < mvChannel; li++)
if(mElem[loc + li] != mvElem[li]) if(mElem[loc + li] != mvElem[li])
diffElemCount++; diffElemCount++;
@ -1020,7 +1020,7 @@ public:
protected: protected:
virtual int run_case(int depth, size_t channels, const Size& size, RNG& rng) virtual int run_case(int depth, size_t channels, const Size& size, RNG& rng)
{ {
Mat src(size, CV_MAKETYPE(depth, channels)); Mat src(size, CV_MAKETYPE(depth, (int)channels));
rng.fill(src, RNG::UNIFORM, 0, 100, true); rng.fill(src, RNG::UNIFORM, 0, 100, true);
vector<Mat> dst; vector<Mat> dst;

2
modules/core/test/test_math.cpp
View File

@ -2421,7 +2421,7 @@ protected:
} }
Mat diff = abs(anglesInDegrees - resInDeg); Mat diff = abs(anglesInDegrees - resInDeg);
int errDegCount = diff.total() - countNonZero((diff < maxAngleDiff) | ((360 - diff) < maxAngleDiff)); size_t errDegCount = diff.total() - countNonZero((diff < maxAngleDiff) | ((360 - diff) < maxAngleDiff));
if(errDegCount > 0) if(errDegCount > 0)
{ {
ts->printf(cvtest::TS::LOG, "There are incorrect result angles (in degrees) (part of them is %f)\n", ts->printf(cvtest::TS::LOG, "There are incorrect result angles (in degrees) (part of them is %f)\n",

10
samples/cpp/tvl1_optical_flow.cpp
View File

@ -55,7 +55,7 @@ static Vec3b computeColor(float fx, float fy)
} }
const float rad = sqrt(fx * fx + fy * fy); const float rad = sqrt(fx * fx + fy * fy);
const float a = atan2(-fy, -fx) / CV_PI; const float a = atan2(-fy, -fx) / (float)CV_PI;
const float fk = (a + 1.0f) / 2.0f * (NCOLS - 1); const float fk = (a + 1.0f) / 2.0f * (NCOLS - 1);
const int k0 = static_cast<int>(fk); const int k0 = static_cast<int>(fk);
@ -66,8 +66,8 @@ static Vec3b computeColor(float fx, float fy)
for (int b = 0; b < 3; b++) for (int b = 0; b < 3; b++)
{ {
const float col0 = colorWheel[k0][b] / 255.0; const float col0 = colorWheel[k0][b] / 255.f;
const float col1 = colorWheel[k1][b] / 255.0; const float col1 = colorWheel[k1][b] / 255.f;
float col = (1 - f) * col0 + f * col1; float col = (1 - f) * col0 + f * col1;
@ -76,7 +76,7 @@ static Vec3b computeColor(float fx, float fy)
else else
col *= .75; // out of range col *= .75; // out of range
pix[2 - b] = static_cast<int>(255.0 * col); pix[2 - b] = static_cast<uchar>(255.f * col);
} }
return pix; return pix;
@ -175,7 +175,7 @@ int main(int argc, const char* argv[])
Mat_<Point2f> flow; Mat_<Point2f> flow;
OpticalFlowDual_TVL1 tvl1; OpticalFlowDual_TVL1 tvl1;
const double start = getTickCount(); const double start = (double)getTickCount();
tvl1(frame0, frame1, flow); tvl1(frame0, frame1, flow);
const double timeSec = (getTickCount() - start) / getTickFrequency(); const double timeSec = (getTickCount() - start) / getTickFrequency();
cout << "calcOpticalFlowDual_TVL1 : " << timeSec << " sec" << endl; cout << "calcOpticalFlowDual_TVL1 : " << timeSec << " sec" << endl;