diff --git a/Graphics/ImageMagick/MagickWand/PixelWand.hs b/Graphics/ImageMagick/MagickWand/PixelWand.hs --- a/Graphics/ImageMagick/MagickWand/PixelWand.hs +++ b/Graphics/ImageMagick/MagickWand/PixelWand.hs @@ -86,10 +86,10 @@ setColorFromWand = (liftIO .). F.pixelSetColorFromWand getIndex :: (MonadResource m) => PPixelWand -> m IndexPacket -getIndex = liftIO . ((fmap fromIntegral) . F.pixelGetIndex) +getIndex = liftIO . F.pixelGetIndex setIndex :: (MonadResource m) => PPixelWand -> IndexPacket -> m () -setIndex w i = liftIO $ F.pixelSetIndex w (fromIntegral i) +setIndex w i = liftIO $ F.pixelSetIndex w i getQuantumColor :: (MonadResource m) => PPixelWand -> m PPixelPacket getQuantumColor w = liftIO $ do diff --git a/imagemagick.cabal b/imagemagick.cabal --- a/imagemagick.cabal +++ b/imagemagick.cabal @@ -1,5 +1,5 @@ Name: imagemagick -Version: 0.0.3.3 +Version: 0.0.3.5 Synopsis: bindings to imagemagick library License: OtherLicense License-file: LICENSE @@ -66,7 +66,7 @@ , Graphics.ImageMagick.MagickWand.FFI.WandImage , Graphics.ImageMagick.MagickWand.FFI.WandProperties build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 @@ -79,25 +79,23 @@ cpp-options: -DCABAL_OS_DARWIN if os(windows) cpp-options: -DCABAL_OS_WINDOWS - pkgconfig-depends: ImageMagick, MagickWand + pkgconfig-depends: ImageMagick, MagickWand >= 6.8 Build-tools: hsc2hs - - executable resize If flag(buildExamples) Buildable: True - Else - Buildable: False - Main-is: examples/resize.hs - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False + Main-is: examples/resize.hs extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -106,17 +104,17 @@ executable extent If flag(buildExamples) Buildable: True - Else - Buildable: False - Main-is: examples/extent.hs - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && < 1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False + Main-is: examples/extent.hs extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -125,17 +123,17 @@ executable floodfill If flag(buildExamples) Buildable: True - Else - Buildable: False - Main-is: examples/floodfill.hs - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False + Main-is: examples/floodfill.hs extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -145,16 +143,16 @@ Main-is: examples/cyclops.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -164,16 +162,16 @@ Main-is: examples/clipmask.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -182,17 +180,17 @@ executable paint-trans If flag(buildExamples) Buildable: True - Else - Buildable: False - Main-is: examples/trans_paint.hs - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && < 1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False + Main-is: examples/trans_paint.hs extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -202,16 +200,16 @@ Main-is: examples/round_mask.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -221,16 +219,16 @@ Main-is: examples/make_tile.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && < 1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -239,16 +237,16 @@ Main-is: examples/draw_shapes.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -258,16 +256,16 @@ Main-is: examples/text_effects.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -277,10 +275,8 @@ Main-is: examples/gel.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 @@ -288,6 +284,8 @@ , system-filepath == 0.4.* , lifted-base >= 0.1 && <0.3 , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -296,16 +294,16 @@ Main-is: examples/reflect.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -315,16 +313,16 @@ Main-is: examples/3dlogo.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -334,16 +332,16 @@ Main-is: examples/affine.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -353,17 +351,16 @@ Main-is: examples/grayscale.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -373,16 +370,16 @@ Main-is: examples/modulate.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -393,16 +390,16 @@ Main-is: examples/landscape_3d.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -412,16 +409,16 @@ Main-is: examples/tilt_shift.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -431,16 +428,16 @@ Main-is: examples/bunny.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -450,16 +447,16 @@ Main-is: examples/pixel_mod.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -469,16 +466,16 @@ Main-is: examples/wandtest.hs If flag(buildExamples) Buildable: True - Else - Buildable: False - build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <0.5 + build-depends: base >= 4.0 && <5.0 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11 , text >= 0.11 && <1.3 , system-filepath == 0.4.* , imagemagick + Else + Buildable: False extensions: EmptyDataDecls Ghc-options: -Wall pkgconfig-depends: ImageMagick, MagickWand @@ -490,7 +487,7 @@ build-depends: base >= 4.0 && <5.0 , lifted-base >= 0.1 && <0.3 , directory - , resourcet >= 0.3 && <0.5 + , resourcet >= 0.3 && <1.2 , transformers == 0.3.* , vector >= 0.9 && <0.11 , bytestring >= 0.9 && <0.11