Merge remote-tracking branch 'upstream/master' into autoRotate

Author: Haydelj

src/Core/Datatypes/ColorMap.cc

@@ -58,7 +58,7 @@ ColorMap* ColorMap::clone() const
 
 namespace detail
 {
-  
+
   class Rainbow : public ColorMapStrategy
   {
   public:
@@ -345,8 +345,9 @@ double ColorMap::getColorMapRescaleScale() const { return rescale_scale_; }
 double ColorMap::getColorMapRescaleShift() const { return rescale_shift_; }
 
 
-
-ColorMap_OSP_helper::ColorMap_OSP_helper(const std::string name){
+//TODO: heavily refactor
+ColorMap_OSP_helper::ColorMap_OSP_helper(const std::string& name)
+{
   opacityList.push_back(0.5);
   opacityList.push_back(0.5);
   if(name.compare("Rainbow") == 0){

src/Core/Datatypes/ColorMap.h

@@ -118,14 +118,14 @@ namespace Datatypes {
   private:
     StandardColorMapFactory() = delete;
   };
-  
+
   // colormap helper for ospray transfer function
-  class ColorMap_OSP_helper
+  class SCISHARE ColorMap_OSP_helper
   {
   public:
     std::vector<float> colorList;
     std::vector<float> opacityList;
-    ColorMap_OSP_helper(const std::string name);
+    explicit ColorMap_OSP_helper(const std::string& name);
   };
 
 }}}