Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compiler warnings #26569

Merged
merged 2 commits into from
Feb 18, 2025
Merged

Fix compiler warnings #26569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ed4f22
Fix GCC compiler warnings
Jojo-Schmitz Feb 18, 2025
e51010b
Fix MSVC compoler warning
Jojo-Schmitz Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/engraving/rendering/score/masklayout.cpp
View file
Open in desktop
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
View file
Open in desktop
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
Loading