colors: Inline >rgba methods.

diff --git a/basis/colors/colors.factor b/basis/colors/colors.factor
index 25830630e9aed9ff4733dab7e7e4daf4363d66cc..499fab7375c910524cf518dcf32406ba465e596b 100644 (file)
--- a/basis/colors/colors.factor
+++ b/basis/colors/colors.factor
@@ -16,7 +16,7 @@ C: <rgba> rgba
 
 GENERIC: >rgba ( color -- rgba )
 
-M: rgba >rgba ( rgba -- rgba ) ;
+M: rgba >rgba ( rgba -- rgba ) ; inline
 
 M: color red>> ( color -- red ) >rgba red>> ;
 M: color green>> ( color -- green ) >rgba green>> ;

diff --git a/basis/colors/gray/gray.factor b/basis/colors/gray/gray.factor
index 3a798f5ae18dbf45f1811b305dac4666a0fd2d42..532a091c078d11e20d7e4f17b26c57d00878dde9 100644 (file)
--- a/basis/colors/gray/gray.factor
+++ b/basis/colors/gray/gray.factor
@@ -8,7 +8,7 @@ TUPLE: gray < color { gray read-only } { alpha read-only } ;
 C: <gray> gray
 
 M: gray >rgba ( gray -- rgba )
-    [ gray>> dup dup ] [ alpha>> ] bi <rgba> ;
+    [ gray>> dup dup ] [ alpha>> ] bi <rgba> ; inline
 
 M: gray red>> gray>> ;
 

diff --git a/basis/colors/hsv/hsv.factor b/basis/colors/hsv/hsv.factor
index 65e51be475837d846752b4d45b3cc86ae5eaffbe..128d16cb5a498a71784493add8b10c3130f85d14 100644 (file)
--- a/basis/colors/hsv/hsv.factor
+++ b/basis/colors/hsv/hsv.factor
@@ -40,7 +40,7 @@ M: hsva >rgba ( hsva -- rgba )
             { 4 [ [ t ] [ p ] [ value>> ] tri ] }
             { 5 [ [ value>> ] [ p ] [ q ] tri ] }
         } case
-    ] [ alpha>> ] bi <rgba> ;
+    ] [ alpha>> ] bi <rgba> ; inline
 
 :: rgba>hsva ( rgba -- hsva )
     rgba >rgba-components :> ( r g b a )

diff --git a/extra/colors/cmyk/cmyk.factor b/extra/colors/cmyk/cmyk.factor
index 6492998d9b7a0d883f603c94baf883112a1de3f0..598d5c6352316efa61a2e19c197568a55dd8d686 100644 (file)
--- a/extra/colors/cmyk/cmyk.factor
+++ b/extra/colors/cmyk/cmyk.factor
@@ -19,7 +19,7 @@ M: cmyka >rgba
     [ [ cyan>> ] [ black>> ] bi + ]
     [ [ magenta>> ] [ black>> ] bi + ]
     [ [ yellow>> ] [ black>> ] bi + ] tri
-    [ 1.0 min 1.0 swap - ] tri@ 1.0 <rgba> ;
+    [ 1.0 min 1.0 swap - ] tri@ 1.0 <rgba> ; inline
 
 : rgba>cmyka ( rgba -- cmyka )
     >rgba-components [

diff --git a/extra/colors/hsl/hsl.factor b/extra/colors/hsl/hsl.factor
index 90478dfe32320bd8107de5bef9a6c9422ab3df76..feed829f30157a1a8965a0ae0e5369bc6fb14b17 100644 (file)
--- a/extra/colors/hsl/hsl.factor
+++ b/extra/colors/hsl/hsl.factor
@@ -41,7 +41,7 @@ M: hsla >rgba
             p q h value
             p q h 1/3 - value
         ] if
-    ] dip <rgba> ;
+    ] dip <rgba> ; inline
 
 : rgba>hsla ( rgba -- hsla )
     >rgba-components [| r g b |

diff --git a/extra/colors/yiq/yiq.factor b/extra/colors/yiq/yiq.factor
index d34f9b3a029b5e5e99c0ffdd2a0a34d8b74608ba..300539d65940b931512456dc48804a8c04ede1fe 100644 (file)
--- a/extra/colors/yiq/yiq.factor
+++ b/extra/colors/yiq/yiq.factor
@@ -21,7 +21,7 @@ M: yiqa >rgba
         [ [ 0.276066 * ] [ 0.639810 * ] bi* + - ]
         [ [ 1.105450 * ] [ 1.729860 * ] bi* - - ]
         3tri [ 0.0 1.0 clamp ] tri@
-    ] dip <rgba> ;
+    ] dip <rgba> ; inline
 
 : rgba>yiqa ( rgba -- yiqa )
     >rgba-components [