Merge branch 'master' into release

Twinside · Dec 2, 2015 · d9cc538 · d9cc538
2 parents 89c2858 + 1aac690
commit d9cc538
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/JuicyPixels.cabal b/JuicyPixels.cabal
@@ -1,5 +1,5 @@
 Name:                JuicyPixels
-Version:             3.2.6.4
+Version:             3.2.6.5
 Synopsis:            Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)
 Description:
     <<data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAADABAMAAACg8nE0AAAAElBMVEUAAABJqDSTWEL/qyb///8AAABH/1GTAAAAAXRSTlMAQObYZgAAAN5JREFUeF7s1sEJgFAQxFBbsAV72v5bEVYWPwT/XDxmCsi7zvHXavYREBDI3XP2GgICqBBYuwIC+/rVayPUAyAg0HvIXBcQoDFDGnUBgWQQ2Bx3AYFaRoBpAQHWb3bt2ARgGAiCYFFuwf3X5HA/McgGJWI2FdykCv4aBYzmKwDwvl6NVmUAAK2vlwEALK7fo88GANB6HQsAAAAAAAAA7P94AQCzswEAAAAAAAAAAAAAAAAAAICzh4UAO4zWAYBfRutHA4Bn5C69JhowAMGoBaMWDG0wCkbBKBgFo2AUAACPmegUST/IJAAAAABJRU5ErkJggg==>>
@@ -28,7 +28,7 @@ Source-Repository head
 Source-Repository this
     Type:      git
     Location:  git://github.com/Twinside/Juicy.Pixels.git
-    Tag:       v3.2.6.4
+    Tag:       v3.2.6.5
 
 Flag Mmap
     Description: Enable the file loading via mmap (memory map)

diff --git a/changelog b/changelog
@@ -1,7 +1,11 @@
 Change log
 ==========
 
-v3.2.6.3 December 2015
+v3.2.6.5 December 2015
+----------------------
+ * Fix: Compilation on GHC 7.6/7.8
+
+v3.2.6.4 December 2015
 ----------------------
  * Fix: previous broken bugfix.
 

diff --git a/src/Codec/Picture/Types.hs b/src/Codec/Picture/Types.hs
@@ -739,7 +739,7 @@ generateMutableImage :: forall m px. (Pixel px, PrimMonad m)
                      -> Int        -- ^ Height in pixels
                      -> m (MutableImage (PrimState m) px)
 {-# INLINE generateMutableImage #-}
-generateMutableImage f w h = MutableImage w h <$> generated where
+generateMutableImage f w h = MutableImage w h `liftM` generated where
   compCount = componentCount (undefined :: px)
 
   generated = do