diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:51 +0200 |
| commit | 175dcf6e565bd638601697bfa6becd3a3321a0de (patch) | |
| tree | d269963f5202a974248a38a8f84463c4bb9fdce9 /src/3rdparty/libtiff/libtiff/tif_close.c | |
| parent | 834bb773e36c974748f7ee947b4f07088ee6f5fb (diff) | |
| parent | c7a6a451a5c277556e28dfb3b4b943719cdda7ff (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I182b9e5f4a9283c289bbe816868f000ad07b15f4
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_close.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_close.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_close.c b/src/3rdparty/libtiff/libtiff/tif_close.c index 13d2bab..a0cb661 100644 --- a/src/3rdparty/libtiff/libtiff/tif_close.c +++ b/src/3rdparty/libtiff/libtiff/tif_close.c @@ -1,4 +1,4 @@ -/* $Id: tif_close.c,v 1.19 2010-03-10 18:56:48 bfriesen Exp $ */ +/* $Id: tif_close.c,v 1.21 2016-01-23 21:20:34 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -36,7 +36,7 @@ /** * Auxiliary function to free the TIFF structure. Given structure will be - * completetly freed, so you should save opened file handle and pointer + * completely freed, so you should save opened file handle and pointer * to the close procedure in external variables before calling * _TIFFCleanup(), if you will need these ones to close the file. * @@ -62,11 +62,11 @@ TIFFCleanup(TIFF* tif) */ while( tif->tif_clientinfo ) { - TIFFClientInfoLink *link = tif->tif_clientinfo; + TIFFClientInfoLink *psLink = tif->tif_clientinfo; - tif->tif_clientinfo = link->next; - _TIFFfree( link->name ); - _TIFFfree( link ); + tif->tif_clientinfo = psLink->next; + _TIFFfree( psLink->name ); + _TIFFfree( psLink ); } if (tif->tif_rawdata && (tif->tif_flags&TIFF_MYBUFFER)) |