From 1a42dd905caca03763b3a986dfbb8900af391bb5 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Fri, 9 Aug 2013 11:54:16 +0200 Subject: [PATCH] Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2 --- modules/imgproc/test/test_lsd.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/imgproc/test/test_lsd.cpp b/modules/imgproc/test/test_lsd.cpp index e18f32fa82..7d8b7f243e 100644 --- a/modules/imgproc/test/test_lsd.cpp +++ b/modules/imgproc/test/test_lsd.cpp @@ -113,7 +113,7 @@ TEST_F(Imgproc_LSD_ADV, whiteNoise) Ptr detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); detector->detect(test_image, lines); - if(uint(40) >= lines.size()) ++passedtests; + if(40u >= lines.size()) ++passedtests; } ASSERT_EQ(EPOCHS, passedtests); } @@ -126,7 +126,7 @@ TEST_F(Imgproc_LSD_ADV, constColor) Ptr detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); detector->detect(test_image, lines); - if(uint(0) == lines.size()) ++passedtests; + if(0u == lines.size()) ++passedtests; } ASSERT_EQ(EPOCHS, passedtests); } @@ -153,7 +153,7 @@ TEST_F(Imgproc_LSD_ADV, rotatedRect) Ptr detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); detector->detect(test_image, lines); - if(uint(2) <= lines.size()) ++passedtests; + if(2u <= lines.size()) ++passedtests; } ASSERT_EQ(EPOCHS, passedtests); } @@ -166,7 +166,7 @@ TEST_F(Imgproc_LSD_STD, whiteNoise) Ptr detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); detector->detect(test_image, lines); - if(uint(50) >= lines.size()) ++passedtests; + if(50u >= lines.size()) ++passedtests; } ASSERT_EQ(EPOCHS, passedtests); } @@ -179,7 +179,7 @@ TEST_F(Imgproc_LSD_STD, constColor) Ptr detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); detector->detect(test_image, lines); - if(uint(0) == lines.size()) ++passedtests; + if(0u == lines.size()) ++passedtests; } ASSERT_EQ(EPOCHS, passedtests); } @@ -206,7 +206,7 @@ TEST_F(Imgproc_LSD_STD, rotatedRect) Ptr detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); detector->detect(test_image, lines); - if(uint(4) <= lines.size()) ++passedtests; + if(4u <= lines.size()) ++passedtests; } ASSERT_EQ(EPOCHS, passedtests); } @@ -219,7 +219,7 @@ TEST_F(Imgproc_LSD_NONE, whiteNoise) Ptr detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); detector->detect(test_image, lines); - if(uint(50) >= lines.size()) ++passedtests; + if(50u >= lines.size()) ++passedtests; } ASSERT_EQ(EPOCHS, passedtests); } @@ -232,7 +232,7 @@ TEST_F(Imgproc_LSD_NONE, constColor) Ptr detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE); detector->detect(test_image, lines); - if(uint(0) == lines.size()) ++passedtests; + if(0u == lines.size()) ++passedtests; } ASSERT_EQ(EPOCHS, passedtests); } @@ -259,7 +259,7 @@ TEST_F(Imgproc_LSD_NONE, rotatedRect) Ptr detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE); detector->detect(test_image, lines); - if(uint(8) <= lines.size()) ++passedtests; + if(8u <= lines.size()) ++passedtests; } ASSERT_EQ(EPOCHS, passedtests); }