JuicyPixels 3.1.6 → 3.1.6.1

raw patch · 4 files changed

+26/−5 lines, 4 filesdep ~transformersPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: transformers

API changes (from Hackage documentation)

Files

• JuicyPixels.cabal +5/−4
• changelog +4/−0
• src/Codec/Picture/ColorQuant.hs +1/−0
• src/Codec/Picture/HDR.hs +16/−1

@@ -1,5 +1,5 @@ Name:                JuicyPixels
-Version:             3.1.6
+Version:             3.1.6.1
 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==>>
@@ -12,8 +12,9 @@ Author:              Vincent Berthoux
 Maintainer:          vincent.berthoux@gmail.com
 Category:            Codec, Graphics, Image
-Build-type:          Simple
 Stability:           Stable
+Build-type:          Simple
+
 -- Constraint on the version of Cabal needed to build this package.
 Cabal-version:       >= 1.10
 
@@ -27,7 +28,7 @@ Source-Repository this
     Type:      git
     Location:  git://github.com/Twinside/Juicy.Pixels.git
-    Tag:       v3.1.6
+    Tag:       v3.1.6.1
 
 Flag Mmap
     Description: Enable the file loading via mmap (memory map)
@@ -54,7 +55,7 @@                  mtl                 >= 1.1     && < 2.3,
                  binary              >= 0.5     && < 0.8,
                  zlib                >= 0.5.3.1 && < 0.6,
-                 transformers        >= 0.4,
+                 transformers        >= 0.2,
                  vector              >= 0.9     && < 0.11,
                  primitive           >= 0.4     && < 0.6,
                  deepseq             >= 1.1     && < 1.4,

@@ -1,5 +1,9 @@ -*-change-log-*-
 
+v3.1.6.1 August 2014
+ * Fix of Gif palette creation (jeffreyrosenbluth)
+ * Restoring transformers 0.3.* compat
+
 v3.1.6 August 2014
  * Fix bad disposal handling in GIF animations.
  * Added ColorConvertible instance for PixelRGB8 -> PixelRGBA16 (KaiHa)

@@ -308,6 +308,7 @@     (LT, GT, _)  -> GAxis
     (GT, LT, _)  -> BAxis
     (LT, LT, GT) -> GAxis
+    (EQ, GT, _)  -> RAxis
     (_,  _,  _)  -> BAxis
 
 -- Split a cluster about its largest axis using the mean to divide up the

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-}
 -- | Module dedicated of Radiance file decompression (.hdr or .pic) file.
 -- Radiance file format is used for High dynamic range imaging.
 module Codec.Picture.HDR( decodeHDR, encodeHDR, writeHDR ) where
@@ -9,7 +10,6 @@ import Control.Applicative( pure, (<$>), (<*>) )
 import Control.Monad( when, foldM, foldM_, forM, forM_ )
 import Control.Monad.Trans.Class( lift )
-import Control.Monad.Trans.Except( ExceptT, throwE, runExceptT )
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Char8 as BC
@@ -28,6 +28,21 @@ import Codec.Picture.InternalHelper
 import Codec.Picture.Types
 import Codec.Picture.VectorByteConversion
+
+#if MIN_VERSION_transformers(0, 4, 0)
+import Control.Monad.Trans.Except( ExceptT, throwE, runExceptT )
+#else
+-- Transfomers 0.3 compat
+import Control.Monad.Trans.Error( Error, ErrorT, throwError, runErrorT )
+
+type ExceptT = ErrorT
+
+throwE :: (Monad m, Error e) => e -> ErrorT e m a
+throwE = throwError
+
+runExceptT :: ErrorT e m a -> m (Either e a)
+runExceptT = runErrorT
+#endif
 
 {-# INLINE (.<<.) #-}
 (.<<.), (.>>.) :: (Bits a) => a -> Int -> a