colour 2.3.2 → 2.3.3

raw patch · 8 files changed

+13/−16 lines, 8 filesdep ~basePVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• CHANGELOG +4/−0
• Data/Colour.hs +2/−3
• Data/Colour/CIE.hs +2/−2
• Data/Colour/Names.hs +1/−1
• Data/Colour/RGBSpace.hs +0/−1
• Data/Colour/SRGB.hs +1/−7
• Data/Colour/SRGB/Linear.hs +2/−1
• colour.cabal +1/−1

@@ -1,3 +1,7 @@+New in version 2.3.3:++- Support for GHC 7.4 from Eugene Kirpichov.+ New in version 2.3.2:  - Support for GHC 7.4.1 from Brent Yorgey.

@@ -128,7 +128,6 @@ import Data.Char import Data.Colour.Internal import qualified Data.Colour.SRGB.Linear-import qualified Data.Colour.SRGB import Data.Colour.CIE.Chromaticity (app_prec, infix_prec)  instance (Fractional a, Show a) => Show (Colour a) where@@ -138,7 +137,7 @@             . showString " " . (showsPrec (app_prec+1) r)             . showString " " . (showsPrec (app_prec+1) g)             . showString " " . (showsPrec (app_prec+1) b)-    Data.Colour.SRGB.RGB r g b = Data.Colour.SRGB.Linear.toRGB c+    Data.Colour.SRGB.Linear.RGB r g b = Data.Colour.SRGB.Linear.toRGB c  instance (Fractional a, Read a) => Read (Colour a) where   readsPrec d r = readParen (d > app_prec)@@ -157,7 +156,7 @@ linearConstructorQualifiedName = "Data.Colour.SRGB.Linear.rgb" linearConstructorName = "rgb" -instance (Fractional a, Show a) => Show (AlphaColour a) where+instance (Fractional a, Show a, Eq a) => Show (AlphaColour a) where   showsPrec d ac | a == 0 = showString "transparent"                  | otherwise = showParen (d > infix_prec) showStr    where

@@ -144,9 +144,9 @@ -- perceptually uniform colour space. -- If you don't know what white point to use, use -- 'Data.Colour.CIE.Illuminant.d65'.-cieLUV :: (Ord a, Floating a) => Chromaticity a -- ^White point+cieLuv :: (Ord a, Floating a) => Chromaticity a -- ^White point                               -> Colour a -> (a,a,a)-cieLUV white_ch c = (l, 13*l*(u'-un'), 13*l*(v'-vn'))+cieLuv white_ch c = (l, 13*l*(u'-un'), 13*l*(v'-vn'))  where   white = chromaColour white_ch 1.0   (u', v') = u'v' c

@@ -185,7 +185,7 @@ import Data.Colour.SRGB import Data.Colour (black) -readColourName :: (Ord a, Floating a) => String -> Maybe (Colour a)+readColourName :: (Monad m, Ord a, Floating a) => String -> m (Colour a) readColourName "aliceblue" = return aliceblue readColourName "antiquewhite" = return antiquewhite readColourName "aqua" = return aqua

@@ -47,7 +47,6 @@ where  import Data.Monoid-import Data.Colour.Internal (Colour) import Data.Colour.CIE.Chromaticity import Data.Colour.Matrix import Data.Colour.RGB

@@ -1,5 +1,5 @@ {--Copyright (c) 2008, 2009+Copyright (c) 2008 Russell O'Connor  Permission is hereby granted, free of charge, to any person obtaining a copy@@ -38,12 +38,6 @@ import Data.Colour.Internal (quantize) import Data.Colour.SRGB.Linear import Data.Colour.RGBSpace hiding (transferFunction)--{- a rewrite rule to think about adding.-   Should I have some instance restrictions (like Word8/Word16 Float/Double)?-# RULES "sRGBBounded" -  forall r g b. toSRGBBounded (sRGBBounded r g b) = RGB r g b #--}  {- Non-linear colour space -} {- the sRGB transfer function approximates a gamma of about 1/2.2 -}

@@ -24,7 +24,8 @@ -- |Provides a /linear/ colour space with the same gamut as -- "Data.Colour.SRGB". module Data.Colour.SRGB.Linear - (rgb, toRGB+ (Colour, RGB(..)+ ,rgb, toRGB  ,sRGBGamut  ) where

@@ -1,5 +1,5 @@ Name:                colour-Version:             2.3.2+Version:             2.3.3 Cabal-Version:       >= 1.6 License:             MIT License-file:        LICENSE