From c0efaae364cfa55a204948e324ab5a4933f94c02 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 6 Jun 2016 14:28:12 +0100 Subject: [PATCH] Fixed shadowing warning --- src/osgPlugins/txp/trpage_pparse.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/txp/trpage_pparse.cpp b/src/osgPlugins/txp/trpage_pparse.cpp index 88d75efad..91b04dc47 100644 --- a/src/osgPlugins/txp/trpage_pparse.cpp +++ b/src/osgPlugins/txp/trpage_pparse.cpp @@ -238,19 +238,19 @@ void *trpgPrintGraphParser::ReadHelper::Parse(trpgToken tok,trpgReadBuffer &buf) const trpgMaterial *baseMat; const trpgTexture *baseTex; int totSize; - trpgrImageHelper *imageHelp = parse->GetImageHelp(); + trpgrImageHelper *parse_imageHelp = parse->GetImageHelp(); int numImages=1; locMat.GetNumLocals(numImages); for (int imgN=0;imgNGetNthImageInfoForLocalMat(&locMat,imgN,&baseMat,&baseTex,totSize); + parse_imageHelp->GetNthImageInfoForLocalMat(&locMat,imgN,&baseMat,&baseTex,totSize); // Fetch the whole image { char *pixels = new char[totSize]; bool failed = false; try { - failed = !imageHelp->GetNthImageForLocalMat(&locMat,imgN,pixels,totSize); + failed = !parse_imageHelp->GetNthImageForLocalMat(&locMat,imgN,pixels,totSize); } catch (...) { failed = true; @@ -275,7 +275,7 @@ void *trpgPrintGraphParser::ReadHelper::Parse(trpgToken tok,trpgReadBuffer &buf) char *pixels = new char[mipSize]; bool failed = false; try { - failed = !imageHelp->GetNthImageMipLevelForLocalMat(j,&locMat,imgN,pixels,mipSize); + failed = !parse_imageHelp->GetNthImageMipLevelForLocalMat(j,&locMat,imgN,pixels,mipSize); } catch (...) { failed = true;