Merge pull request opencv#9297 from alalek:akaze_remove_rand

alalek · alalek · commit 15aa0df23caa · 2017-08-03T09:21:22.000Z
diff --git a/modules/features2d/src/kaze/AKAZEFeatures.cpp b/modules/features2d/src/kaze/AKAZEFeatures.cpp
@@ -2133,7 +2133,7 @@ void generateDescriptorSubsample(Mat& sampleList, Mat& comparisons, int nbits,
     }
   }
 
-  srand(1024);
+  RNG rng(1024);
   Mat_<int> comps = Mat_<int>(nchannels * (int)ceil(nbits / (float)nchannels), 2);
   comps = 1000;
 
@@ -2145,7 +2145,7 @@ void generateDescriptorSubsample(Mat& sampleList, Mat& comparisons, int nbits,
   samples = -1;
 
   for (int i = 0; i < npicks; i++) {
-    int k = rand() % (fullM.rows - i);
+    int k = rng(fullM.rows - i);
     if (i < 6) {
       // Force use of the coarser grid values and comparisons
       k = i;

Original file line number	Diff line number	Diff line change
`@@ -2133,7 +2133,7 @@ void generateDescriptorSubsample(Mat& sampleList, Mat& comparisons, int nbits,`
`2133`	`2133`	`}`
`2134`	`2134`	`}`
`2135`	`2135`
`2136`		`- srand(1024);`
	`2136`	`+ RNG rng(1024);`
`2137`	`2137`	`Mat_<int> comps = Mat_<int>(nchannels * (int)ceil(nbits / (float)nchannels), 2);`
`2138`	`2138`	`comps = 1000;`
`2139`	`2139`
`@@ -2145,7 +2145,7 @@ void generateDescriptorSubsample(Mat& sampleList, Mat& comparisons, int nbits,`
`2145`	`2145`	`samples = -1;`
`2146`	`2146`
`2147`	`2147`	`for (int i = 0; i < npicks; i++) {`
`2148`		`- int k = rand() % (fullM.rows - i);`
	`2148`	`+ int k = rng(fullM.rows - i);`
`2149`	`2149`	`if (i < 6) {`
`2150`	`2150`	`// Force use of the coarser grid values and comparisons`
`2151`	`2151`	`k = i;`