Remove RealFloat constraint from ColorSpace for Y

lehins · Mar 12, 2021 · c89f062 · c89f062
1 parent d34d582
commit c89f062
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Color/CHANGELOG.md b/Color/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog for Color
 
+## 0.3.1
+
+* Remove `RealFloat` constraint from `ColorSpace` for `Y'`
+
 ## 0.3.0
 
 * Rename `Y` color model into `X` to avoid the annoying name conflict.

diff --git a/Color/src/Graphics/Color/Space/RGB/Luma.hs b/Color/src/Graphics/Color/Space/RGB/Luma.hs
@@ -104,18 +104,17 @@ instance ( Typeable cs
          , ColorSpace (cs 'NonLinear) i e
          , Luma cs
          , RedGreenBlue cs i
-         , RealFloat e
          ) =>
          ColorSpace (Y' cs) i e where
   type BaseModel (Y' cs) = CM.X
   type BaseSpace (Y' cs) = cs 'NonLinear
   toBaseSpace y = pure (coerce y :: e)
   {-# INLINE toBaseSpace #-}
-  fromBaseSpace = rgbLuma
+  fromBaseSpace = fmap fromDouble . rgbLuma
   {-# INLINE fromBaseSpace #-}
-  luminance = luminance . toBaseLinearSpace
+  luminance = luminance . fmap (fromDouble :: Double -> e) . toBaseLinearSpace . fmap toDouble
   {-# INLINE luminance #-}
-  toColorXYZ = toColorXYZ . toBaseLinearSpace
+  toColorXYZ = toColorXYZ . fmap (fromDouble :: Double -> e) . toBaseLinearSpace . fmap toDouble
   {-# INLINE toColorXYZ #-}
 
 -- | Convert Luma directly into the linear version of base space. This is equivalent to