[Boost-commit] svn:boost r52209 - in sandbox-branches/andreo/guigl/boost/guigl: . platform

Subject: [Boost-commit] svn:boost r52209 - in sandbox-branches/andreo/guigl/boost/guigl: . platform
From: andreytorba_at_[hidden]
Date: 2009-04-06 04:30:26

Author: andreo
Date: 2009-04-06 04:30:25 EDT (Mon, 06 Apr 2009)
New Revision: 52209
URL: http://svn.boost.org/trac/boost/changeset/52209

Log:
updates from main brunch
Text files modified: 
   sandbox-branches/andreo/guigl/boost/guigl/platform/glu.hpp  |     4 ++++                                    
   sandbox-branches/andreo/guigl/boost/guigl/platform/glut.hpp |     4 ++++                                    
   sandbox-branches/andreo/guigl/boost/guigl/types.hpp         |    21 ++++++++++++++++++++-                   
   3 files changed, 28 insertions(+), 1 deletions(-)

Modified: sandbox-branches/andreo/guigl/boost/guigl/platform/glu.hpp
==============================================================================
--- sandbox-branches/andreo/guigl/boost/guigl/platform/glu.hpp	(original)
+++ sandbox-branches/andreo/guigl/boost/guigl/platform/glu.hpp	2009-04-06 04:30:25 EDT (Mon, 06 Apr 2009)
@@ -12,6 +12,10 @@
 
 #else
 
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+#include "windows.h"
+#endif
+
 #include <GL/glu.h>
 
 #endif

Modified: sandbox-branches/andreo/guigl/boost/guigl/platform/glut.hpp
==============================================================================
--- sandbox-branches/andreo/guigl/boost/guigl/platform/glut.hpp	(original)
+++ sandbox-branches/andreo/guigl/boost/guigl/platform/glut.hpp	2009-04-06 04:30:25 EDT (Mon, 06 Apr 2009)
@@ -12,6 +12,10 @@
 
 #else
 
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+#include "windows.h"
+#endif
+
 #include <GL/glut.h>
 
 #endif

Modified: sandbox-branches/andreo/guigl/boost/guigl/types.hpp
==============================================================================
--- sandbox-branches/andreo/guigl/boost/guigl/types.hpp	(original)
+++ sandbox-branches/andreo/guigl/boost/guigl/types.hpp	2009-04-06 04:30:25 EDT (Mon, 06 Apr 2009)
@@ -18,7 +18,26 @@
 
 typedef gil::point2<double> size_type;
 typedef gil::point2<double> position_type;
-typedef gil::rgba32f_pixel_t color_type;
+struct color_type : public gil::rgba32f_pixel_t
+{
+    typedef gil::rgba32f_pixel_t base_type;
+    typedef gil::bits32f channel_t;
+    
+    color_type() : base_type() {}
+
+    explicit color_type(channel_t v)
+        : base_type(v)
+    {}
+    color_type(channel_t v0, channel_t v1, channel_t v2, channel_t v3 = static_cast<channel_t>(1))
+        : base_type(v0,v1,v2,v3)
+    {}
+    // addressing an issue in MSVC
+    color_type &operator=(const color_type &rhs)
+    {
+        static_cast<base_type &>(*this) = static_cast<const base_type &>(rhs);
+        return *this;
+    }
+};
 typedef std::pair<position_type, position_type> segment_type;
 
 }}