diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-04-08 08:18:30 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-04-08 08:18:30 +0000 |
| commit | f9fc01c331aa901375ff084b7421559f878ccf0b (patch) | |
| tree | ba6e241689a090013b5b0f116dbadc70c17f75e5 /libtiff/tif_luv.c | |
| parent | bf3589510740d30f231bdbc340502622cbcc5984 (diff) | |
| parent | 1fb9e731ef3e4ceb7af128ce298adb271088064f (diff) | |
| download | libtiff-git-f9fc01c331aa901375ff084b7421559f878ccf0b.tar.gz | |
Merge branch 'bug2848' into 'master'
tif_luv.c: LogLuvSetupEncode() error must return 0
See merge request libtiff/libtiff!72
Diffstat (limited to 'libtiff/tif_luv.c')
| -rw-r--r-- | libtiff/tif_luv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c index 192fa261..6a63eadc 100644 --- a/libtiff/tif_luv.c +++ b/libtiff/tif_luv.c @@ -1512,7 +1512,7 @@ LogLuvSetupEncode(TIFF* tif) switch (td->td_photometric) { case PHOTOMETRIC_LOGLUV: if (!LogLuvInitState(tif)) - break; + return (0); if (td->td_compression == COMPRESSION_SGILOG24) { tif->tif_encoderow = LogLuvEncode24; switch (sp->user_datafmt) { @@ -1545,7 +1545,7 @@ LogLuvSetupEncode(TIFF* tif) break; case PHOTOMETRIC_LOGL: if (!LogL16InitState(tif)) - break; + return (0); tif->tif_encoderow = LogL16Encode; switch (sp->user_datafmt) { case SGILOGDATAFMT_FLOAT: @@ -1561,7 +1561,7 @@ LogLuvSetupEncode(TIFF* tif) TIFFErrorExt(tif->tif_clientdata, module, "Inappropriate photometric interpretation %d for SGILog compression; %s", td->td_photometric, "must be either LogLUV or LogL"); - break; + return (0); } sp->encoder_state = 1; return (1); |