Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-10-05 21:22:10 +02:00
commit e0816e9c6d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/net/osmand/util/Algorithms.java
View file

@ -219,14 +219,14 @@ public class Algorithms {
public static int parseColor(String colorString) { public static int parseColor(String colorString) {
if (colorString.charAt(0) == '#') { if (colorString.charAt(0) == '#') {
// Use a long to avoid rollovers on #ffXXXXXX // 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 = "#" +
colorString.charAt(1) + colorString.charAt(1) + colorString.charAt(1) + colorString.charAt(1) +
colorString.charAt(2) + colorString.charAt(2) + colorString.charAt(2) + colorString.charAt(2) +
colorString.charAt(3) + colorString.charAt(3); colorString.charAt(3) + colorString.charAt(3);
} }
long color = Long.parseLong(colorString.substring(1), 16);
if (colorString.length() == 7) { if (colorString.length() == 7) {
// Set the alpha value // Set the alpha value
color |= 0x00000000ff000000; color |= 0x00000000ff000000;