From 44a1e796219f7ef60aa225f108dec53f6dc41550 Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Mon, 16 Apr 2012 15:00:00 +0000
Subject: [PATCH] Fixed build warnings
---
modules/ml/test/test_emknearestkmeans.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/modules/ml/test/test_emknearestkmeans.cpp b/modules/ml/test/test_emknearestkmeans.cpp
index 911b2d9c48..0990ca02cc 100644
--- a/modules/ml/test/test_emknearestkmeans.cpp
+++ b/modules/ml/test/test_emknearestkmeans.cpp
@@ -158,8 +158,7 @@ bool getLabelsMap( const Mat& labels, const vector<int>& sizes, vector<int>& lab
startIndex += sizes[clusterIndex];
int cls = maxIdx( count );
- if(checkClusterUniq)
- CV_Assert( !buzy[cls] );
+ CV_Assert( !checkClusterUniq || !buzy[cls] );
labelsMap[clusterIndex] = cls;
@@ -611,8 +610,8 @@ protected:
RNG rng(0);
for(size_t i = 0; i < trainSamplesMask.size(); i++)
{
- int i1 = rng(trainSamplesMask.size());
- int i2 = rng(trainSamplesMask.size());
+ int i1 = rng(static_cast<unsigned>(trainSamplesMask.size()));
+ int i2 = rng(static_cast<unsigned>(trainSamplesMask.size()));
std::swap(trainSamplesMask[i1], trainSamplesMask[i2]);
}