diff --git a/basis/colors/colors.factor b/basis/colors/colors.factor index 25830630e9..499fab7375 100644 --- a/basis/colors/colors.factor +++ b/basis/colors/colors.factor @@ -16,7 +16,7 @@ C: 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 3a798f5ae1..532a091c07 100644 --- 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 M: gray >rgba ( gray -- rgba ) - [ gray>> dup dup ] [ alpha>> ] bi ; + [ gray>> dup dup ] [ alpha>> ] bi ; inline M: gray red>> gray>> ; diff --git a/basis/colors/hsv/hsv.factor b/basis/colors/hsv/hsv.factor index 65e51be475..128d16cb5a 100644 --- 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 ; + ] [ alpha>> ] bi ; 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 6492998d9b..598d5c6352 100644 --- 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 ; + [ 1.0 min 1.0 swap - ] tri@ 1.0 ; inline : rgba>cmyka ( rgba -- cmyka ) >rgba-components [ diff --git a/extra/colors/hsl/hsl.factor b/extra/colors/hsl/hsl.factor index 90478dfe32..feed829f30 100644 --- 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 ; + ] dip ; 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 d34f9b3a02..300539d659 100644 --- 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 ; + ] dip ; inline : rgba>yiqa ( rgba -- yiqa ) >rgba-components [