Skip to content

Commit

Permalink
Merge pull request #26569 from Jojo-Schmitz/compiler-warnings
Browse files Browse the repository at this point in the history
Fix compiler warnings
  • Loading branch information
cbjeukendrup authored Feb 18, 2025
2 parents c907784 + e51010b commit bba1706
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/engraving/rendering/score/masklayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void MaskLayout::maskBarlineForText(BarLine* barline, const std::vector<TextBase

void MaskLayout::cleanupMask(const Shape& itemShape, Shape& mask, double minFragmentLength)
{
for (int i = 0; i < mask.size(); ++i) {
for (size_t i = 0; i < mask.size(); ++i) {
ShapeElement& el = mask.elements()[i];

if (el.top() - itemShape.top() < minFragmentLength) {
Expand All @@ -172,7 +172,7 @@ void MaskLayout::cleanupMask(const Shape& itemShape, Shape& mask, double minFrag
el.adjust(0.0, 0.0, minFragmentLength, 0.0);
}

for (int j = i + 1; j < mask.size(); ++j) {
for (size_t j = i + 1; j < mask.size(); ++j) {
ShapeElement& otherEl = mask.elements()[j];
if (intersects(el.left(), el.right(), otherEl.left(), otherEl.right())) {
bool otherIsBelow = otherEl.y() > el.y();
Expand Down
2 changes: 1 addition & 1 deletion src/notation/internal/notationinteraction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2653,7 +2653,7 @@ void NotationInteraction::doAddSlur(EngravingItem* firstItem, EngravingItem* sec

if (!adjacentCr) {
for (track_idx_t track = cr->vStaffIdx() * VOICES; track < (cr->vStaffIdx() + 1) * VOICES; track++) {
EngravingItem* adjacentItem = adjacentCrSeg->element(track);
adjacentItem = adjacentCrSeg->element(track);
if (!adjacentItem || !adjacentItem->isChordRest()) {
continue;
}
Expand Down

0 comments on commit bba1706

Please sign in to comment.