diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2003-07-08 16:40:46 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2003-07-08 16:40:46 +0000 |
| commit | ab5312a5854b4fdea253f1d6c28cc15c7dfdae5f (patch) | |
| tree | a886f2037d18965de767c114f48f1ecf7752e557 /libtiff/tif_predict.c | |
| parent | 97b4f61ad624516006bb4a66fcf5c5f85f7bcf24 (diff) | |
| download | libtiff-git-ab5312a5854b4fdea253f1d6c28cc15c7dfdae5f.tar.gz | |
avoid casting warnings at /W4
Diffstat (limited to 'libtiff/tif_predict.c')
| -rw-r--r-- | libtiff/tif_predict.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libtiff/tif_predict.c b/libtiff/tif_predict.c index 10f02b10..fc2d4d9e 100644 --- a/libtiff/tif_predict.c +++ b/libtiff/tif_predict.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_predict.c,v 1.3 2002-02-24 15:03:32 warmerda Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_predict.c,v 1.4 2003-07-08 16:40:46 warmerda Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -174,9 +174,9 @@ horAcc8(TIFF* tif, tidata_t cp0, tsize_t cc) u_int cb = cp[2]; do { cc -= 3, cp += 3; - cp[0] = (cr += cp[0]); - cp[1] = (cg += cp[1]); - cp[2] = (cb += cp[2]); + cp[0] = (char) (cr += cp[0]); + cp[1] = (char) (cg += cp[1]); + cp[2] = (char) (cb += cp[2]); } while ((int32) cc > 0); } else if (stride == 4) { u_int cr = cp[0]; @@ -185,14 +185,14 @@ horAcc8(TIFF* tif, tidata_t cp0, tsize_t cc) u_int ca = cp[3]; do { cc -= 4, cp += 4; - cp[0] = (cr += cp[0]); - cp[1] = (cg += cp[1]); - cp[2] = (cb += cp[2]); - cp[3] = (ca += cp[3]); + cp[0] = (char) (cr += cp[0]); + cp[1] = (char) (cg += cp[1]); + cp[2] = (char) (cb += cp[2]); + cp[3] = (char) (ca += cp[3]); } while ((int32) cc > 0); } else { do { - REPEAT4(stride, cp[stride] += *cp; cp++) + REPEAT4(stride, cp[stride] = (char) (cp[stride] + *cp); cp++) cc -= stride; } while ((int32) cc > 0); } |