FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1029 from glebm/fix-shadow-warning

Browse Source 
osgAnimation/Keyframe: Fix -Wshadow warning
This commit is contained in:
Robert Osfield 2021-01-18 14:51:20 +00:00 committed by GitHub
commit a7360d6a40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/osgAnimation/Keyframe
View File

@ -105,12 +105,12 @@ namespace osgAnimation
// 2. build deduplicated list of keyframes // 2. build deduplicated list of keyframes
unsigned int cumul = 0; unsigned int cumul = 0;
VectorType deduplicated; VectorType deduplicated;
for(std::vector<unsigned int>::iterator iterator = intervalSizes.begin() ; iterator != intervalSizes.end() ; ++ iterator) { for(std::vector<unsigned int>::iterator it = intervalSizes.begin() ; it != intervalSizes.end() ; ++ it) {
deduplicated.push_back((*this)[cumul]); deduplicated.push_back((*this)[cumul]);
if(*iterator > 1) { if(*it > 1) {
deduplicated.push_back((*this)[cumul + (*iterator) - 1]); deduplicated.push_back((*this)[cumul + (*it) - 1]);
} }
cumul += *iterator; cumul += *it;
} }
unsigned int count = size() - deduplicated.size(); unsigned int count = size() - deduplicated.size();