Incorporating ppelleti fix for GHC < 7.10

Twinside · May 6, 2015 · 1de3ecb · 1de3ecb
1 parent d7e1237
commit 1de3ecb
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 1 deletion.
diff --git a/src/Codec/Picture.hs b/src/Codec/Picture.hs
@@ -136,6 +136,7 @@ module Codec.Picture (
 
 #if !MIN_VERSION_base(4,8,0)
 import Control.Applicative( (<$>) )
+import Data.Monoid( mempty )
 #endif
 
 import Control.DeepSeq( NFData, deepseq )

diff --git a/src/Codec/Picture/Jpg.hs b/src/Codec/Picture/Jpg.hs
@@ -16,6 +16,7 @@ module Codec.Picture.Jpg( decodeJpeg
 
 #if !MIN_VERSION_base(4,8,0)
 import Data.Foldable( foldMap )
+import Data.Monoid( mempty )
 import Control.Applicative( pure, (<$>) )
 #endif
 

diff --git a/src/Codec/Picture/Jpg/Metadata.hs b/src/Codec/Picture/Jpg/Metadata.hs
@@ -1,5 +1,12 @@
+{-# LANGUAGE CPP #-}
 module Codec.Picture.Jpg.Metadata ( extractMetadatas, encodeMetadatas ) where
 
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative( pure )
+import Data.Monoid( mempty )
+import Data.Word( Word )
+#endif
+
 import Data.Word( Word16 )
 import Data.Maybe( fromMaybe )
 import qualified Codec.Picture.Metadata as Met

diff --git a/src/Codec/Picture/Png/Export.hs b/src/Codec/Picture/Png/Export.hs
@@ -11,6 +11,9 @@ module Codec.Picture.Png.Export( PngSavable( .. )
                                , encodePalettedPng
                                , encodePalettedPngWithMetadata
                                ) where
+#if !MIN_VERSION_base(4,8,0)
+import Data.Monoid( mempty )
+#endif
 
 import Control.Monad( forM_ )
 import Control.Monad.ST( ST, runST )

diff --git a/src/Codec/Picture/Png/Metadata.hs b/src/Codec/Picture/Png/Metadata.hs
@@ -6,7 +6,7 @@ module Codec.Picture.Png.Metadata( extractMetadatas
                                  ) where
 
 #if !MIN_VERSION_base(4,8,0)
-import Control.Applicative( (<$>), (<*>) )
+import Control.Applicative( (<$>), (<*>), pure )
 import Data.Monoid( mempty )
 import Data.Foldable( foldMap )
 #endif

diff --git a/src/Codec/Picture/Tiff.hs b/src/Codec/Picture/Tiff.hs
@@ -35,6 +35,7 @@ module Codec.Picture.Tiff( decodeTiff
 
 #if !MIN_VERSION_base(4,8,0)
 import Control.Applicative( (<$>), (<*>), pure )
+import Data.Monoid( mempty )
 #endif
 
 import Control.Monad( when, foldM_, unless, forM_ )