X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=55115cf77e7bbde4a2ac3af6f92d42ae7fcd9edb;hb=db735acce6c9409fabcab80d87930263032af47c;hp=4e71b9f0e7f4c1a1069f284a8f420b266f98288b;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 4e71b9f0..55115cf7 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GL_PIXELFORMAT_H_
 #define MSP_GL_PIXELFORMAT_H_
 
-#include <istream>
-#include <msp/gbase/pixelformat.h>
+#include <msp/graphics/pixelformat.h>
+#include <msp/strings/lexicalcast.h>
 #include "gl.h"
 #include <GL/glext.h>
 
@@ -35,15 +35,17 @@ enum PixelFormat
 	LUMINANCE_ALPHA    = GL_LUMINANCE_ALPHA,
 	LUMINANCE_ALPHA8   = GL_LUMINANCE8_ALPHA8,
 	LUMINANCE_ALPHA16F = GL_LUMINANCE_ALPHA16F_ARB,
-	LUMINANCE_ALPHA32F = GL_LUMINANCE_ALPHA32F_ARB,
+	LUMINANCE_ALPHA32F = GL_LUMINANCE_ALPHA32F_ARB
 };
 
-std::istream &operator>>(std::istream &, PixelFormat &);
+void operator>>(const LexicalConverter &, PixelFormat &);
 
 PixelFormat pixelformat_from_graphics(Graphics::PixelFormat);
 
 PixelFormat get_base_pixelformat(PixelFormat);
 
+void require_pixelformat(PixelFormat);
+
 } // namespace GL
 } // namespace Msp