fix C++11 narrowing conversion errors

This commit is contained in:
Joel Dice
2012-06-01 11:46:56 -06:00
parent 587ae00d80
commit b78c772ffb
3 changed files with 27 additions and 21 deletions

View File

@ -76,7 +76,9 @@ Java_java_util_zip_Inflater_inflate
int r = inflate(s, Z_SYNC_FLUSH);
jint resultArray[3]
= { r, inputLength - s->avail_in, outputLength - s->avail_out };
= { r,
static_cast<jint>(inputLength - s->avail_in),
static_cast<jint>(outputLength - s->avail_out) };
free(in);
@ -147,7 +149,9 @@ Java_java_util_zip_Deflater_deflate
int r = deflate(s, finish ? Z_FINISH : Z_NO_FLUSH);
jint resultArray[3]
= { r, inputLength - s->avail_in, outputLength - s->avail_out };
= { r,
static_cast<jint>(inputLength - s->avail_in),
static_cast<jint>(outputLength - s->avail_out) };
free(in);