XmlThemeBuilder: fix texture loaded from style patterns (#729)

This commit is contained in:
Murray Hughes
2019-06-22 14:06:03 -06:00
committed by Emux
parent c526599e20
commit 368cf1ff4a

View File

@@ -6,6 +6,7 @@
* Copyright 2016 Andrey Novikov
* Copyright 2018-2019 Gustl22
* Copyright 2018 Izumi Kawashima
* Copyright 2019 Murray Hughes
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
@@ -651,6 +652,7 @@ public class XmlThemeBuilder extends DefaultHandler {
b.stippleWidth = 1;
b.stippleColor = b.fillColor;
} else {
if (src != null)
b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent);
if (hasSymbol) {
@@ -764,6 +766,7 @@ public class XmlThemeBuilder extends DefaultHandler {
logUnknownAttribute(elementName, name, value, i);
}
if (src != null)
b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent);
return b.build();