dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-02-13 15:32:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "fix warning about size_t -> int conversion"

Browse Source
This commit is contained in:
Pascal Massimino 2014-04-27 01:07:03 -07:00 committed by Gerrit Code Review
commit ad900abddd
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/enc/histogram.c
View File

@ -47,9 +47,11 @@ static void HistogramCopy(const VP8LHistogram* const src,
dst->literal_ = dst_literal; dst->literal_ = dst_literal;
} }
int VP8LGetHistogramSize(int cache_bits) { uint64_t VP8LGetHistogramSize(int cache_bits) {
const uint64_t literal_size = VP8LHistogramNumCodes(cache_bits); const uint64_t literal_size = VP8LHistogramNumCodes(cache_bits);
return sizeof(VP8LHistogram) + sizeof(int) * literal_size; const uint64_t total_size = (uint64_t)sizeof(VP8LHistogram)
+ literal_size * sizeof(int);
return total_size;
} }
void VP8LFreeHistogram(VP8LHistogram* const histo) { void VP8LFreeHistogram(VP8LHistogram* const histo) {
@ -288,7 +290,7 @@ double VP8LHistogramEstimateBitsBulk(const VP8LHistogram* const p) {
static void HistogramAdd(const VP8LHistogram* const in, static void HistogramAdd(const VP8LHistogram* const in,
VP8LHistogram* const out) { VP8LHistogram* const out) {
int i; int i;
int literal_size = VP8LHistogramNumCodes(out->palette_code_bits_); const int literal_size = VP8LHistogramNumCodes(in->palette_code_bits_);
assert(in->palette_code_bits_ == out->palette_code_bits_); assert(in->palette_code_bits_ == out->palette_code_bits_);
for (i = 0; i < literal_size; ++i) { for (i = 0; i < literal_size; ++i) {
out->literal_[i] += in->literal_[i]; out->literal_[i] += in->literal_[i];
@ -350,9 +352,7 @@ static double HistogramAddEval(const VP8LHistogram* const a,
cost_threshold += sum_cost; cost_threshold += sum_cost;
if (GetCombinedHistogramEntropy(a, b, cost_threshold, &cost)) { if (GetCombinedHistogramEntropy(a, b, cost_threshold, &cost)) {
int literal_size; const int literal_size = VP8LHistogramNumCodes(a->palette_code_bits_);
out->palette_code_bits_ = a->palette_code_bits_;
literal_size = VP8LHistogramNumCodes(out->palette_code_bits_);
for (i = 0; i < literal_size; ++i) { for (i = 0; i < literal_size; ++i) {
out->literal_[i] = a->literal_[i] + b->literal_[i]; out->literal_[i] = a->literal_[i] + b->literal_[i];
} }
@ -365,6 +365,7 @@ static double HistogramAddEval(const VP8LHistogram* const a,
out->alpha_[i] = a->alpha_[i] + b->alpha_[i]; out->alpha_[i] = a->alpha_[i] + b->alpha_[i];
} }
out->bit_cost_ = cost; out->bit_cost_ = cost;
out->palette_code_bits_ = a->palette_code_bits_;
} }
return cost - sum_cost; return cost - sum_cost;

2
src/enc/histogram.h
View File

@ -63,7 +63,7 @@ void VP8LHistogramCreate(VP8LHistogram* const p,
int palette_code_bits); int palette_code_bits);
// Return the size of the histogram for a given palette_code_bits. // Return the size of the histogram for a given palette_code_bits.
int VP8LGetHistogramSize(int palette_code_bits); uint64_t VP8LGetHistogramSize(int palette_code_bits);
// Set the palette_code_bits and reset the stats. // Set the palette_code_bits and reset the stats.
void VP8LHistogramInit(VP8LHistogram* const p, int palette_code_bits); void VP8LHistogramInit(VP8LHistogram* const p, int palette_code_bits);