Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e0816e9c6d
1 changed files with 2 additions and 2 deletions
|
@ -219,14 +219,14 @@ public class Algorithms {
|
|||
public static int parseColor(String colorString) {
|
||||
if (colorString.charAt(0) == '#') {
|
||||
// Use a long to avoid rollovers on #ffXXXXXX
|
||||
long color = Long.parseLong(colorString.substring(1), 16);
|
||||
if (colorString.length() == 4) {
|
||||
if (colorString.length() == 4) {
|
||||
colorString = "#" +
|
||||
colorString.charAt(1) + colorString.charAt(1) +
|
||||
colorString.charAt(2) + colorString.charAt(2) +
|
||||
colorString.charAt(3) + colorString.charAt(3);
|
||||
|
||||
}
|
||||
long color = Long.parseLong(colorString.substring(1), 16);
|
||||
if (colorString.length() == 7) {
|
||||
// Set the alpha value
|
||||
color |= 0x00000000ff000000;
|
||||
|
|
Loading…
Reference in a new issue