From 0a4ed2bc018d7b32b9d5f9b42ed51092c1dbba0d Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Thu, 8 Nov 2012 03:15:43 +0400 Subject: [PATCH] Fix Windows build warnings --- modules/core/test/test_mat.cpp | 8 ++++---- modules/core/test/test_math.cpp | 2 +- samples/cpp/tvl1_optical_flow.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/core/test/test_mat.cpp b/modules/core/test/test_mat.cpp index e30da7258d..cf045e720f 100644 --- a/modules/core/test/test_mat.cpp +++ b/modules/core/test/test_mat.cpp @@ -863,17 +863,17 @@ template int calcDiffElemCountImpl(const vector& mv, const Mat& m) { int diffElemCount = 0; - const size_t mChannels = m.channels(); + const int mChannels = m.channels(); for(int y = 0; y < m.rows; y++) { for(int x = 0; x < m.cols; x++) { const ElemType* mElem = &m.at(y,x*mChannels); - size_t loc = 0; + int loc = 0; for(size_t i = 0; i < mv.size(); i++) { const size_t mvChannel = mv[i].channels(); - const ElemType* mvElem = &mv[i].at(y,x*mvChannel); + const ElemType* mvElem = &mv[i].at(y,x*(int)mvChannel); for(size_t li = 0; li < mvChannel; li++) if(mElem[loc + li] != mvElem[li]) diffElemCount++; @@ -1020,7 +1020,7 @@ public: protected: 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); vector dst; diff --git a/modules/core/test/test_math.cpp b/modules/core/test/test_math.cpp index 5dd8450623..91ac425d56 100644 --- a/modules/core/test/test_math.cpp +++ b/modules/core/test/test_math.cpp @@ -2421,7 +2421,7 @@ protected: } 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) { ts->printf(cvtest::TS::LOG, "There are incorrect result angles (in degrees) (part of them is %f)\n", diff --git a/samples/cpp/tvl1_optical_flow.cpp b/samples/cpp/tvl1_optical_flow.cpp index db4bc0b2d2..d9a57a2163 100644 --- a/samples/cpp/tvl1_optical_flow.cpp +++ b/samples/cpp/tvl1_optical_flow.cpp @@ -55,7 +55,7 @@ static Vec3b computeColor(float fx, float 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 int k0 = static_cast(fk); @@ -66,8 +66,8 @@ static Vec3b computeColor(float fx, float fy) for (int b = 0; b < 3; b++) { - const float col0 = colorWheel[k0][b] / 255.0; - const float col1 = colorWheel[k1][b] / 255.0; + const float col0 = colorWheel[k0][b] / 255.f; + const float col1 = colorWheel[k1][b] / 255.f; float col = (1 - f) * col0 + f * col1; @@ -76,7 +76,7 @@ static Vec3b computeColor(float fx, float fy) else col *= .75; // out of range - pix[2 - b] = static_cast(255.0 * col); + pix[2 - b] = static_cast(255.f * col); } return pix; @@ -175,7 +175,7 @@ int main(int argc, const char* argv[]) Mat_ flow; OpticalFlowDual_TVL1 tvl1; - const double start = getTickCount(); + const double start = (double)getTickCount(); tvl1(frame0, frame1, flow); const double timeSec = (getTickCount() - start) / getTickFrequency(); cout << "calcOpticalFlowDual_TVL1 : " << timeSec << " sec" << endl;