From cfb6f46473777e444c8124318aa78d33aae64459 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 20 Mar 2017 15:46:06 -0700 Subject: Upgrade libtiff to 4.0.7. Change-Id: If3f67767f738b7f23230ca8c37c9af2e31696e82 Reviewed-on: https://pdfium-review.googlesource.com/3117 Commit-Queue: dsinclair Reviewed-by: dsinclair --- third_party/libtiff/tif_next.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'third_party/libtiff/tif_next.c') diff --git a/third_party/libtiff/tif_next.c b/third_party/libtiff/tif_next.c index b2076a0b01..08211788ac 100644 --- a/third_party/libtiff/tif_next.c +++ b/third_party/libtiff/tif_next.c @@ -1,4 +1,4 @@ -/* $Id: tif_next.c,v 1.16 2014-12-29 12:09:11 erouault Exp $ */ +/* $Id: tif_next.c,v 1.19 2016-09-04 21:32:56 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -72,7 +72,8 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) return (0); } for (row = buf; cc > 0 && occ > 0; occ -= scanline, row += scanline) { - n = *bp++, cc--; + n = *bp++; + cc--; switch (n) { case LITERALROW: /* @@ -103,10 +104,10 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) } default: { uint32 npixels = 0, grey; + tmsize_t op_offset = 0; uint32 imagewidth = tif->tif_dir.td_imagewidth; if( isTiled(tif) ) imagewidth = tif->tif_dir.td_tilewidth; - tmsize_t op_offset = 0; /* * The scanline is composed of a sequence of constant @@ -134,7 +135,8 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) } if (cc == 0) goto bad; - n = *bp++, cc--; + n = *bp++; + cc--; } break; } -- cgit v1.2.3