cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Another regression fix.

Browse Source
This commit is contained in:
Lee Howard 2011-01-04 02:52:00 +00:00
parent 863cbb8823
commit 32f670caaa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,7 +1,7 @@
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
* libtiff/tif_jpeg.c: Fix regressions with 2 and 3 band images
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>

4
libtiff/tif_jpeg.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_jpeg.c,v 1.97 2011-01-04 02:38:52 faxguy Exp $ */
/* $Id: tif_jpeg.c,v 1.98 2011-01-04 02:52:00 faxguy Exp $ */
/*
* Copyright (c) 1994-1997 Sam Leffler
@ -1701,7 +1701,7 @@ JPEGPreEncode(TIFF* tif, uint16 s)
sp->cinfo.c.comp_info[0].h_samp_factor = sp->h_sampling;
sp->cinfo.c.comp_info[0].v_samp_factor = sp->v_sampling;
} else {
if (td->td_photometric == PHOTOMETRIC_MINISWHITE || td->td_photometric == PHOTOMETRIC_MINISBLACK)
if ((td->td_photometric == PHOTOMETRIC_MINISWHITE || td->td_photometric == PHOTOMETRIC_MINISBLACK) && td->td_samplesperpixel == 1)
sp->cinfo.c.in_color_space = JCS_GRAYSCALE;
else if (td->td_photometric == PHOTOMETRIC_RGB)
sp->cinfo.c.in_color_space = JCS_RGB;