From 368cf1ff4a67b0e74f3886f2da01ef316526ce27 Mon Sep 17 00:00:00 2001 From: Murray Hughes Date: Sat, 22 Jun 2019 14:06:03 -0600 Subject: [PATCH] XmlThemeBuilder: fix texture loaded from style patterns (#729) --- vtm/src/org/oscim/theme/XmlThemeBuilder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtm/src/org/oscim/theme/XmlThemeBuilder.java b/vtm/src/org/oscim/theme/XmlThemeBuilder.java index 22e79d32..71b3fe1f 100644 --- a/vtm/src/org/oscim/theme/XmlThemeBuilder.java +++ b/vtm/src/org/oscim/theme/XmlThemeBuilder.java @@ -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,7 +652,8 @@ public class XmlThemeBuilder extends DefaultHandler { b.stippleWidth = 1; b.stippleColor = b.fillColor; } else { - b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent); + if (src != null) + b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent); if (hasSymbol) { // Line symbol @@ -764,7 +766,8 @@ public class XmlThemeBuilder extends DefaultHandler { logUnknownAttribute(elementName, name, value, i); } - b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent); + if (src != null) + b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, b.symbolWidth, b.symbolHeight, b.symbolPercent); return b.build(); }