Merge pull request opencv#10343 from tomoaki0705:suppressWarningEncoding

vpisarev · vpisarev · commit e29de5dd2bea · 2017-12-18T10:53:24.000Z
diff --git a/3rdparty/libwebp/src/enc/histogram_enc.c b/3rdparty/libwebp/src/enc/histogram_enc.c
@@ -605,7 +605,7 @@ static void HistogramCombineEntropyBin(VP8LHistogramSet* const image_histo,
 }
 
 // Implement a Lehmer random number generator with a multiplicative constant of
-// 48271 and a modulo constant of 2^31 − 1.
+// 48271 and a modulo constant of 2^31 - 1.
 static uint32_t MyRand(uint32_t* const seed) {
   *seed = (uint32_t)(((uint64_t)(*seed) * 48271u) % 2147483647u);
   assert(*seed > 0);

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ static void HistogramCombineEntropyBin(VP8LHistogramSet* const image_histo,`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`// Implement a Lehmer random number generator with a multiplicative constant of`
`608`		`-// 48271 and a modulo constant of 2^31 − 1.`
	`608`	`+// 48271 and a modulo constant of 2^31 - 1.`
`609`	`609`	`static uint32_t MyRand(uint32_t* const seed) {`
`610`	`610`	`seed = (uint32_t)(((uint64_t)(seed) * 48271u) % 2147483647u);`
`611`	`611`	`assert(*seed > 0);`