diff options
| author | Antonin Descampe <antonin@gmail.com> | 2016-05-04 00:29:25 +0200 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2016-05-04 00:29:25 +0200 |
| commit | bdb4bfaf05087c82e81fefb6e8f8e7308b6dff09 (patch) | |
| tree | f0f181c57335115ef9f6f30e2f96f6a649c4a8bc | |
| parent | 51a51bdd031fc11fd0c9d29a9dfdecc9c3fe8b52 (diff) | |
| parent | 44a499f2acf10b55172d07abf387e5a579a585f7 (diff) | |
Merge branch 'master' into fix-bypass-restartfix-bypass-restart
| -rw-r--r-- | thirdparty/liblcms2/src/lcms2_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/thirdparty/liblcms2/src/lcms2_internal.h b/thirdparty/liblcms2/src/lcms2_internal.h index e1219036..695d4b8d 100644 --- a/thirdparty/liblcms2/src/lcms2_internal.h +++ b/thirdparty/liblcms2/src/lcms2_internal.h @@ -101,7 +101,7 @@ // A fast way to convert from/to 16 <-> 8 bits #define FROM_8_TO_16(rgb) (cmsUInt16Number) ((((cmsUInt16Number) (rgb)) << 8)|(rgb)) -#define FROM_16_TO_8(rgb) (cmsUInt8Number) ((((rgb) * 65281 + 8388608) >> 24) & 0xFF) +#define FROM_16_TO_8(rgb) (cmsUInt8Number) ((((cmsUInt32Number)(rgb) * 65281U + 8388608U) >> 24) & 0xFFU) // Code analysis is broken on asserts #ifdef _MSC_VER |