diff options
| author | fwarmerdam <fwarmerdam> | 2012-07-03 00:57:50 +0000 |
|---|---|---|
| committer | fwarmerdam <fwarmerdam> | 2012-07-03 00:57:50 +0000 |
| commit | 2c010183e1ab869d6fb2961da5859912ee55569d (patch) | |
| tree | 2ef4d6f5c0a52fe5d768303cea831ec6e49686e5 | |
| parent | 5a9c3657860b6c107a807197dbb2ee59ea02f84f (diff) | |
| download | libtiff-2c010183e1ab869d6fb2961da5859912ee55569d.tar.gz | |
Fix handling when writing RGBA jpeg compressed imagery (gdal #4732)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libtiff/tif_jpeg.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2012-07-02 Frank Warmerdam <warmerdam@google.com> + + * libtiff/tif_jpeg.c: Fix handling when writing RGBA jpeg compressed + imagery (http://trac.osgeo.org/gdal/ticket/4732) + 2012-06-20 Frank Warmerdam <warmerdam@google.com> * libtiff/tif_fax3.c: fix memory initialization of runs, only diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c index 3c8d3bf7..df53d193 100644 --- a/libtiff/tif_jpeg.c +++ b/libtiff/tif_jpeg.c @@ -1,4 +1,4 @@ -/* $Id: tif_jpeg.c,v 1.108 2012-06-05 03:24:30 fwarmerdam Exp $ */ +/* $Id: tif_jpeg.c,v 1.109 2012-07-03 00:57:50 fwarmerdam Exp $ */ /* * Copyright (c) 1994-1997 Sam Leffler @@ -1695,7 +1695,7 @@ JPEGPreEncode(TIFF* tif, uint16 s) } else { 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) + else if (td->td_photometric == PHOTOMETRIC_RGB && td->td_samplesperpixel == 3) sp->cinfo.c.in_color_space = JCS_RGB; else if (td->td_photometric == PHOTOMETRIC_SEPARATED && td->td_samplesperpixel == 4) sp->cinfo.c.in_color_space = JCS_CMYK; |