From ba132fc2a84448bec9283f8267649816cea034cd Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Wed, 28 Nov 2012 18:01:33 +1000 Subject: [PATCH] Set functions to inline --- src/color/channel.rs | 154 +++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/src/color/channel.rs b/src/color/channel.rs index eb7d10d..5b00bd0 100644 --- a/src/color/channel.rs +++ b/src/color/channel.rs @@ -20,121 +20,121 @@ pub trait Channel { pub pure fn convert_channel(val: T) -> U { val.convert_channel() } pub impl u8: Channel { - static pure fn channel_max() -> u8 { 0xFF } // 2^8 + #[inline(always)] static pure fn channel_max() -> u8 { 0xFF } // 2^8 - static pure fn from_channel(val: T) -> u8 { val.to_channel_u8() } - pure fn convert_channel() -> T { from_channel(self) } + #[inline(always)] static pure fn from_channel(val: T) -> u8 { val.to_channel_u8() } + #[inline(always)] pure fn convert_channel() -> T { from_channel(self) } - pure fn to_channel_u8() -> u8 { self } - pure fn to_channel_u16() -> u16 { (self as u16 << 8) | self as u16 } - pure fn to_channel_u32() -> u32 { (self.to_channel_u16() as u32 << 16) | self.to_channel_u16() as u32 } - pure fn to_channel_u64() -> u64 { (self.to_channel_u32() as u64 << 32) | self.to_channel_u32() as u64 } - pure fn to_channel_f32() -> f32 { (self as f32) / (0xFF as f32) } - pure fn to_channel_f64() -> f64 { (self as f64) / (0xFF as f64) } - pure fn to_channel_float() -> float { (self as float) / (0xFF as float) } + #[inline(always)] pure fn to_channel_u8() -> u8 { self } + #[inline(always)] pure fn to_channel_u16() -> u16 { (self as u16 << 8) | self as u16 } + #[inline(always)] pure fn to_channel_u32() -> u32 { (self.to_channel_u16() as u32 << 16) | self.to_channel_u16() as u32 } + #[inline(always)] pure fn to_channel_u64() -> u64 { (self.to_channel_u32() as u64 << 32) | self.to_channel_u32() as u64 } + #[inline(always)] pure fn to_channel_f32() -> f32 { (self as f32) / (0xFF as f32) } + #[inline(always)] pure fn to_channel_f64() -> f64 { (self as f64) / (0xFF as f64) } + #[inline(always)] pure fn to_channel_float() -> float { (self as float) / (0xFF as float) } - pure fn inverse() -> u8 { !self } + #[inline(always)] pure fn inverse() -> u8 { !self } } pub impl u16: Channel { - static pure fn channel_max() -> u16 { 0xFFFF } // 2^16 + #[inline(always)] static pure fn channel_max() -> u16 { 0xFFFF } // 2^16 - static pure fn from_channel(val: T) -> u16 { val.to_channel_u16() } - pure fn convert_channel() -> T { from_channel(self) } + #[inline(always)] static pure fn from_channel(val: T) -> u16 { val.to_channel_u16() } + #[inline(always)] pure fn convert_channel() -> T { from_channel(self) } - pure fn to_channel_u8() -> u8 { self / 0x100 as u8 } - pure fn to_channel_u16() -> u16 { self } - pure fn to_channel_u32() -> u32 { (self as u32 << 16) | self as u32 } - pure fn to_channel_u64() -> u64 { (self.to_channel_u32() as u64 << 32) | self.to_channel_u32() as u64 } - pure fn to_channel_f32() -> f32 { self / 0xFFFF as f32 } - pure fn to_channel_f64() -> f64 { self / 0xFFFF as f64 } - pure fn to_channel_float() -> float { self / 0xFFFF as float } + #[inline(always)] pure fn to_channel_u8() -> u8 { self / 0x100 as u8 } + #[inline(always)] pure fn to_channel_u16() -> u16 { self } + #[inline(always)] pure fn to_channel_u32() -> u32 { (self as u32 << 16) | self as u32 } + #[inline(always)] pure fn to_channel_u64() -> u64 { (self.to_channel_u32() as u64 << 32) | self.to_channel_u32() as u64 } + #[inline(always)] pure fn to_channel_f32() -> f32 { self / 0xFFFF as f32 } + #[inline(always)] pure fn to_channel_f64() -> f64 { self / 0xFFFF as f64 } + #[inline(always)] pure fn to_channel_float() -> float { self / 0xFFFF as float } - pure fn inverse() -> u16 { !self } + #[inline(always)] pure fn inverse() -> u16 { !self } } pub impl u32: Channel { - static pure fn channel_max() -> u32 { 0xFFFF_FFFF } // 2^32 + #[inline(always)] static pure fn channel_max() -> u32 { 0xFFFF_FFFF } // 2^32 - static pure fn from_channel(val: T) -> u32 { val.to_channel_u32() } - pure fn convert_channel() -> T { from_channel(self) } + #[inline(always)] static pure fn from_channel(val: T) -> u32 { val.to_channel_u32() } + #[inline(always)] pure fn convert_channel() -> T { from_channel(self) } - pure fn to_channel_u8() -> u8 { self / 0x1_0000_00 as u8 } - pure fn to_channel_u16() -> u16 { self / 0x1_0000 as u16 } - pure fn to_channel_u32() -> u32 { self } - pure fn to_channel_u64() -> u64 { (self as u64 << 32) | self as u64 } - pure fn to_channel_f32() -> f32 { self / 0xFFFF_FFFF as f32 } - pure fn to_channel_f64() -> f64 { self / 0xFFFF_FFFF as f64 } - pure fn to_channel_float() -> float { self / 0xFFFF_FFFF as float } + #[inline(always)] pure fn to_channel_u8() -> u8 { self / 0x1_0000_00 as u8 } + #[inline(always)] pure fn to_channel_u16() -> u16 { self / 0x1_0000 as u16 } + #[inline(always)] pure fn to_channel_u32() -> u32 { self } + #[inline(always)] pure fn to_channel_u64() -> u64 { (self as u64 << 32) | self as u64 } + #[inline(always)] pure fn to_channel_f32() -> f32 { self / 0xFFFF_FFFF as f32 } + #[inline(always)] pure fn to_channel_f64() -> f64 { self / 0xFFFF_FFFF as f64 } + #[inline(always)] pure fn to_channel_float() -> float { self / 0xFFFF_FFFF as float } - pure fn inverse() -> u32 { !self } + #[inline(always)] pure fn inverse() -> u32 { !self } } pub impl u64: Channel { - static pure fn channel_max() -> u64 { 0xFFFF_FFFF_FFFF_FFFF_u64 } // 2^64 + #[inline(always)] static pure fn channel_max() -> u64 { 0xFFFF_FFFF_FFFF_FFFF_u64 } // 2^64 - static pure fn from_channel(val: T) -> u64 { val.to_channel_u64() } - pure fn convert_channel() -> T { from_channel(self) } + #[inline(always)] static pure fn from_channel(val: T) -> u64 { val.to_channel_u64() } + #[inline(always)] pure fn convert_channel() -> T { from_channel(self) } - pure fn to_channel_u8() -> u8 { self / 0x1_0000_0000_0000_00 as u8 } - pure fn to_channel_u16() -> u16 { self / 0x1_0000_0000_0000 as u16 } - pure fn to_channel_u32() -> u32 { self / 0x1_0000_0000 as u32 } - pure fn to_channel_u64() -> u64 { self } - pure fn to_channel_f32() -> f32 { self / 0xFFFF_FFFF_FFFF_FFFF_u64 as f32 } - pure fn to_channel_f64() -> f64 { self / 0xFFFF_FFFF_FFFF_FFFF_u64 as f64 } - pure fn to_channel_float() -> float { self / 0xFFFF_FFFF_FFFF_FFFF_u64 as float } + #[inline(always)] pure fn to_channel_u8() -> u8 { self / 0x1_0000_0000_0000_00 as u8 } + #[inline(always)] pure fn to_channel_u16() -> u16 { self / 0x1_0000_0000_0000 as u16 } + #[inline(always)] pure fn to_channel_u32() -> u32 { self / 0x1_0000_0000 as u32 } + #[inline(always)] pure fn to_channel_u64() -> u64 { self } + #[inline(always)] pure fn to_channel_f32() -> f32 { self / 0xFFFF_FFFF_FFFF_FFFF_u64 as f32 } + #[inline(always)] pure fn to_channel_f64() -> f64 { self / 0xFFFF_FFFF_FFFF_FFFF_u64 as f64 } + #[inline(always)] pure fn to_channel_float() -> float { self / 0xFFFF_FFFF_FFFF_FFFF_u64 as float } - pure fn inverse() -> u64 { !self } + #[inline(always)] pure fn inverse() -> u64 { !self } } pub impl f32: Channel { - static pure fn channel_max() -> f32 { 1f32 } + #[inline(always)] static pure fn channel_max() -> f32 { 1f32 } - static pure fn from_channel(val: T) -> f32 { val.to_channel_f32() } - pure fn convert_channel() -> T { from_channel(self) } + #[inline(always)] static pure fn from_channel(val: T) -> f32 { val.to_channel_f32() } + #[inline(always)] pure fn convert_channel() -> T { from_channel(self) } - pure fn to_channel_u8() -> u8 { self * (0xFFu8 as f32) as u8 } - pure fn to_channel_u16() -> u16 { self * (0xFFFFu16 as f32) as u16 } - pure fn to_channel_u32() -> u32 { fail(~"to_channel_u32 not yet implemented for f32") } - pure fn to_channel_u64() -> u64 { fail(~"to_channel_u64 not yet implemented for f32") } - pure fn to_channel_f32() -> f32 { self } - pure fn to_channel_f64() -> f64 { self as f64 } - pure fn to_channel_float() -> float { self as float } + #[inline(always)] pure fn to_channel_u8() -> u8 { self * (0xFFu8 as f32) as u8 } + #[inline(always)] pure fn to_channel_u16() -> u16 { self * (0xFFFFu16 as f32) as u16 } + #[inline(always)] pure fn to_channel_u32() -> u32 { fail(~"to_channel_u32 not yet implemented for f32") } + #[inline(always)] pure fn to_channel_u64() -> u64 { fail(~"to_channel_u64 not yet implemented for f32") } + #[inline(always)] pure fn to_channel_f32() -> f32 { self } + #[inline(always)] pure fn to_channel_f64() -> f64 { self as f64 } + #[inline(always)] pure fn to_channel_float() -> float { self as float } - pure fn inverse() -> f32 { 1.0 - self } + #[inline(always)] pure fn inverse() -> f32 { 1.0 - self } } pub impl f64: Channel { - static pure fn channel_max() -> f64 { 1f64 } + #[inline(always)] static pure fn channel_max() -> f64 { 1f64 } - static pure fn from_channel(val: T) -> f64 { val.to_channel_f64() } - pure fn convert_channel() -> T { from_channel(self) } + #[inline(always)] static pure fn from_channel(val: T) -> f64 { val.to_channel_f64() } + #[inline(always)] pure fn convert_channel() -> T { from_channel(self) } - pure fn to_channel_u8() -> u8 { self * (0xFFu8 as f64) as u8 } - pure fn to_channel_u16() -> u16 { self * (0xFFFFu16 as f64) as u16 } - pure fn to_channel_u32() -> u32 { fail(~"to_channel_u32 not yet implemented for f64") } - pure fn to_channel_u64() -> u64 { fail(~"to_channel_u64 not yet implemented for f64") } - pure fn to_channel_f32() -> f32 { self as f32 } - pure fn to_channel_f64() -> f64 { self } - pure fn to_channel_float() -> float { self as float } + #[inline(always)] pure fn to_channel_u8() -> u8 { self * (0xFFu8 as f64) as u8 } + #[inline(always)] pure fn to_channel_u16() -> u16 { self * (0xFFFFu16 as f64) as u16 } + #[inline(always)] pure fn to_channel_u32() -> u32 { fail(~"to_channel_u32 not yet implemented for f64") } + #[inline(always)] pure fn to_channel_u64() -> u64 { fail(~"to_channel_u64 not yet implemented for f64") } + #[inline(always)] pure fn to_channel_f32() -> f32 { self as f32 } + #[inline(always)] pure fn to_channel_f64() -> f64 { self } + #[inline(always)] pure fn to_channel_float() -> float { self as float } - pure fn inverse() -> f64 { 1.0 - self } + #[inline(always)] pure fn inverse() -> f64 { 1.0 - self } } pub impl float: Channel { - static pure fn channel_max() -> float { 1f } + #[inline(always)] static pure fn channel_max() -> float { 1f } - static pure fn from_channel(val: T) -> float { val.to_channel_float() } - pure fn convert_channel() -> T { from_channel(self) } + #[inline(always)] static pure fn from_channel(val: T) -> float { val.to_channel_float() } + #[inline(always)] pure fn convert_channel() -> T { from_channel(self) } - pure fn to_channel_u8() -> u8 { self * (0xFFu8 as float) as u8 } - pure fn to_channel_u16() -> u16 { self * (0xFFFFu16 as float) as u16 } - pure fn to_channel_u32() -> u32 { fail(~"to_channel_u32 not yet implemented for float") } - pure fn to_channel_u64() -> u64 { fail(~"to_channel_u64 not yet implemented for float") } - pure fn to_channel_f32() -> f32 { self as f32 } - pure fn to_channel_f64() -> f64 { self as f64 } - pure fn to_channel_float() -> float { self } + #[inline(always)] pure fn to_channel_u8() -> u8 { self * (0xFFu8 as float) as u8 } + #[inline(always)] pure fn to_channel_u16() -> u16 { self * (0xFFFFu16 as float) as u16 } + #[inline(always)] pure fn to_channel_u32() -> u32 { fail(~"to_channel_u32 not yet implemented for float") } + #[inline(always)] pure fn to_channel_u64() -> u64 { fail(~"to_channel_u64 not yet implemented for float") } + #[inline(always)] pure fn to_channel_f32() -> f32 { self as f32 } + #[inline(always)] pure fn to_channel_f64() -> f64 { self as f64 } + #[inline(always)] pure fn to_channel_float() -> float { self } - pure fn inverse() -> float { 1.0 - self } + #[inline(always)] pure fn inverse() -> float { 1.0 - self } } \ No newline at end of file