Fix component handling error in Color

[libs/gl.git] / source / color.h

diff --git a/source/color.h b/source/color.h
index d3710a9d64c745fb85d87a4216222854e4c08730..c45751d02642b4f2434614889f0f2d360efbeebe 100644 (file)
--- a/source/color.h
+++ b/source/color.h
@@ -1,15 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_COLOR_H_
 #define MSP_GL_COLOR_H_
 
-#include <GL/gl.h>
-
 namespace Msp {
 namespace GL {
 
@@ -22,8 +13,8 @@ struct Color
        Color(float r_, float g_, float b_): r(r_), g(g_), b(b_), a(1) { }
        Color(float r_, float g_, float b_, float a_): r(r_), g(g_), b(b_), a(a_) { }
        Color operator*(float f) const { return Color(r*f, g*f, b*f, a); }
-       Color operator+(const Color &c) const { return Color(r+c.r, g+c.g, b+c.g, 1-(1-a)*(1-c.a)); }
-       bool operator==(const Color &c) const { return (r==c.r && b==c.b && g==c.g && a==c.a); }
+       Color operator+(const Color &c) const { return Color(r+c.r, g+c.g, b+c.b, 1-(1-a)*(1-c.a)); }
+       bool operator==(const Color &c) const { return (r==c.r && g==c.g && b==c.b && a==c.a); }
        bool operator!=(const Color &c) const { return !operator==(c); }
 };