# libtiff: Merge branch 'warning\_fix' into 'master'

**URL:** <https://discourse.libsdl.org/t/libtiff-merge-branch-warning-fix-into-master/38228>\
**Category:** SDL Commits\
**Created:** [August 14, 2022, 8:22pm UTC](https://discourse.libsdl.org/t/libtiff-merge-branch-warning-fix-into-master/38228 "2022-08-14T20:22:53Z")\
**Posts on this page:** 1\
**Page:** 1

<div class="post-metadata">

**Author:** ![SDLPushPostBot](https://discourse.libsdl.org/user_avatar/discourse.libsdl.org/sdlpushpostbot/32/4370_2.png) [@SDLPushPostBot](https://discourse.libsdl.org/u/SDLPushPostBot)\
**Post date:** [August 14, 2022, 8:22pm UTC](https://discourse.libsdl.org/t/libtiff-merge-branch-warning-fix-into-master/38228/1 "2022-08-14T20:22:53Z")

</div>

> <https://github.com/libsdl-org/libtiff/commit/5b1f85b55c0db9299562d5124562264f46fd5f3b>
>
> Fix warning about shadowing
> 
> See merge request libtiff/libtiff!376

```diff
From 5934fd2d882df3dd0b025b3b2e762096972b8668 Mon Sep 17 00:00:00 2001
From: Even Rouault <[EMAIL REDACTED]>
Date: Tue, 9 Aug 2022 22:48:25 +0200
Subject: [PATCH] Fix warning about shadowing

---
 libtiff/tif_dir.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
index 3675b35d..3c27d38b 100644
--- a/libtiff/tif_dir.c
+++ b/libtiff/tif_dir.c
@@ -172,7 +172,7 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list ap)
 
 	TIFFDirectory* td = &tif->tif_dir;
 	int status = 1;
-	uint32_t v32, i, v;
+	uint32_t v32, v;
     double dblval;
 	char* s;
 	const TIFFField *fip = TIFFFindField(tif, tag, TIFF_ANY);
@@ -465,11 +465,14 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list ap)
 		td->td_ycbcrsubsampling[1] = (uint16_t) va_arg(ap, uint16_vap);
 		break;
 	case TIFFTAG_TRANSFERFUNCTION:
+	{
+ uint32_t i;
 		v = (td->td_samplesperpixel - td->td_extrasamples) > 1 ? 3 : 1;
 		for (i = 0; i < v; i++)
 			_TIFFsetShortArray(&td->td_transferfunction[i],
                                va_arg(ap, uint16_t*), 1U << td->td_bitspersample);
 		break;
+	}
 	case TIFFTAG_REFERENCEBLACKWHITE:
 		/* XXX should check for null range */
 		_TIFFsetFloatArray(&td->td_refblackwhite, va_arg(ap, float*), 6);

```