Relaxed upper version bound for OpenGLRaw. Bumped version to 3.0.0.1.

haskell-opengl · Jan 9, 2016 · ce8bc27 · ce8bc27
1 parent a4a9413
commit ce8bc27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+3.0.0.1
+-------
+* Relaxed upper version bound for `OpenGLRaw`.
+
 3.0.0.0
 -------
 * Depend on new `OpenGLRaw` and `GLURaw` packages.

diff --git a/OpenGL.cabal b/OpenGL.cabal
@@ -1,5 +1,5 @@
 name: OpenGL
-version: 3.0.0.0
+version: 3.0.0.1
 synopsis: A binding for the OpenGL graphics system
 description:
   A Haskell binding for the OpenGL graphics system (GL, version 4.5) and its
@@ -155,7 +155,7 @@ library
     transformers >= 0.2 && < 0.6,
     ObjectName   >= 1.1 && < 1.2,
     StateVar     >= 1.1 && < 1.2,
-    OpenGLRaw    >= 3.0 && < 3.1,
+    OpenGLRaw    >= 3.0 && < 3.2,
     GLURaw       >= 2.0 && < 2.1
   default-language: Haskell2010
   other-extensions:

diff --git a/src/Graphics/Rendering/OpenGL/GL/Colors.hs b/src/Graphics/Rendering/OpenGL/GL/Colors.hs
@@ -491,15 +491,15 @@ data ClampMode =
 
 marshalClampMode :: ClampMode -> GLenum
 marshalClampMode x = case x of
-   ClampOn -> GL_TRUE
+   ClampOn -> fromIntegral GL_TRUE
    FixedOnly -> GL_FIXED_ONLY
-   ClampOff -> GL_FALSE
+   ClampOff -> fromIntegral GL_FALSE
 
 unmarshalClampMode :: GLenum -> ClampMode
 unmarshalClampMode x
-   | x == GL_TRUE = ClampOn
+   | x == fromIntegral GL_TRUE = ClampOn
    | x == GL_FIXED_ONLY = FixedOnly
-   | x == GL_FALSE = ClampOff
+   | x == fromIntegral GL_FALSE = ClampOff
    | otherwise = error $ "unmarshalClampMode: unknown enum value " ++ show x
 
 --------------------------------------------------------------------------------