diff --git a/JuicyPixels.cabal b/JuicyPixels.cabal --- a/JuicyPixels.cabal +++ b/JuicyPixels.cabal @@ -1,5 +1,5 @@ Name: JuicyPixels -Version: 3.2.9.3 +Version: 3.2.9.4 Synopsis: Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance) Description: <> @@ -28,7 +28,7 @@ Source-Repository this Type: git Location: git://github.com/Twinside/Juicy.Pixels.git - Tag: v3.2.9.3 + Tag: v3.2.9.4 Flag Mmap Description: Enable the file loading via mmap (memory map) diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,6 +1,14 @@ Change log ========== +v3.2.9.4 Januear 2018 +---------------------- + + * Compat for GHC-8.4 (pull request) + * Fix: a character in latin1 which was still around. Whatever. + So tired of this. + + v3.2.9.3 December 2017 ---------------------- diff --git a/src/Codec/Picture/Jpg/Progressive.hs b/src/Codec/Picture/Jpg/Progressive.hs --- a/src/Codec/Picture/Jpg/Progressive.hs +++ b/src/Codec/Picture/Jpg/Progressive.hs @@ -40,7 +40,7 @@ -- if the displayed MCU block is only displayed in half (like with -- width 500 then we loose one macroblock of the MCU at the end of - -- the line. Previous implementation which naïvely used full mcu + -- the line. Previous implementation which naively used full mcu -- was wrong. Only taking into account visible macroblocks indexSolo = [base + x | y <- [0 .. compH - 1] diff --git a/src/Codec/Picture/Metadata.hs b/src/Codec/Picture/Metadata.hs --- a/src/Codec/Picture/Metadata.hs +++ b/src/Codec/Picture/Metadata.hs @@ -171,7 +171,12 @@ instance Monoid Metadatas where mempty = empty +#if !MIN_VERSION_base(4,11,0) mappend = union +#else +instance Semigroup Metadatas where + (<>) = union +#endif -- | Right based union union :: Metadatas -> Metadatas -> Metadatas