dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 04:18:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

UpdateHistogramCost: avoid implicit double->float

Browse Source 
all the functions involved return double and later these locals are used
in double calculations. fixes a vs build warning

Change-Id: Idb547104ef00b48c71c124a774ef6f2ec5f30f14
This commit is contained in:
James Zern 2014-03-14 11:18:52 -07:00
parent 1c58526fe1
commit cf821c821f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/enc/histogram.c
View File

@ -423,9 +423,10 @@ static void UpdateDominantCostRange(
} }
static void UpdateHistogramCost(VP8LHistogram* const h) { static void UpdateHistogramCost(VP8LHistogram* const h) {
const float alpha_cost = PopulationCost(h->alpha_, 256); const double alpha_cost = PopulationCost(h->alpha_, 256);
const float distance_cost = PopulationCost(h->distance_, NUM_DISTANCE_CODES) + const double distance_cost =
ExtraCost(h->distance_, NUM_DISTANCE_CODES); PopulationCost(h->distance_, NUM_DISTANCE_CODES) +
ExtraCost(h->distance_, NUM_DISTANCE_CODES);
const int num_codes = VP8LHistogramNumCodes(h->palette_code_bits_); const int num_codes = VP8LHistogramNumCodes(h->palette_code_bits_);
h->literal_cost_ = PopulationCost(h->literal_, num_codes) + h->literal_cost_ = PopulationCost(h->literal_, num_codes) +
ExtraCost(h->literal_ + 256, NUM_LENGTH_CODES); ExtraCost(h->literal_ + 256, NUM_LENGTH_CODES);