Merge branch 'master' into fuzz-pipe

Conflicts: test/test.gyp
2014-07-15 11:16:54 -04:00
parent b327a2cb34 471dafc1d1
commit d1977dc53f
24 changed files with 274 additions and 179 deletions
--- a/src/style/style_parser.cpp
+++ b/src/style/style_parser.cpp
@@ -560,7 +560,7 @@ void StyleParser::parseLayer(std::pair<JSVal, std::shared_ptr<StyleLayer>> &pair
        if (!type.IsString()) {
            Log::Warning(Event::ParseStyle, "layer type of '%s' must be a string", layer->id.c_str());
        } else {
-            layer->type = parseStyleLayerType({ type.GetString(), type.GetStringLength() });
+            layer->type = StyleLayerTypeClass(std::string { type.GetString(), type.GetStringLength() });
        }
    }