gloss 1.7.6.4 → 1.7.6.5

raw patch · 2 files changed

+21/−11 lines, 2 files

Files

• Graphics/Gloss/Internals/Render/Picture.hs +20/−10
• gloss.cabal +1/−1

@@ -58,11 +58,9 @@ 	setLineSmooth	(stateLineSmooth renderS) 	setBlendAlpha	(stateBlendAlpha renderS) 	+        checkErrors "before drawPicture."         drawPicture (viewPortScale viewS) picture--        errors          <- get $ GLU.errors-        when (not $ null errors)-         $ error  $ concatMap explainError errors+        checkErrors "after drawPicture."   drawPicture@@ -230,12 +228,18 @@ 	 -> mapM_ (drawPicture circScale) ps 	 -- Errors ----------------------------------------------------------------------explainError :: GLU.Error -> String-explainError err+checkErrors :: String -> IO ()+checkErrors place+ = do   errors          <- get $ GLU.errors+        when (not $ null errors)+         $ mapM_ (handleError place) errors++handleError :: String -> GLU.Error -> IO ()+handleError place err  = case err of     GLU.Error GLU.StackOverflow _-     -> unlines -      [ "Gloss / OpenGL Stack Overflow."+     -> error $ unlines +      [ "Gloss / OpenGL Stack Overflow " ++ show place       , "  This program uses the Gloss vector graphics library, which tried to"       , "  draw a picture using more nested transforms (Translate/Rotate/Scale)"       , "  than your OpenGL implementation supports. The OpenGL spec requires"@@ -249,9 +253,15 @@       , "  To make this program work you'll need to reduce the number of nested"       , "  transforms used when defining the Picture given to Gloss. Sorry." ] +    -- Issue #32: Spurious "Invalid Operation" errors under Windows 7 64-bit.+    --   When using GLUT under Windows 7 it complains about InvalidOperation, +    --   but doesn't provide any other details. All the examples look ok, so +    --   we're just ignoring the error for now.+    GLU.Error GLU.InvalidOperation _+     -> return ()     _ -     -> unlines -     [  "Gloss / OpenGL Internal Error. "+     -> error $ unlines +     [  "Gloss / OpenGL Internal Error " ++ show place      ,  "  Please report this on haskell-gloss@googlegroups.com."      ,  show err ] 

@@ -1,5 +1,5 @@ Name:                gloss-Version:             1.7.6.4+Version:             1.7.6.5 License:             MIT License-file:        LICENSE Author:              Ben Lippmeier