diff options
| author | Matthieu Darbois <mayeut@users.noreply.github.com> | 2016-05-01 18:05:46 +0200 |
|---|---|---|
| committer | Matthieu Darbois <mayeut@users.noreply.github.com> | 2016-05-01 18:05:46 +0200 |
| commit | b51d088267cb88eb95555ea047755120e36c511b (patch) | |
| tree | 104a5d93067255fe4d89040c982f423ff3b333c7 /thirdparty/libtiff/tif_fax3.c | |
| parent | 4f11e89c803fd9a332698bc36338a4be87c6d199 (diff) | |
Update to libtiff-4.0.6 (#764)
Diffstat (limited to 'thirdparty/libtiff/tif_fax3.c')
| -rw-r--r-- | thirdparty/libtiff/tif_fax3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/thirdparty/libtiff/tif_fax3.c b/thirdparty/libtiff/tif_fax3.c index 2b2dccd0..bbe72555 100644 --- a/thirdparty/libtiff/tif_fax3.c +++ b/thirdparty/libtiff/tif_fax3.c @@ -1,4 +1,4 @@ -/* $Id: tif_fax3.c,v 1.74 2012-06-21 02:01:31 fwarmerdam Exp $ */ +/* $Id: tif_fax3.c,v 1.75 2015-08-30 20:49:55 erouault Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -442,8 +442,9 @@ _TIFFFax3fillruns(unsigned char* buf, uint32* runs, uint32* erun, uint32 lastx) FILL(n, cp); run &= 7; } + /* Explicit 0xff masking to make icc -check=conversions happy */ if (run) - cp[0] |= 0xff00 >> run; + cp[0] = (unsigned char)((cp[0] | (0xff00 >> run))&0xff); } else cp[0] |= _fillmasks[run]>>bx; x += runs[1]; |