mirror of
https://github.com/webmproject/libwebp.git
synced 2024-12-27 06:08:21 +01:00
{histogram,predictor}_enc: quiet int -> float warnings
after:
a19a25bb
Replace doubles by floats in lossless misc cost estimations.
Change-Id: Idc5888b40ce5b591b72c6e51a188a9ab8c5d9823
This commit is contained in:
parent
a19a25bb03
commit
dc3841e077
@ -256,7 +256,7 @@ static WEBP_INLINE float BitsEntropyRefine(const VP8LBitEntropy* entropy) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
float min_limit = 2 * entropy->sum - entropy->max_val;
|
float min_limit = 2.f * entropy->sum - entropy->max_val;
|
||||||
min_limit = mix * min_limit + (1.f - mix) * entropy->entropy;
|
min_limit = mix * min_limit + (1.f - mix) * entropy->entropy;
|
||||||
return (entropy->entropy < min_limit) ? min_limit : entropy->entropy;
|
return (entropy->entropy < min_limit) ? min_limit : entropy->entropy;
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ static float PredictionCostSpatial(const int counts[256], int weight_0,
|
|||||||
float exp_val) {
|
float exp_val) {
|
||||||
const int significant_symbols = 256 >> 4;
|
const int significant_symbols = 256 >> 4;
|
||||||
const float exp_decay_factor = 0.6f;
|
const float exp_decay_factor = 0.6f;
|
||||||
float bits = weight_0 * counts[0];
|
float bits = (float)weight_0 * counts[0];
|
||||||
int i;
|
int i;
|
||||||
for (i = 1; i < significant_symbols; ++i) {
|
for (i = 1; i < significant_symbols; ++i) {
|
||||||
bits += exp_val * (counts[i] + counts[256 - i]);
|
bits += exp_val * (counts[i] + counts[256 - i]);
|
||||||
|
Loading…
Reference in New Issue
Block a user