JuicyPixels 3.1.3.2 → 3.1.3.3

raw patch · 4 files changed

+14/−8 lines, 4 filesdep ~containers

Dependency ranges changed: containers

Files

• JuicyPixels.cabal +5/−5
• changelog +3/−0
• src/Codec/Picture/Gif/LZWEncoding.hs +5/−1
• src/Codec/Picture/Types.hs +1/−2

@@ -1,5 +1,5 @@ Name:                JuicyPixels
-Version:             3.1.3.2
+Version:             3.1.3.3
 Synopsis:            Picture loading/serialization (in png, jpeg, bitmap, gif, tiff and radiance)
 Description:
     <<data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAADABAMAAACg8nE0AAAAElBMVEUAAABJqDSTWEL/qyb///8AAABH/1GTAAAAAXRSTlMAQObYZgAAAN5JREFUeF7s1sEJgFAQxFBbsAV72v5bEVYWPwT/XDxmCsi7zvHXavYREBDI3XP2GgICqBBYuwIC+/rVayPUAyAg0HvIXBcQoDFDGnUBgWQQ2Bx3AYFaRoBpAQHWb3bt2ARgGAiCYFFuwf3X5HA/McgGJWI2FdykCv4aBYzmKwDwvl6NVmUAAK2vlwEALK7fo88GANB6HQsAAAAAAAAA7P94AQCzswEAAAAAAAAAAAAAAAAAAICzh4UAO4zWAYBfRutHA4Bn5C69JhowAMGoBaMWDG0wCkbBKBgFo2AUAACPmegUST/IJAAAAABJRU5ErkJggg==>>
@@ -11,11 +11,11 @@ License-file:        LICENSE
 Author:              Vincent Berthoux
 Maintainer:          vincent.berthoux@gmail.com
-Category:            Codec, Graphics
+Category:            Codec, Graphics, Image
 Build-type:          Simple
 
 -- Constraint on the version of Cabal needed to build this package.
-Cabal-version:       >= 1.16
+Cabal-version:       >= 1.10
 
 Extra-source-files: changelog
 
@@ -26,7 +26,7 @@ Source-Repository this
     Type:      git
     Location:  git://github.com/Twinside/Juicy.Pixels.git
-    Tag:       v3.1.3.2
+    Tag:       v3.1.3.3
 
 Flag Mmap
     Description: Enable the file loading via mmap (memory map)
@@ -56,7 +56,7 @@                  vector              >= 0.9    && < 0.11,
                  primitive           >= 0.5     && < 0.6,
                  deepseq             >= 1.1     && < 1.4,
-                 containers          >= 0.5     && < 0.6
+                 containers          >= 0.4.2   && < 0.6
 
   if flag(Mmap)
     Build-depends: mmap

@@ -1,5 +1,8 @@ -*-change-log-*-
 
+v3.1.3.3 February 2014
+ * Lowering cabal version limit to be compiled with older GHCs
+
 v3.1.3.2 January 2014
  * Hacking around Binary to accept old version of it, down to version 0.5
    allowing Juicy.Pixels to be compiled with GHC 6.3

@@ -1,4 +1,4 @@-{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE BangPatterns, CPP #-}
 module Codec.Picture.Gif.LZWEncoding( lzwEncode ) where
 
 import Control.Applicative( (<$>) )
@@ -7,7 +7,11 @@ import Data.Maybe( fromMaybe )
 import Data.Monoid( mempty )
 import Data.Word( Word8 )
+#if MIN_VERSION_containers(0,5,0)
 import qualified Data.IntMap.Strict as I
+#else
+import qualified Data.IntMap as I
+#endif
 import qualified Data.Vector.Storable as V
 
 import Codec.Picture.BitWriter

@@ -648,7 +648,7 @@ --
 -- for example, to create a small gradient image :
 --
--- > imageCreator :: String -> Image PixelRGB8
+-- > imageCreator :: String -> IO ()
 -- > imageCreator path = writePng path $ generateImage pixelRenderer 250 300
 -- >    where pixelRenderer x y = PixelRGB8 x y 128
 --
@@ -1834,4 +1834,3 @@  where coeff = exposure * (exposure / maxBrightness + 1.0) / (exposure + 1.0);
        maxBrightness = pixelFold (\luma _ _ px -> max luma $ computeLuma px) 0 img
        scaledData = V.map (* coeff) $ imageData img
-