diff options
| author | Colin Cross <ccross@android.com> | 2016-12-05 19:38:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-05 19:38:10 +0000 |
| commit | 17c0c8ad09c562fc9e180cf9ec1f1d86ed241f9f (patch) | |
| tree | 2126a70978b45392e30be644e2bdc4f3b1a2ca74 | |
| parent | ee6ff1f0c37f080e957f9f8c47e62caf75540bb1 (diff) | |
| parent | 9d57a6b695b5976d5d2255563d4e838623d5799d (diff) | |
| download | libjpeg-turbo-17c0c8ad09c562fc9e180cf9ec1f1d86ed241f9f.tar.gz | |
Fix sign mismatch comparison warnings am: 98125af3c9 am: 4d389c2c95 am: 45f6b04239
am: 9d57a6b695
Change-Id: I08208808f77eeea2a3829b7b68203364522d5421
| -rw-r--r-- | README.android | 7 | ||||
| -rw-r--r-- | rdppm.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/README.android b/README.android index d7140fe2..0fa01750 100644 --- a/README.android +++ b/README.android @@ -28,4 +28,9 @@ the extra underscore). Fix broken build with NDK platforms < android-21 Cherry picked from upstream: -https://github.com/libjpeg-turbo/libjpeg-turbo/commit/dfefba77520ded5c5fd4864e76352a5f3eb23e74
\ No newline at end of file +https://github.com/libjpeg-turbo/libjpeg-turbo/commit/dfefba77520ded5c5fd4864e76352a5f3eb23e74 + +(4) rdppm.c +Fix sign mismatch comparison warnings +Cherry picked from upstream: +https://github.com/libjpeg-turbo/libjpeg-turbo/commit/d22fd541bf9dd87889c25909e19a640a580bcad7 @@ -251,7 +251,7 @@ get_word_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) ptr = source->pub.buffer[0]; bufferptr = source->iobuffer; for (col = cinfo->image_width; col > 0; col--) { - register int temp; + register unsigned int temp; temp = UCH(*bufferptr++) << 8; temp |= UCH(*bufferptr++); if (temp > maxval) @@ -278,7 +278,7 @@ get_word_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) ptr = source->pub.buffer[0]; bufferptr = source->iobuffer; for (col = cinfo->image_width; col > 0; col--) { - register int temp; + register unsigned int temp; temp = UCH(*bufferptr++) << 8; temp |= UCH(*bufferptr++); if (temp > maxval) |