diff options
| author | stuconnolly <stuart02@gmail.com> | 2012-03-18 20:05:36 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2012-03-18 20:05:36 +0000 |
| commit | 524e8c356b4074f5be5933b0551374a130a8f6d1 (patch) | |
| tree | 0dab40735f2d9484930050cd08376cbf15e4ea55 /Source/SPColorAdditions.m | |
| parent | be3263f8158cb6f3dfa1005f49beefa7e494b852 (diff) | |
| download | sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.tar.gz sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.tar.bz2 sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.zip | |
Bring outline view branch up to date with trunk (r3471:r3517).
Diffstat (limited to 'Source/SPColorAdditions.m')
| -rw-r--r-- | Source/SPColorAdditions.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/SPColorAdditions.m b/Source/SPColorAdditions.m index b9353921..aee0458a 100644 --- a/Source/SPColorAdditions.m +++ b/Source/SPColorAdditions.m @@ -71,19 +71,19 @@ unsigned int color = 0; scanner = [NSScanner scannerWithString:code]; if( ! [scanner scanHexInt:&color] ) return nil; - return [self colorWithCalibratedRed:( ( ( color >> 24 ) & 0xff ) / 255. ) green:( ( ( color >> 16 ) & 0xff ) / 255. ) blue:( ( ( color >> 8) & 0xff ) / 255. ) alpha:( ( color & 0xff ) / 255. )]; + return [self colorWithCalibratedRed:( ( ( color >> 24 ) & 0xff ) / 255.f ) green:( ( ( color >> 16 ) & 0xff ) / 255.f ) blue:( ( ( color >> 8) & 0xff ) / 255.f ) alpha:( ( color & 0xff ) / 255.f )]; } else if( [code length] == 6 ) { // decode colors like #ffee33 unsigned int color = 0; scanner = [NSScanner scannerWithString:code]; if( ! [scanner scanHexInt:&color] ) return nil; - return [self colorWithCalibratedRed:( ( ( color >> 16 ) & 0xff ) / 255. ) green:( ( ( color >> 8 ) & 0xff ) / 255. ) blue:( ( color & 0xff ) / 255. ) alpha:1.]; + return [self colorWithCalibratedRed:( ( ( color >> 16 ) & 0xff ) / 255.f ) green:( ( ( color >> 8 ) & 0xff ) / 255.f ) blue:( ( color & 0xff ) / 255.f ) alpha:1.f]; } else if( [code length] == 3 ) { // decode short-hand colors like #fe3 unsigned int color = 0; scanner = [NSScanner scannerWithString:code]; if( ! [scanner scanHexInt:&color] ) return nil; - return [self colorWithCalibratedRed:( ( ( ( ( color >> 8 ) & 0xf ) << 4 ) | ( ( color >> 8 ) & 0xf ) ) / 255. ) green:( ( ( ( ( color >> 4 ) & 0xf ) << 4 ) | ( ( color >> 4 ) & 0xf ) ) / 255. ) blue:( ( ( ( color & 0xf ) << 4 ) | ( color & 0xf ) ) / 255. ) alpha:1.]; + return [self colorWithCalibratedRed:( ( ( ( ( color >> 8 ) & 0xf ) << 4 ) | ( ( color >> 8 ) & 0xf ) ) / 255.f ) green:( ( ( ( ( color >> 4 ) & 0xf ) << 4 ) | ( ( color >> 4 ) & 0xf ) ) / 255.f ) blue:( ( ( ( color & 0xf ) << 4 ) | ( color & 0xf ) ) / 255.f ) alpha:1.f]; } return nil; |