massiv-io 0.1.4.0 → 0.1.5.0
raw patch · 17 files changed
+61/−62 lines, 17 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Data.Massiv.Array.IO: convertEither :: forall r cs e a f. (ColorSpace cs e, FileFormat f, Typeable r) => f -> (a -> String) -> (a -> Maybe (Image r cs e)) -> a -> Either ConvertError (Image r cs e)
- Data.Massiv.Array.IO: fromEitherDecode :: forall r cs e a f. (ColorSpace cs e, FileFormat f, Typeable r) => f -> (a -> String) -> (a -> Maybe (Image r cs e)) -> Either String a -> Image r cs e
- Data.Massiv.Array.IO: fromMaybeEncode :: forall f r cs e b. (ColorSpace cs e, FileFormat f, Typeable r) => f -> Proxy (Image r cs e) -> Maybe b -> b
- Data.Massiv.Array.IO: toProxy :: a -> Proxy a
+ Data.Massiv.Array.IO: -- | Options that can be used during writing a file in this format.
+ Graphics.ColorSpace: -- | A corresponding opaque version of this color space.
+ Graphics.ColorSpace: data family Pixel cs e :: *
+ Graphics.ColorSpace.CMYK: data family Pixel cs e :: *
+ Graphics.ColorSpace.HSI: data family Pixel cs e :: *
+ Graphics.ColorSpace.RGB: data family Pixel cs e :: *
+ Graphics.ColorSpace.X: data family Pixel cs e :: *
+ Graphics.ColorSpace.Y: data family Pixel cs e :: *
+ Graphics.ColorSpace.YCbCr: data family Pixel cs e :: *
- Data.Massiv.Array.IO: data GifLooping :: *
+ Data.Massiv.Array.IO: data GifLooping
- Data.Massiv.Array.IO: data PaletteCreationMethod :: *
+ Data.Massiv.Array.IO: data PaletteCreationMethod
- Data.Massiv.Array.IO: data PaletteOptions :: *
+ Data.Massiv.Array.IO: data PaletteOptions
- Graphics.ColorSpace: data Word16 :: *
+ Graphics.ColorSpace: data Word16
- Graphics.ColorSpace: data Word32 :: *
+ Graphics.ColorSpace: data Word32
- Graphics.ColorSpace: data Word64 :: *
+ Graphics.ColorSpace: data Word64
- Graphics.ColorSpace: data Word8 :: *
+ Graphics.ColorSpace: data Word8
- Graphics.ColorSpace.Complex: data Complex a :: * -> *
+ Graphics.ColorSpace.Complex: data Complex a
Files
- massiv-io.cabal +2/−2
- src/Data/Massiv/Array/IO.hs +1/−1
- src/Data/Massiv/Array/IO/Base.hs +1/−1
- src/Data/Massiv/Array/IO/Image.hs +1/−1
- src/Data/Massiv/Array/IO/Image/JuicyPixels.hs +2/−2
- src/Data/Massiv/Array/IO/Image/Netpbm.hs +2/−2
- src/Graphics/ColorSpace.hs +1/−1
- src/Graphics/ColorSpace/Binary.hs +1/−1
- src/Graphics/ColorSpace/CMYK.hs +1/−1
- src/Graphics/ColorSpace/Complex.hs +1/−1
- src/Graphics/ColorSpace/Elevator.hs +31/−31
- src/Graphics/ColorSpace/HSI.hs +1/−1
- src/Graphics/ColorSpace/Internal.hs +1/−2
- src/Graphics/ColorSpace/RGB.hs +12/−12
- src/Graphics/ColorSpace/X.hs +1/−1
- src/Graphics/ColorSpace/Y.hs +1/−1
- src/Graphics/ColorSpace/YCbCr.hs +1/−1
massiv-io.cabal view
@@ -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
src/Data/Massiv/Array/IO.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental
src/Data/Massiv/Array/IO/Base.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental
src/Data/Massiv/Array/IO/Image.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental
src/Data/Massiv/Array/IO/Image/JuicyPixels.hs view
@@ -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 <lehins@yandex.ru> -- 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 #-}
src/Data/Massiv/Array/IO/Image/Netpbm.hs view
@@ -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 <lehins@yandex.ru> -- 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
src/Graphics/ColorSpace.hs view
@@ -13,7 +13,7 @@ #endif -- | -- Module : Graphics.ColorSpace--- Copyright : (c) Alexey Kuleshevich 2018+-- Copyright : (c) Alexey Kuleshevich 2018-2019 -- License : BSD3 -- Maintainer : Alexey Kuleshevich <lehins@yandex.ru> -- Stability : experimental
src/Graphics/ColorSpace/Binary.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental
src/Graphics/ColorSpace/CMYK.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental
src/Graphics/ColorSpace/Complex.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental
src/Graphics/ColorSpace/Elevator.hs view
@@ -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 <lehins@yandex.ru> -- 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 #-}
src/Graphics/ColorSpace/HSI.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental
src/Graphics/ColorSpace/Internal.hs view
@@ -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 <lehins@yandex.ru> -- 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),
src/Graphics/ColorSpace/RGB.hs view
@@ -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 <lehins@yandex.ru> -- 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 ---
src/Graphics/ColorSpace/X.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental
src/Graphics/ColorSpace/Y.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental
src/Graphics/ColorSpace/YCbCr.hs view
@@ -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 <lehins@yandex.ru> -- Stability : experimental