fix type and conversion warnings

avoids warning messages on MSVC mainly

Change-Id: I80f281d5263a54c6a224bb095175497cf2f4ce1e
This commit is contained in:
Pascal Massimino 2012-07-25 14:18:21 -07:00
parent 7d853d79dc
commit a7cc729126
2 changed files with 7 additions and 7 deletions

View File

@ -268,7 +268,7 @@ static int EncodeAlpha(VP8Encoder* const enc,
*output_size = VP8BitWriterSize(&bw); *output_size = VP8BitWriterSize(&bw);
*output = VP8BitWriterBuf(&bw); *output = VP8BitWriterBuf(&bw);
if (pic->stats != NULL) { // need stats? if (pic->stats != NULL) { // need stats?
pic->stats->coded_size += *output_size; pic->stats->coded_size += (int)(*output_size);
enc->sse_[3] = sse; enc->sse_[3] = sse;
} }
} }

View File

@ -1030,7 +1030,7 @@ WebPEncodingError VP8LEncodeStream(const WebPConfig* const config,
stats->transform_bits = enc->transform_bits_; stats->transform_bits = enc->transform_bits_;
stats->cache_bits = enc->cache_bits_; stats->cache_bits = enc->cache_bits_;
stats->palette_size = enc->palette_size_; stats->palette_size = enc->palette_size_;
stats->lossless_size = VP8LBitWriterNumBytes(bw) - byte_position; stats->lossless_size = (int)(VP8LBitWriterNumBytes(bw) - byte_position);
} }
Error: Error:
@ -1065,11 +1065,11 @@ int VP8LEncodeImage(const WebPConfig* const config,
if (picture->stats != NULL) { if (picture->stats != NULL) {
WebPAuxStats* const stats = picture->stats; WebPAuxStats* const stats = picture->stats;
memset(stats, 0, sizeof(*stats)); memset(stats, 0, sizeof(*stats));
stats->PSNR[0] = 99.; stats->PSNR[0] = 99.f;
stats->PSNR[1] = 99.; stats->PSNR[1] = 99.f;
stats->PSNR[2] = 99.; stats->PSNR[2] = 99.f;
stats->PSNR[3] = 99.; stats->PSNR[3] = 99.f;
stats->PSNR[4] = 99.; stats->PSNR[4] = 99.f;
} }
// Write image size. // Write image size.