diff options
| author | Lee Howard <faxguy@howardsilvan.com> | 2011-01-04 02:42:45 +0000 |
|---|---|---|
| committer | Lee Howard <faxguy@howardsilvan.com> | 2011-01-04 02:42:45 +0000 |
| commit | af9694b76c370d9c39e1a21498caa89d85c52e64 (patch) | |
| tree | 89d34c1ce8791533269c4d2aacd07c3817b7962f | |
| parent | 4592a786cecc9d6fe6c9b7e7f3ca6504b9751925 (diff) | |
| download | libtiff-git-af9694b76c370d9c39e1a21498caa89d85c52e64.tar.gz | |
* libtiff/tif_jpeg.c: Fix regression with 3 band image caused by
commit on 2010-12-14 submitted by e-mail from
Even Rouault <even.rouault@mines-paris.org>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libtiff/tif_jpeg.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2011-01-03 Lee Howard <faxguy@howardsilvan.com> + + * libtiff/tif_jpeg.c: Fix regression with 3 band image caused by + commit on 2010-12-14 submitted by e-mail from + Even Rouault <even.rouault@mines-paris.org> + 2010-12-31 Olivier Paquet <olivier.paquet@gmail.com> * libtiff/tif_dirread.c: Allow reading directories where diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c index 051eba1b..3abeb6b2 100644 --- a/libtiff/tif_jpeg.c +++ b/libtiff/tif_jpeg.c @@ -1,4 +1,4 @@ -/* $Id: tif_jpeg.c,v 1.50.2.15 2010-12-14 23:59:42 faxguy Exp $ */ +/* $Id: tif_jpeg.c,v 1.50.2.16 2011-01-04 02:42:46 faxguy Exp $ */ /* * Copyright (c) 1994-1997 Sam Leffler @@ -1366,7 +1366,7 @@ JPEGPreEncode(TIFF* tif, tsample_t s) sp->cinfo.c.in_color_space = JCS_CMYK; else sp->cinfo.c.in_color_space = JCS_UNKNOWN; - if (!TIFFjpeg_set_colorspace(sp, (sp->cinfo.c.in_color_space == JCS_RGB) ? JCS_YCbCr : sp->cinfo.c.in_color_space)) + if (!TIFFjpeg_set_colorspace(sp, sp->cinfo.c.in_color_space)) return (0); /* jpeg_set_colorspace set all sampling factors to 1 */ } |