Update mussa to build on ubuntu 10.04 with qt 4.6.2 +boost 1.40.0.1

[mussa.git] / alg / color.hpp

diff --git a/alg/color.hpp b/alg/color.hpp
index abf8b686994ff12c775ce32a3301a51dcada84ec..cc11997556f71fd2aa90517a3734a4b99c838272 100644 (file)
--- a/alg/color.hpp
+++ b/alg/color.hpp
@@ -1,12 +1,13 @@
 #ifndef _GLCOLOR_H_
 #define _GLCOLOR_H_
 
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/version.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include <ostream>
 
+class Color;
+typedef boost::shared_ptr<Color> ColorRef;
+
 //! convienece class for handling opengl colors
 class Color
 {
@@ -15,6 +16,7 @@ public:
   Color(const Color &);
   //! initialize with red, green, blue, alpha
   Color(float r, float g, float b, float a=1.0);
+  Color(const ColorRef);
 
   //! set all channels simultaneously 
   void set(float r, float g, float b, float a=1.0);
@@ -36,17 +38,6 @@ public:
 protected:
   float colors[4];
 
-private:
-  friend class boost::serialization::access;
-  template<class Archive>
-  void serialize(Archive& ar, const unsigned int /*version*/) {
-    ar & boost::serialization::make_nvp("red",   colors[RedChannel]);
-    ar & boost::serialization::make_nvp("green", colors[GreenChannel]);
-    ar & boost::serialization::make_nvp("blue",  colors[BlueChannel]);
-    ar & boost::serialization::make_nvp("alpha", colors[AlphaChannel]);
-  }
 };
-BOOST_CLASS_EXPORT(Color)
-
 #endif