Merge pull request #1317 from TomFischer/misc

Fix warnings

Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp

@@ -44,11 +44,11 @@ void VtkCompositeColorByHeightFilter::init()
     else
         heightFilter->SetInputConnection(_inputAlgorithm->GetOutputPort());
 
-    DataHolderLib::Color a = { 0, 0, 255, 255 }; // blue
-    DataHolderLib::Color b = { 0, 255, 0, 255 }; // green
-    DataHolderLib::Color c = { 255, 255, 0, 255 }; // yellow
-    DataHolderLib::Color d = { 155, 100, 50, 255 }; // brown
-    DataHolderLib::Color e = { 255, 0, 0, 255 }; // red
+    DataHolderLib::Color a{{0, 0, 255, 255}};    // blue
+    DataHolderLib::Color b{{0, 255, 0, 255}};    // green
+    DataHolderLib::Color c{{255, 255, 0, 255}};  // yellow
+    DataHolderLib::Color d{{155, 100, 50, 255}}; // brown
+    DataHolderLib::Color e{{255, 0, 0, 255}};    // red
     VtkColorLookupTable* ColorLookupTable = heightFilter->GetColorLookupTable();
     ColorLookupTable->setInterpolationType(DataHolderLib::LUTType::LINEAR);
     ColorLookupTable->setColor(-50, a);

Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp

@@ -94,10 +94,10 @@ VtkColorLookupTable* VtkCompositeElementSelectionFilter::GetLookupTable()
 {
     VtkColorLookupTable* lut = VtkColorLookupTable::New();
     lut->SetTableRange(0,1);
-    DataHolderLib::Color a = { 0, 0, 255, 255 }; // blue
-    DataHolderLib::Color b = { 0, 255, 0, 255 }; // green
-    DataHolderLib::Color c = { 255, 255, 0, 255 }; // yellow
-    DataHolderLib::Color d = { 255, 0, 0, 255 }; // red
+    DataHolderLib::Color a{{0, 0, 255, 255}};   // blue
+    DataHolderLib::Color b{{0, 255, 0, 255}};   // green
+    DataHolderLib::Color c{{255, 255, 0, 255}};  // yellow
+    DataHolderLib::Color d{{255, 0, 0, 255}};    // red
     lut->setColor(1.0, a);
     lut->setColor(0.5, b);
     lut->setColor(0.25, c);

Applications/DataHolderLib/ColorLookupTable.cpp

@@ -13,10 +13,12 @@
 
 namespace DataHolderLib
 {
-
 ColorLookupTable::ColorLookupTable()
-: _range(std::make_pair<double, double>(std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max())),
-  _type(DataHolderLib::LUTType::LINEAR)
+    : _type(DataHolderLib::LUTType::LINEAR),
+      _range(
+          std::make_pair<double, double>(std::numeric_limits<double>::lowest(),
+                                         std::numeric_limits<double>::max()))
+
 {}
 
 void ColorLookupTable::setTableRange(double min, double max)