Mercurial > hg > sonic-visualiser
changeset 2025:262c656ec78f zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 01 Oct 2018 15:49:32 +0100 |
parents | 4c7f91c81ba9 (current diff) 23aa78b94a58 (diff) |
children | 337d16097516 d5296c91a0ff |
files | main/MainWindow.cpp repoint-lock.json |
diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/main/MainWindow.cpp Fri Sep 28 18:32:13 2018 +0100 +++ b/main/MainWindow.cpp Mon Oct 01 15:49:32 2018 +0100 @@ -1283,6 +1283,8 @@ LayerFactory::PeakFrequencySpectrogram, LayerFactory::Spectrum }; + int backgroundTypeCount = int(sizeof(backgroundTypes) / + sizeof(backgroundTypes[0])); std::vector<Model *> models; if (m_document) models = m_document->getTransformInputModels(); @@ -1291,8 +1293,7 @@ models.push_back(getMainModel()); // probably 0 } - for (unsigned int i = 0; - i < sizeof(backgroundTypes)/sizeof(backgroundTypes[0]); ++i) { + for (int i = 0; i < backgroundTypeCount; ++i) { const int paneMenuType = 0, layerMenuType = 1; @@ -1764,7 +1765,7 @@ // .so names -- that won't happen often I hope std::map<QString, QString> idNameSonameMap; std::set<QString> seenNames, duplicateNames; - for (unsigned int i = 0; i < transforms.size(); ++i) { + for (int i = 0; in_range_for(transforms, i); ++i) { QString name = transforms[i].name; if (seenNames.find(name) != seenNames.end()) { duplicateNames.insert(name); @@ -1773,7 +1774,7 @@ } } - for (unsigned int i = 0; i < transforms.size(); ++i) { + for (int i = 0; in_range_for(transforms, i); ++i) { QString name = transforms[i].name; if (name == "") name = transforms[i].identifier;
--- a/repoint-lock.json Fri Sep 28 18:32:13 2018 +0100 +++ b/repoint-lock.json Mon Oct 01 15:49:32 2018 +0100 @@ -4,10 +4,10 @@ "pin": "da86fb0bccb3" }, "svcore": { - "pin": "ca43af0dcab7" + "pin": "32400727bcbd" }, "svgui": { - "pin": "4c28e3302045" + "pin": "615eb28768ca" }, "svapp": { "pin": "15a566f26114"