From 623c07a2f0d81ecad568bf3f2c32f1f4baa85e4b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 12 Aug 2016 14:48:13 +0200 Subject: [PATCH] Fixed more compiler warnings for variables declared outside an OpenMP loop --- .../RivTernaryTextureCoordsCreator.cpp | 9 +++------ .../ModelVisualization/RivTextureCoordsCreator.cpp | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp index d7626712dd..a1a1400bac 100644 --- a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp +++ b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp @@ -166,16 +166,13 @@ void RivTernaryTextureCoordsCreator::createTextureCoords(cvf::Vec2fArray* textur textureCoords->resize(numVertices); cvf::Vec2f* rawPtr = textureCoords->ptr(); - cvf::Vec2d resultValue; - cvf::Vec2f texCoord; - -#pragma omp parallel for private(texCoord, resultValue) +#pragma omp parallel for for (int i = 0; i < static_cast(triangleToCellIdx.size()); i++) { size_t cellIdx = triangleToCellIdx[i]; - resultValue = resultAccessor->cellScalarGlobIdx(cellIdx); - texCoord = texMapper->getTexCoord(resultValue.x(), resultValue.y(), cellIdx); + cvf::Vec2d resultValue = resultAccessor->cellScalarGlobIdx(cellIdx); + cvf::Vec2f texCoord = texMapper->getTexCoord(resultValue.x(), resultValue.y(), cellIdx); size_t j; for (j = 0; j < 3; j++) diff --git a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp index 4f520b2c3d..c4e7d8a904 100644 --- a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp +++ b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp @@ -87,17 +87,14 @@ void RivTextureCoordsCreator::createTextureCoords( quadTextureCoords->resize(numVertices); cvf::Vec2f* rawPtr = quadTextureCoords->ptr(); - double resultValue; - cvf::Vec2f texCoord; - -#pragma omp parallel for private(texCoord, resultValue) +#pragma omp parallel for for (int i = 0; i < static_cast(quadMapper->quadCount()); i++) { cvf::StructGridInterface::FaceType faceId = quadMapper->cellFace(i); size_t cellIdx = quadMapper->cellIndex(i); - resultValue = resultAccessor->cellFaceScalar(cellIdx, faceId); - texCoord = texMapper->getTexCoord(resultValue, cellIdx); + double resultValue = resultAccessor->cellFaceScalar(cellIdx, faceId); + cvf::Vec2f texCoord = texMapper->getTexCoord(resultValue, cellIdx); size_t j; for (j = 0; j < 4; j++)