diff --git a/imagemagick.cabal b/imagemagick.cabal --- a/imagemagick.cabal +++ b/imagemagick.cabal @@ -1,5 +1,5 @@ Name: imagemagick -Version: 0.0.4.1 +Version: 0.0.4.2 Synopsis: bindings to imagemagick library License: OtherLicense License-file: LICENSE @@ -76,12 +76,12 @@ , Graphics.ImageMagick.MagickWand.FFI.WandProperties build-depends: base >= 4.0 && <5.0 , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && < 0.5 + , transformers >= 0.3 && < 0.6 , vector >= 0.9 && < 0.12 - , bytestring >= 0.9 && <0.11 + , bytestring >= 0.9 && <0.12 , text >= 0.11 && <1.3 - , filepath >= 1.0 - , MonadCatchIO-transformers == 0.3.* + , filepath >= 1.0 && < 2.0 + -- , MonadCatchIO-transformers == 0.3.* extensions: EmptyDataDecls Ghc-options: -Wall if os(darwin) @@ -95,12 +95,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && < 0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -114,12 +114,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && < 0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && < 1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -133,12 +133,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && < 0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -153,12 +153,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -172,12 +172,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -190,12 +190,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && < 0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && < 1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -210,12 +210,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && < 0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -229,12 +229,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && < 1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -247,12 +247,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -266,12 +266,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -285,13 +285,13 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 - , lifted-base >= 0.1 && <0.3 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath + , lifted-base , imagemagick Else Buildable: False @@ -304,12 +304,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -323,12 +323,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -342,12 +342,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -361,12 +361,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -380,12 +380,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -400,12 +400,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -419,12 +419,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -438,12 +438,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -457,12 +457,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -476,12 +476,12 @@ If flag(buildExamples) Buildable: True build-depends: base >= 4.0 && <5.0 - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick Else Buildable: False @@ -494,14 +494,14 @@ type: exitcode-stdio-1.0 main-is: test/ImageTest.hs build-depends: base >= 4.0 && <5.0 - , lifted-base >= 0.1 && <0.3 + , lifted-base , directory - , resourcet >= 0.3 && <1.2 - , transformers >= 0.3 && <0.5 - , vector >= 0.9 && <0.12 - , bytestring >= 0.9 && <0.11 - , text >= 0.11 && <1.3 - , filepath >= 1.0 + , resourcet + , transformers + , vector + , bytestring + , text + , filepath , imagemagick , QuickCheck >= 2 , tasty diff --git a/src/Graphics/ImageMagick/MagickCore/Mime.hs b/src/Graphics/ImageMagick/MagickCore/Mime.hs --- a/src/Graphics/ImageMagick/MagickCore/Mime.hs +++ b/src/Graphics/ImageMagick/MagickCore/Mime.hs @@ -11,6 +11,7 @@ import Data.Text.Encoding (decodeUtf8, encodeUtf8) import Foreign +import Prelude import qualified Graphics.ImageMagick.MagickCore.FFI.Mime as F