# HG changeset patch
# User Chris Cannam
# Date 1538405372 -3600
# Node ID 262c656ec78f3b3d7c60aaa69ba1f5673b39b87d
# Parent  4c7f91c81ba9c785449ccb6fb653152e97b90e40# Parent  23aa78b94a5883ad2d77c48e1d058055d82636b8
Merge from default branch

diff -r 4c7f91c81ba9 -r 262c656ec78f main/MainWindow.cpp
--- 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;
diff -r 4c7f91c81ba9 -r 262c656ec78f repoint-lock.json
--- 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"