diff --git a/massiv-io.cabal b/massiv-io.cabal --- a/massiv-io.cabal +++ b/massiv-io.cabal @@ -1,5 +1,5 @@ name: massiv-io -version: 0.1.4.0 +version: 0.1.5.0 synopsis: Import/export of Image files into massiv Arrays description: This package contains functionality for import/export of arrays into the real world. For now it only has the ability to read/write @@ -9,7 +9,7 @@ license-file: LICENSE author: Alexey Kuleshevich maintainer: alexey@kuleshevi.ch -copyright: 2018 Alexey Kuleshevich +copyright: 2018-2019 Alexey Kuleshevich category: Data, Data Structures build-type: Simple extra-source-files: README.md diff --git a/src/Data/Massiv/Array/IO.hs b/src/Data/Massiv/Array/IO.hs --- a/src/Data/Massiv/Array/IO.hs +++ b/src/Data/Massiv/Array/IO.hs @@ -8,7 +8,7 @@ {-# LANGUAGE TypeSynonymInstances #-} -- | -- Module : Data.Massiv.Array.IO --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Data/Massiv/Array/IO/Base.hs b/src/Data/Massiv/Array/IO/Base.hs --- a/src/Data/Massiv/Array/IO/Base.hs +++ b/src/Data/Massiv/Array/IO/Base.hs @@ -7,7 +7,7 @@ {-# LANGUAGE UndecidableInstances #-} -- | -- Module : Data.Massiv.Array.IO.Base --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Data/Massiv/Array/IO/Image.hs b/src/Data/Massiv/Array/IO/Image.hs --- a/src/Data/Massiv/Array/IO/Image.hs +++ b/src/Data/Massiv/Array/IO/Image.hs @@ -5,7 +5,7 @@ {-# LANGUAGE TypeSynonymInstances #-} -- | -- Module : Data.Massiv.Array.IO.Image --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Data/Massiv/Array/IO/Image/JuicyPixels.hs b/src/Data/Massiv/Array/IO/Image/JuicyPixels.hs --- a/src/Data/Massiv/Array/IO/Image/JuicyPixels.hs +++ b/src/Data/Massiv/Array/IO/Image/JuicyPixels.hs @@ -9,7 +9,7 @@ {-# LANGUAGE TypeOperators #-} -- | -- Module : Data.Massiv.Array.IO.Image.JuicyPixels --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental @@ -969,6 +969,6 @@ JP.Image jpx -> Maybe (Image S cs e) fromJPImageUnsafe (JP.Image n m !v) = do guard (n * m * sizeOf (undefined :: Pixel cs e) == V.length v) - return $ fromVector Seq (m :. n) $ V.unsafeCast v + return $ fromVector Par (m :. n) $ V.unsafeCast v {-# INLINE fromJPImageUnsafe #-} diff --git a/src/Data/Massiv/Array/IO/Image/Netpbm.hs b/src/Data/Massiv/Array/IO/Image/Netpbm.hs --- a/src/Data/Massiv/Array/IO/Image/Netpbm.hs +++ b/src/Data/Massiv/Array/IO/Image/Netpbm.hs @@ -9,7 +9,7 @@ {-# LANGUAGE TypeSynonymInstances #-} -- | -- Module : Data.Massiv.Array.IO.Image.Netpbm --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental @@ -166,7 +166,7 @@ => Int -> Int -> V.Vector a -> Maybe (Image S cs e) fromNetpbmImageUnsafe m n v = do guard (n * m == V.length v) - return $ fromVector Seq (m :. n) $ V.unsafeCast v + return $ fromVector Par (m :. n) $ V.unsafeCast v diff --git a/src/Graphics/ColorSpace.hs b/src/Graphics/ColorSpace.hs --- a/src/Graphics/ColorSpace.hs +++ b/src/Graphics/ColorSpace.hs @@ -13,7 +13,7 @@ #endif -- | -- Module : Graphics.ColorSpace --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Graphics/ColorSpace/Binary.hs b/src/Graphics/ColorSpace/Binary.hs --- a/src/Graphics/ColorSpace/Binary.hs +++ b/src/Graphics/ColorSpace/Binary.hs @@ -8,7 +8,7 @@ {-# LANGUAGE TypeFamilies #-} -- | -- Module : Graphics.ColorSpace.Binary --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Graphics/ColorSpace/CMYK.hs b/src/Graphics/ColorSpace/CMYK.hs --- a/src/Graphics/ColorSpace/CMYK.hs +++ b/src/Graphics/ColorSpace/CMYK.hs @@ -7,7 +7,7 @@ {-# LANGUAGE TypeFamilies #-} -- | -- Module : Graphics.ColorSpace.CMYK --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Graphics/ColorSpace/Complex.hs b/src/Graphics/ColorSpace/Complex.hs --- a/src/Graphics/ColorSpace/Complex.hs +++ b/src/Graphics/ColorSpace/Complex.hs @@ -6,7 +6,7 @@ #endif -- | -- Module : Graphics.ColorSpace.Complex --- Copyright : (c) Alexey Kuleshevich 2016-2018 +-- Copyright : (c) Alexey Kuleshevich 2016-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Graphics/ColorSpace/Elevator.hs b/src/Graphics/ColorSpace/Elevator.hs --- a/src/Graphics/ColorSpace/Elevator.hs +++ b/src/Graphics/ColorSpace/Elevator.hs @@ -6,7 +6,7 @@ #endif -- | -- Module : Graphics.ColorSpace.Elevator --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental @@ -177,17 +177,17 @@ -- | Values between @[0, 127]@ instance Elevator Int8 where - eToWord8 = fromIntegral . (max 0) + eToWord8 = fromIntegral . max 0 {-# INLINE eToWord8 #-} - eToWord16 = raiseUp . (max 0) + eToWord16 = raiseUp . max 0 {-# INLINE eToWord16 #-} - eToWord32 = raiseUp . (max 0) + eToWord32 = raiseUp . max 0 {-# INLINE eToWord32 #-} - eToWord64 = raiseUp . (max 0) + eToWord64 = raiseUp . max 0 {-# INLINE eToWord64 #-} - eToFloat = squashTo1 . (max 0) + eToFloat = squashTo1 . max 0 {-# INLINE eToFloat #-} - eToDouble = squashTo1 . (max 0) + eToDouble = squashTo1 . max 0 {-# INLINE eToDouble #-} eFromDouble = stretch . clamp01 {-# INLINE eFromDouble #-} @@ -195,17 +195,17 @@ -- | Values between @[0, 32767]@ instance Elevator Int16 where - eToWord8 = dropDown . (max 0) + eToWord8 = dropDown . max 0 {-# INLINE eToWord8 #-} - eToWord16 = fromIntegral . (max 0) + eToWord16 = fromIntegral . max 0 {-# INLINE eToWord16 #-} - eToWord32 = raiseUp . (max 0) + eToWord32 = raiseUp . max 0 {-# INLINE eToWord32 #-} - eToWord64 = raiseUp . (max 0) + eToWord64 = raiseUp . max 0 {-# INLINE eToWord64 #-} - eToFloat = squashTo1 . (max 0) + eToFloat = squashTo1 . max 0 {-# INLINE eToFloat #-} - eToDouble = squashTo1 . (max 0) + eToDouble = squashTo1 . max 0 {-# INLINE eToDouble #-} eFromDouble = stretch . clamp01 {-# INLINE eFromDouble #-} @@ -213,17 +213,17 @@ -- | Values between @[0, 2147483647]@ instance Elevator Int32 where - eToWord8 = dropDown . (max 0) + eToWord8 = dropDown . max 0 {-# INLINE eToWord8 #-} - eToWord16 = dropDown . (max 0) + eToWord16 = dropDown . max 0 {-# INLINE eToWord16 #-} - eToWord32 = fromIntegral . (max 0) + eToWord32 = fromIntegral . max 0 {-# INLINE eToWord32 #-} - eToWord64 = raiseUp . (max 0) + eToWord64 = raiseUp . max 0 {-# INLINE eToWord64 #-} - eToFloat = squashTo1 . (max 0) + eToFloat = squashTo1 . max 0 {-# INLINE eToFloat #-} - eToDouble = squashTo1 . (max 0) + eToDouble = squashTo1 . max 0 {-# INLINE eToDouble #-} eFromDouble = stretch . clamp01 {-# INLINE eFromDouble #-} @@ -231,17 +231,17 @@ -- | Values between @[0, 9223372036854775807]@ instance Elevator Int64 where - eToWord8 = dropDown . (max 0) + eToWord8 = dropDown . max 0 {-# INLINE eToWord8 #-} - eToWord16 = dropDown . (max 0) + eToWord16 = dropDown . max 0 {-# INLINE eToWord16 #-} - eToWord32 = dropDown . (max 0) + eToWord32 = dropDown . max 0 {-# INLINE eToWord32 #-} - eToWord64 = fromIntegral . (max 0) + eToWord64 = fromIntegral . max 0 {-# INLINE eToWord64 #-} - eToFloat = squashTo1 . (max 0) + eToFloat = squashTo1 . max 0 {-# INLINE eToFloat #-} - eToDouble = squashTo1 . (max 0) + eToDouble = squashTo1 . max 0 {-# INLINE eToDouble #-} eFromDouble = stretch . clamp01 {-# INLINE eFromDouble #-} @@ -249,17 +249,17 @@ -- | Values between @[0, 9223372036854775807]@ on 64bit instance Elevator Int where - eToWord8 = dropDown . (max 0) + eToWord8 = dropDown . max 0 {-# INLINE eToWord8 #-} - eToWord16 = dropDown . (max 0) + eToWord16 = dropDown . max 0 {-# INLINE eToWord16 #-} - eToWord32 = dropDown . (max 0) + eToWord32 = dropDown . max 0 {-# INLINE eToWord32 #-} - eToWord64 = fromIntegral . (max 0) + eToWord64 = fromIntegral . max 0 {-# INLINE eToWord64 #-} - eToFloat = squashTo1 . (max 0) + eToFloat = squashTo1 . max 0 {-# INLINE eToFloat #-} - eToDouble = squashTo1 . (max 0) + eToDouble = squashTo1 . max 0 {-# INLINE eToDouble #-} eFromDouble = stretch . clamp01 {-# INLINE eFromDouble #-} diff --git a/src/Graphics/ColorSpace/HSI.hs b/src/Graphics/ColorSpace/HSI.hs --- a/src/Graphics/ColorSpace/HSI.hs +++ b/src/Graphics/ColorSpace/HSI.hs @@ -7,7 +7,7 @@ {-# LANGUAGE TypeFamilies #-} -- | -- Module : Graphics.ColorSpace.HSI --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Graphics/ColorSpace/Internal.hs b/src/Graphics/ColorSpace/Internal.hs --- a/src/Graphics/ColorSpace/Internal.hs +++ b/src/Graphics/ColorSpace/Internal.hs @@ -5,7 +5,7 @@ {-# LANGUAGE TypeFamilies #-} -- | -- Module : Graphics.ColorSpace.Internal --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental @@ -33,7 +33,6 @@ -- | A Pixel family with a color space and a precision of elements. data family Pixel cs e :: * - class (Eq cs, Enum cs, Show cs, Bounded cs, Typeable cs, Functor (Pixel cs), Applicative (Pixel cs), Foldable (Pixel cs), diff --git a/src/Graphics/ColorSpace/RGB.hs b/src/Graphics/ColorSpace/RGB.hs --- a/src/Graphics/ColorSpace/RGB.hs +++ b/src/Graphics/ColorSpace/RGB.hs @@ -1,13 +1,13 @@ -{-# LANGUAGE BangPatterns #-} -{-# LANGUAGE DeriveDataTypeable #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE BangPatterns #-} +{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TypeFamilies #-} -- | -- Module : Graphics.ColorSpace.RGB --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental @@ -17,11 +17,11 @@ RGB(..), RGBA(..), Pixel(..) ) where -import Prelude hiding (map) -import Foreign.Ptr -import Foreign.Storable -import Data.Typeable (Typeable) -import Graphics.ColorSpace.Internal +import Data.Typeable (Typeable) +import Foreign.Ptr +import Foreign.Storable +import Graphics.ColorSpace.Internal +import Prelude hiding (map) ----------- --- RGB --- diff --git a/src/Graphics/ColorSpace/X.hs b/src/Graphics/ColorSpace/X.hs --- a/src/Graphics/ColorSpace/X.hs +++ b/src/Graphics/ColorSpace/X.hs @@ -7,7 +7,7 @@ {-# LANGUAGE TypeFamilies #-} -- | -- Module : Graphics.ColorSpace.X --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Graphics/ColorSpace/Y.hs b/src/Graphics/ColorSpace/Y.hs --- a/src/Graphics/ColorSpace/Y.hs +++ b/src/Graphics/ColorSpace/Y.hs @@ -7,7 +7,7 @@ {-# LANGUAGE TypeFamilies #-} -- | -- Module : Graphics.ColorSpace.Y --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental diff --git a/src/Graphics/ColorSpace/YCbCr.hs b/src/Graphics/ColorSpace/YCbCr.hs --- a/src/Graphics/ColorSpace/YCbCr.hs +++ b/src/Graphics/ColorSpace/YCbCr.hs @@ -7,7 +7,7 @@ {-# LANGUAGE TypeFamilies #-} -- | -- Module : Graphics.ColorSpace.YCbCr --- Copyright : (c) Alexey Kuleshevich 2018 +-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich -- Stability : experimental