summaryrefslogtreecommitdiff
path: root/libtiff/tif_webp.c
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-10-05 22:03:24 +0200
committerEven Rouault <even.rouault@spatialys.com>2018-10-05 22:03:24 +0200
commit6aae33f7584e2378bdda215b28a3156173e22d07 (patch)
tree669c863a7da64bca808a6bbdb203fd4f38ea52a2 /libtiff/tif_webp.c
parent1a926533b8aae2028ac35bd676feca1f9fca5a61 (diff)
downloadlibtiff-git-6aae33f7584e2378bdda215b28a3156173e22d07.tar.gz
WEBP codec: initialize nSamples in TWebPSetupDecode() and TWebPSetupEncode()
Diffstat (limited to 'libtiff/tif_webp.c')
-rw-r--r--libtiff/tif_webp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libtiff/tif_webp.c b/libtiff/tif_webp.c
index a7d3c6f8..36c3b747 100644
--- a/libtiff/tif_webp.c
+++ b/libtiff/tif_webp.c
@@ -201,6 +201,8 @@ TWebPSetupDecode(TIFF* tif)
WebPState* sp = DecoderState(tif);
assert(sp != NULL);
+ sp->nSamples = tif->tif_dir.td_samplesperpixel;
+
// check band count
if ( sp->nSamples != 3
#if WEBP_ENCODER_ABI_VERSION >= 0x0100
@@ -310,6 +312,8 @@ TWebPSetupEncode(TIFF* tif)
WebPState* sp = EncoderState(tif);
assert(sp != NULL);
+ sp->nSamples = tif->tif_dir.td_samplesperpixel;
+
// check band count
if ( sp->nSamples != 3
#if WEBP_ENCODER_ABI_VERSION >= 0x0100
@@ -597,7 +601,6 @@ int
TIFFInitWebP(TIFF* tif, int scheme)
{
static const char module[] = "TIFFInitWebP";
- uint16 nSamples = tif->tif_dir.td_samplesperpixel;
WebPState* sp;
assert( scheme == COMPRESSION_WEBP );
@@ -631,7 +634,7 @@ TIFFInitWebP(TIFF* tif, int scheme)
sp->quality_level = 75.0f; /* default comp. level */
sp->lossless = 0; // default to false
sp->state = 0;
- sp->nSamples = nSamples;
+ sp->nSamples = 0;
sp->psDecoder = NULL;
sp->last_y = 0;