diff options
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/source/polygon/b3dpolygon.cxx | 48 | ||||
| -rw-r--r-- | basegfx/test/boxclipper.cxx | 4 |
2 files changed, 17 insertions, 35 deletions
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx index 9817fb43f6fb..5d23be90562c 100644 --- a/basegfx/source/polygon/b3dpolygon.cxx +++ b/basegfx/source/polygon/b3dpolygon.cxx @@ -335,11 +335,8 @@ public: BColorDataVector::const_iterator aEnd(rSource.maVector.end()); maVector.insert(aIndex, aStart, aEnd); - for(; aStart != aEnd; ++aStart) - { - if(!aStart->equalZero()) - mnUsedEntries++; - } + mnUsedEntries += std::count_if(aStart, aEnd, + [](BColorDataVector::const_reference rData) { return !rData.equalZero(); }); } } @@ -349,13 +346,10 @@ public: { const BColorDataVector::iterator aDeleteStart(maVector.begin() + nIndex); const BColorDataVector::iterator aDeleteEnd(aDeleteStart + nCount); - BColorDataVector::const_iterator aStart(aDeleteStart); - for(; mnUsedEntries && aStart != aDeleteEnd; ++aStart) - { - if(!aStart->equalZero()) - mnUsedEntries--; - } + auto nDeleteUsed = std::count_if(aDeleteStart, aDeleteEnd, + [](BColorDataVector::const_reference rData) { return !rData.equalZero(); }); + mnUsedEntries -= std::min(mnUsedEntries, static_cast<sal_uInt32>(nDeleteUsed)); // remove point data maVector.erase(aDeleteStart, aDeleteEnd); @@ -482,11 +476,8 @@ public: NormalsData3DVector::const_iterator aEnd(rSource.maVector.end()); maVector.insert(aIndex, aStart, aEnd); - for(; aStart != aEnd; ++aStart) - { - if(!aStart->equalZero()) - mnUsedEntries++; - } + mnUsedEntries += std::count_if(aStart, aEnd, + [](NormalsData3DVector::const_reference rData) { return !rData.equalZero(); }); } } @@ -496,13 +487,10 @@ public: { const NormalsData3DVector::iterator aDeleteStart(maVector.begin() + nIndex); const NormalsData3DVector::iterator aDeleteEnd(aDeleteStart + nCount); - NormalsData3DVector::const_iterator aStart(aDeleteStart); - for(; mnUsedEntries && aStart != aDeleteEnd; ++aStart) - { - if(!aStart->equalZero()) - mnUsedEntries--; - } + auto nDeleteUsed = std::count_if(aDeleteStart, aDeleteEnd, + [](NormalsData3DVector::const_reference rData) { return !rData.equalZero(); }); + mnUsedEntries -= std::min(mnUsedEntries, static_cast<sal_uInt32>(nDeleteUsed)); // remove point data maVector.erase(aDeleteStart, aDeleteEnd); @@ -637,11 +625,8 @@ public: TextureData2DVector::const_iterator aEnd(rSource.maVector.end()); maVector.insert(aIndex, aStart, aEnd); - for(; aStart != aEnd; ++aStart) - { - if(!aStart->equalZero()) - mnUsedEntries++; - } + mnUsedEntries += std::count_if(aStart, aEnd, + [](TextureData2DVector::const_reference rData) { return !rData.equalZero(); }); } } @@ -651,13 +636,10 @@ public: { const TextureData2DVector::iterator aDeleteStart(maVector.begin() + nIndex); const TextureData2DVector::iterator aDeleteEnd(aDeleteStart + nCount); - TextureData2DVector::const_iterator aStart(aDeleteStart); - for(; mnUsedEntries && aStart != aDeleteEnd; ++aStart) - { - if(!aStart->equalZero()) - mnUsedEntries--; - } + auto nDeleteUsed = std::count_if(aDeleteStart, aDeleteEnd, + [](TextureData2DVector::const_reference rData) { return !rData.equalZero(); }); + mnUsedEntries -= std::min(mnUsedEntries, static_cast<sal_uInt32>(nDeleteUsed)); // remove point data maVector.erase(aDeleteStart, aDeleteEnd); diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index 0987daf9d929..d7c7c094b962 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -189,8 +189,8 @@ public: std::rotate(aTmp2.begin(),pSmallest,aTmp2.end()); aTmp.clear(); - for(std::vector<B2DPoint>::iterator pCurr=aTmp2.begin(); pCurr!=aTmp2.end(); ++pCurr) - aTmp.append(*pCurr); + for(const auto& rCurr : aTmp2) + aTmp.append(rCurr); aRes.append(aTmp); } |