Hacky fix for bizarre Windows crash

Author: dcwhite

src/Core/Datatypes/ColorMap.cc

@@ -29,6 +29,7 @@
 
 #include <Core/Math/MiscMath.h>
 #include <Core/Datatypes/ColorMap.h>
+#include <iostream>
 
 using namespace SCIRun::Core::Datatypes;
 
@@ -42,7 +43,7 @@ ColorMap::ColorMap(const std::string& name, const size_t resolution, const doubl
 
 ColorMap* ColorMap::clone() const
 {
-  return new ColorMap(name_,resolution_,shift_,invert_);
+  return new ColorMap(*this);
 }
 
 ColorMapHandle StandardColorMapFactory::create(const std::string& name, const size_t &resolution,
@@ -82,7 +83,13 @@ ColorRGB ColorMap::hslToRGB(float h, float s, float l) {
 }
 
 
-float ColorMap::getTransformedColor(float f) {
+float ColorMap::getTransformedColor(float f) const {
+  static bool x = true;
+  if (x)
+  {
+    std::cout << "";// this;// << " " << name_ << " " << resolution_ << " " << shift_ << " " << invert_ << std::endl;
+    x = false;
+  }
     //@todo this will not be needed with rescale color map.
     float v = std::min(std::max(0.f,f),1.f);
     double shift = shift_;
@@ -103,7 +110,7 @@ float ColorMap::getTransformedColor(float f) {
     return v;
 }
 
-ColorRGB ColorMap::getColorMapVal(float v) {
+ColorRGB ColorMap::getColorMapVal(float v) const {
     float f = getTransformedColor(v);
     //now grab the RGB
     ColorRGB col;

src/Core/Datatypes/ColorMap.h

@@ -43,23 +43,22 @@ namespace Datatypes {
   public:
     explicit ColorMap(const std::string& name, const size_t resolution = 256,
                         const double shift = 0.0, const bool invert = false);
-
     virtual ColorMap* clone() const;
 
     std::string getColorMapName() const {return name_;}
     size_t getColorMapResolution() const {return resolution_;}
     double getColorMapShift() const {return shift_;}
     bool getColorMapInvert() const {return invert_;}
-    Core::Datatypes::ColorRGB getColorMapVal(float v);
-    float getTransformedColor(float v);
+    Core::Datatypes::ColorRGB getColorMapVal(float v) const;
+    float getTransformedColor(float v) const;
   private:
     std::string name_;
     size_t resolution_;
     double shift_;
     bool invert_;
-    boost::shared_ptr<class ColorMapImpl> impl_;
-    float Hue_2_RGB(float v1, float v2, float vH);
-    Core::Datatypes::ColorRGB hslToRGB(float h, float s, float l);
+    //boost::shared_ptr<class ColorMapImpl> impl_;
+    static float Hue_2_RGB(float v1, float v2, float vH);
+    static Core::Datatypes::ColorRGB hslToRGB(float h, float s, float l);
   };
 
   class SCISHARE StandardColorMapFactory : boost::noncopyable