Merge pull request #5774 from mshabunin:coverity_fixes

2015-12-09 13:32:44 +00:00
parent 05531cd7c4 2cda78ffac
commit 8e67f0ba84
10 changed files with 44 additions and 15 deletions
--- a/modules/features2d/test/test_descriptors_regression.cpp
+++ b/modules/features2d/test/test_descriptors_regression.cpp
@@ -162,7 +162,8 @@ protected:
            ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
        }

-        image.create( 50, 50, CV_8UC3 );
+        RNG rng;
+        image = cvtest::randomMat(rng, Size(50, 50), CV_8UC3, 0, 255, false);
        try
        {
            dextractor->compute( image, keypoints, descriptors );