On Sat, Feb 8, 2014 at 11:04 PM, Justin Ruggles
<[email protected]> wrote:
> The spec does not specify that 0 is an error condition, and there
> are samples which use 0 when the whole image is in one strip.
Is it worth adding a test for those?
> ---
> libavcodec/tiff.c | 11 +++--------
> 1 files changed, 3 insertions(+), 8 deletions(-)
>
Probably ok.
Vittorio
> diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
> index 0cfa4c4..e7f1866 100644
> --- a/libavcodec/tiff.c
> +++ b/libavcodec/tiff.c
> @@ -418,14 +418,9 @@ static int tiff_decode_tag(TiffContext *s)
> }
> break;
> case TIFF_ROWSPERSTRIP:
> - if (type == TIFF_LONG && value == UINT_MAX)
> - value = s->avctx->height;
> - if (value < 1) {
> - av_log(s->avctx, AV_LOG_ERROR,
> - "Incorrect value of rows per strip\n");
> - return AVERROR_INVALIDDATA;
> - }
> - s->rps = value;
> + if (!value || (type == TIFF_LONG && value == UINT_MAX))
> + value = s->height;
> + s->rps = FFMIN(value, s->height);
> break;
> case TIFF_STRIP_OFFS:
> if (count == 1) {
> --
> 1.7.1
>
> _______________________________________________
> libav-devel mailing list
> [email protected]
> https://lists.libav.org/mailman/listinfo/libav-devel
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
