Hieroglyph 3.8 → 3.85

raw patch · 2 files changed

+10/−9 lines, 2 filesdep ~OpenGLdep ~busterdep ~gtk

Dependency ranges changed: OpenGL, buster, gtk

Files

• Graphics/Rendering/Hieroglyph/OpenGL/Compile.hs +6/−5
• Hieroglyph.cabal +4/−4

@@ -238,8 +238,8 @@   | otherwise = do     (w,h,potw,poth,channels,buffer) <- case dimensions img of-        (Left (Point x y)) -> Control.Exception.catch (Gtk.pixbufNewFromFile (filename img) >>= copydata) (\(err::SomeException) -> SB.readFile (filename img) >>=( \l -> print (err,filename img,SB.length l)) >> return (0,0,0,0,0,SB.empty))-        (Right (Rect x y w h)) -> Control.Exception.catch ( Gtk.pixbufNewFromFile (filename img) >>= copydata) (\(err::SomeException) -> SB.readFile (filename img) >>= (\l -> print (w,h,preserveaspect img,err,filename img,SB.length l)) >> return (0,0,0,0,0,SB.empty))+        (Left (Point x y)) -> (Gtk.pixbufNewFromFile (filename img) >>= copydata) +        (Right (Rect x y w h)) -> (Gtk.pixbufNewFromFile (filename img) >>= copydata)      if w > 0      then do         let (e', tex) = getFreeTexture e@@ -295,8 +295,9 @@     pixels <- Gtk.pixbufGetPixels pbuf :: IO (Gtk.PixbufData Int Word8)     stride <- Gtk.pixbufGetRowstride pbuf     buf <- SB.create (w*h*channels*bpc) $ \ptr ->-        forM_ [0::Int .. h - 1] $ \row -> let stsample = row*stride in-            forM_ [0::Int .. w*channels*bpc-1] $ \sample0 -> let sample = stsample + sample0 in-                A.readArray pixels sample >>= pokeByteOff ptr sample+    --    forM_ [0::Int .. h - 1] $ \row -> let stsample = row*stride in+    --        forM_ [0::Int .. w*channels*bpc-1] $ \sample0 -> let sample = stsample + sample0 in+    --            A.readArray pixels sample >>= pokeByteOff ptr sample+        forM_ [0::Int .. w*h*channels*bpc - 1] $ \sample -> A.readArray pixels sample >>= pokeByteOff ptr sample     return (w0,h0,w,h,channels,buf) 

@@ -1,14 +1,14 @@ name: Hieroglyph-version: 3.8+version: 3.85 cabal-version: >=1.2 build-type: Simple license: BSD3 license-file: LICENSE copyright: maintainer: J.R. Heard-build-depends: IfElse -any, OpenGL -any, array -any, base == 4.1.0.0,-               buster >=2.0, buster-gtk -any, bytestring -any, cairo -any,-               colour -any, containers -any, glib -any, gtk -any, gtkglext -any,+build-depends: IfElse -any, OpenGL <= 2.2.3.0, array -any, base == 4.1.0.0,+               buster ==2.51, buster-gtk -any, bytestring -any, cairo -any,+               colour -any, containers -any, glib -any, gtk >= 0.10.0, gtkglext -any,                mtl -any, parallel -any, pretty -any, random -any stability: homepage: http://vis.renci.org/jeff/hieroglyph