diff --git a/Color/src/Graphics/Color/Adaptation/Internal.hs b/Color/src/Graphics/Color/Adaptation/Internal.hs index 7661c21..ccdb3d5 100644 --- a/Color/src/Graphics/Color/Adaptation/Internal.hs +++ b/Color/src/Graphics/Color/Adaptation/Internal.hs @@ -4,6 +4,7 @@ {-# LANGUAGE PolyKinds #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} -- | -- Module : Graphics.Color.Adaptation.Internal -- Copyright : (c) Alexey Kuleshevich 2019-2020 diff --git a/Color/src/Graphics/Color/Adaptation/VonKries.hs b/Color/src/Graphics/Color/Adaptation/VonKries.hs index 5b8956b..49c88a7 100644 --- a/Color/src/Graphics/Color/Adaptation/VonKries.hs +++ b/Color/src/Graphics/Color/Adaptation/VonKries.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} @@ -5,7 +6,12 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} +#if __GLASGOW_HASKELL__ >= 906 +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE PolyKinds #-} +#else {-# LANGUAGE TypeInType #-} +#endif -- | -- Module : Graphics.Color.Adaptation.VonKries -- Copyright : (c) Alexey Kuleshevich 2018-2020 diff --git a/Color/src/Graphics/Color/Model/Internal.hs b/Color/src/Graphics/Color/Model/Internal.hs index 4546149..9031c4f 100644 --- a/Color/src/Graphics/Color/Model/Internal.hs +++ b/Color/src/Graphics/Color/Model/Internal.hs @@ -4,6 +4,7 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} -- | -- Module : Graphics.Color.Model.Internal @@ -43,7 +44,7 @@ module Graphics.Color.Model.Internal , VU.Vector(V_Color) ) where -import Control.Applicative +import qualified Control.Applicative as A import Control.DeepSeq (NFData(rnf), deepseq) import Data.Default.Class (Default(..)) import Data.Foldable @@ -94,11 +95,11 @@ instance ColorModel cs e => Default (Color cs e) where instance ColorModel cs e => Num (Color cs e) where - (+) = liftA2 (+) + (+) = A.liftA2 (+) {-# INLINE (+) #-} - (-) = liftA2 (-) + (-) = A.liftA2 (-) {-# INLINE (-) #-} - (*) = liftA2 (*) + (*) = A.liftA2 (*) {-# INLINE (*) #-} abs = fmap abs {-# INLINE abs #-} @@ -109,7 +110,7 @@ instance ColorModel cs e => Num (Color cs e) where instance (ColorModel cs e, Fractional e) => Fractional (Color cs e) where - (/) = liftA2 (/) + (/) = A.liftA2 (/) {-# INLINE (/) #-} recip = fmap recip {-# INLINE recip #-} diff --git a/Color/src/Graphics/Color/Space/DIN99.hs b/Color/src/Graphics/Color/Space/DIN99.hs index 9a368ab..2c32d4d 100644 --- a/Color/src/Graphics/Color/Space/DIN99.hs +++ b/Color/src/Graphics/Color/Space/DIN99.hs @@ -25,7 +25,6 @@ import GHC.Generics (Generic) import Graphics.Color.Model.Internal import Graphics.Color.Space.Internal import Graphics.Color.Space.CIE1976.LAB -import Graphics.Color.Illuminant.Wikipedia as W data DIN99 (i :: k) diff --git a/Color/src/Graphics/Color/Space/Internal.hs b/Color/src/Graphics/Color/Space/Internal.hs index d311678..16be2a6 100644 --- a/Color/src/Graphics/Color/Space/Internal.hs +++ b/Color/src/Graphics/Color/Space/Internal.hs @@ -11,6 +11,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE ViewPatterns #-} -- | diff --git a/Color/src/Graphics/Color/Standard/RAL.hs b/Color/src/Graphics/Color/Standard/RAL.hs index 2a70b46..d0d6503 100644 --- a/Color/src/Graphics/Color/Standard/RAL.hs +++ b/Color/src/Graphics/Color/Standard/RAL.hs @@ -1,10 +1,16 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NegativeLiterals #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} +#if __GLASGOW_HASKELL__ >= 906 +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE PolyKinds #-} +#else {-# LANGUAGE TypeInType #-} +#endif -- | -- Module : Graphics.Color.Standard.RAL -- Copyright : (c) Alexey Kuleshevich 2019-2020 diff --git a/Color/src/Graphics/Pixel/ColorSpace.hs b/Color/src/Graphics/Pixel/ColorSpace.hs index 9293f2f..868d4ea 100644 --- a/Color/src/Graphics/Pixel/ColorSpace.hs +++ b/Color/src/Graphics/Pixel/ColorSpace.hs @@ -4,6 +4,7 @@ {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE ViewPatterns #-} -- | diff --git a/stack.yaml b/stack.yaml index 92d2603..832f1d5 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-18.28 +resolver: lts-23.00 packages: - Color extra-deps: []