colors: implement no-op color conversions.

diff --git a/basis/colors/colors.factor b/basis/colors/colors.factor
index 5932d0ff156526c238c63b418ee7ee200f12bc8b..9e5fef11344f9861618ec0c3a04924cc6c0a2c6b 100644 (file)
--- a/basis/colors/colors.factor
+++ b/basis/colors/colors.factor
@@ -16,11 +16,11 @@ C: <rgba> rgba
 
 GENERIC: >rgba ( color -- rgba )
 
-M: rgba >rgba ( rgba -- rgba ) ; inline
+M: rgba >rgba ; inline
 
-M: color red>> ( color -- red ) >rgba red>> ;
-M: color green>> ( color -- green ) >rgba green>> ;
-M: color blue>> ( color -- blue ) >rgba blue>> ;
+M: color red>> >rgba red>> ;
+M: color green>> >rgba green>> ;
+M: color blue>> >rgba blue>> ;
 
 : >rgba-components ( object -- r g b a )
     >rgba { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave ; inline

diff --git a/basis/colors/hsv/hsv.factor b/basis/colors/hsv/hsv.factor
index d1f107144cdd970515ddb4dc96fa08cd39f41137..194845efd140ad54e9ad4938fbc3ae7bba08de60 100644 (file)
--- a/basis/colors/hsv/hsv.factor
+++ b/basis/colors/hsv/hsv.factor
@@ -53,6 +53,8 @@ GENERIC: >hsva ( color -- hsva )
 
 M: object >hsva >rgba >hsva ;
 
+M: hsva >hsva ; inline
+
 M:: rgba >hsva ( rgba -- hsva )
     rgba >rgba-components :> ( r g b a )
     r g b sort-triple :> ( z y x )

diff --git a/extra/colors/hsl/hsl.factor b/extra/colors/hsl/hsl.factor
index 79b4966fe66ac690b8334eb08bcc36eadea23dbb..f61bc6e6a9149996d2c34ad6db1e85d9cb69787d 100644 (file)
--- a/extra/colors/hsl/hsl.factor
+++ b/extra/colors/hsl/hsl.factor
@@ -47,6 +47,8 @@ GENERIC: >hsla ( color -- hsla )
 
 M: object >hsla >rgba >hsla ;
 
+M: hsla >hsla ; inline
+
 M: rgba >hsla
     >rgba-components [| r g b |
         r g b min min :> min-c

diff --git a/extra/colors/ryb/ryb.factor b/extra/colors/ryb/ryb.factor
index 96d975263c30650991dc065475513fb037591244..d96cc15f6a11b20fa92736a2a07f84481adf5dcd 100644 (file)
--- a/extra/colors/ryb/ryb.factor
+++ b/extra/colors/ryb/ryb.factor
@@ -71,5 +71,7 @@ GENERIC: >ryba ( color -- ryba )
 
 M: object >ryba >rgba >ryba ;
 
+M: ryba >ryba ; inline
+
 M: rgba >ryba
     >rgba-components [ [ rgb>ryb ] normalized ] [ <ryba> ] bi* ;

diff --git a/extra/colors/yiq/yiq.factor b/extra/colors/yiq/yiq.factor
index 66aa32b6289abe325f30b03da98c5ff0786f62fb..2ab943baa77450381e602ed03285ee750333d9cb 100644 (file)
--- a/extra/colors/yiq/yiq.factor
+++ b/extra/colors/yiq/yiq.factor
@@ -28,6 +28,8 @@ GENERIC: >yiqa ( color -- yiqa )
 
 M: object >yiqa >rgba >yiqa ;
 
+M: yiqa >yiqa ; inline
+
 M:: rgba >yiqa ( rgba -- yiqa )
     rgba >rgba-components :> ( r g b a )
     0.30 r *  0.59 g * 0.11 b * + + :> y

diff --git a/extra/colors/yuv/yuv.factor b/extra/colors/yuv/yuv.factor
index ff0fd838a6226a0d6309885be95c6285a4faddd3..4c06eedde76ae6b3aa8acd82492fe62f73ecd7b9 100644 (file)
--- a/extra/colors/yuv/yuv.factor
+++ b/extra/colors/yuv/yuv.factor
@@ -42,6 +42,8 @@ GENERIC: >yuva ( color -- yuva )
 
 M: object >yuva >rgba >yuva ;
 
+M: yuva >yuva ; inline
+
 M:: rgba >yuva ( rgba -- yuva )
     rgba >rgba-components :> ( r g b a )
     Wr r * Wg g * Wb b * + + :> y