alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify getRed, Green and Blue methods for colour styles

This commit is contained in:
Mark Baker 2013-02-17 14:57:42 +00:00
parent 245a1dc832
commit 9434700799
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Classes/PHPExcel/Style/Color.php
View File

@ -263,11 +263,7 @@ class PHPExcel_Style_Color extends PHPExcel_Style_Supervisor implements PHPExcel
* @return string The red colour component * @return string The red colour component
*/ */
public static function getRed($RGB,$hex=TRUE) { public static function getRed($RGB,$hex=TRUE) {
if (strlen($RGB) == 8) { return self::_getColourComponent($RGB, strlen($RGB) - 6, $hex);
return self::_getColourComponent($RGB, 2, $hex);
} elseif (strlen($RGB) == 6) {
return self::_getColourComponent($RGB, 0, $hex);
}
} }
/** /**
@ -279,11 +275,7 @@ class PHPExcel_Style_Color extends PHPExcel_Style_Supervisor implements PHPExcel
* @return string The green colour component * @return string The green colour component
*/ */
public static function getGreen($RGB,$hex=TRUE) { public static function getGreen($RGB,$hex=TRUE) {
if (strlen($RGB) == 8) { return self::_getColourComponent($RGB, strlen($RGB) - 4, $hex);
return self::_getColourComponent($RGB, 4, $hex);
} elseif (strlen($RGB) == 6) {
return self::_getColourComponent($RGB, 2, $hex);
}
} }
/** /**
@ -295,11 +287,7 @@ class PHPExcel_Style_Color extends PHPExcel_Style_Supervisor implements PHPExcel
* @return string The blue colour component * @return string The blue colour component
*/ */
public static function getBlue($RGB,$hex=TRUE) { public static function getBlue($RGB,$hex=TRUE) {
if (strlen($RGB) == 8) { return self::_getColourComponent($RGB, strlen($RGB) - 2, $hex);
return self::_getColourComponent($RGB, 6, $hex);
} elseif (strlen($RGB) == 6) {
return self::_getColourComponent($RGB, 4, $hex);
}
} }
/** /**