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 MSVC compiler warning #26656

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −9
Open

Fix MSVC compiler warning #26656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/engraving/rendering/score/tlayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,11 +1460,11 @@ void TLayout::layoutFBox(const FBox* item, FBox::LayoutData* ldata, const Layout

//! NOTE: layout fret diagrams and calculate sizes

const int totalDiagrams = fretDiagrams.size();
const size_t totalDiagrams = fretDiagrams.size();
double maxFretDiagramHeight = 0.0;
double maxFretDiagramWidth = 0.0;

for (int i = 0; i < totalDiagrams; ++i) {
for (size_t i = 0; i < totalDiagrams; ++i) {
FretDiagram* fretDiagram = fretDiagrams[i];
if (!fretDiagram) {
continue;
Expand Down Expand Up @@ -1496,12 +1496,12 @@ void TLayout::layoutFBox(const FBox* item, FBox::LayoutData* ldata, const Layout

const double spatium = item->spatium();

const int chordsPerRow = item->chordsPerRow();
const size_t chordsPerRow = item->chordsPerRow();
const double rowGap = item->rowGap().val() * spatium;
const double columnGap = item->columnGap().val() * spatium;

const int rows = std::ceil(double(totalDiagrams) / double(chordsPerRow));
const int columns = std::min(totalDiagrams, chordsPerRow);
const size_t rows = std::ceil(double(totalDiagrams) / double(chordsPerRow));
const size_t columns = std::min(totalDiagrams, chordsPerRow);

static constexpr double MARGINS = 8.0;
const double totalTableHeight = rows * cellHeight + (rows - 1) * rowGap + MARGINS;
Expand Down Expand Up @@ -1531,16 +1531,16 @@ void TLayout::layoutFBox(const FBox* item, FBox::LayoutData* ldata, const Layout
: alignH == AlignH::RIGHT ? item->width() - totalTableWidth : 0.0;
const double startY = !muse::RealIsNull(topMargin) ? topMargin : -bottomMargin;

for (int i = 0; i < totalDiagrams; ++i) {
for (size_t i = 0; i < totalDiagrams; ++i) {
FretDiagram* fretDiagram = fretDiagrams[i];
if (!fretDiagram) {
continue;
}

int row = i / chordsPerRow;
int col = i % chordsPerRow;
size_t row = i / chordsPerRow;
size_t col = i % chordsPerRow;

int itemsInRow = std::min(chordsPerRow, totalDiagrams - row * chordsPerRow);
size_t itemsInRow = std::min(chordsPerRow, totalDiagrams - row * chordsPerRow);
double rowOffsetX = alignH == AlignH::HCENTER
? (totalTableWidth - (itemsInRow * cellWidth + (itemsInRow - 1) * columnGap)) / 2
: alignH == AlignH::RIGHT
Expand Down
Loading