Switch to CrtAllocator, since MemoryPoolAllocator is broken on ARM

Author: kkaefer

include/mapbox/geojsonvt/convert.hpp

@@ -10,7 +10,12 @@
 namespace mapbox {
 namespace geojsonvt {
 
-using JSValue = rapidjson::Value;
+// Use the CrtAllocator, because the MemoryPoolAllocator is broken on ARM
+// https://github.com/miloyip/rapidjson/issues/200
+// https://github.com/miloyip/rapidjson/issues/301
+// https://github.com/miloyip/rapidjson/issues/388
+using JSDocument = rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator>;
+using JSValue = rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAllocator>;
 
 class __attribute__((visibility("default"))) Convert {
 private:

src/convert.cpp

@@ -62,7 +62,7 @@ void Convert::convertFeature(std::vector<ProjectedFeature>& features,
     Tags tags;
     if (feature.HasMember("properties") && feature["properties"].IsObject()) {
         const JSValue& properties = feature["properties"];
-        rapidjson::Value::ConstMemberIterator itr = properties.MemberBegin();
+        JSValue::ConstMemberIterator itr = properties.MemberBegin();
         for (; itr != properties.MemberEnd(); ++itr) {
             std::string key{ itr->name.GetString(), itr->name.GetStringLength() };
             switch (itr->value.GetType()) {

src/geojsonvt.cpp

@@ -201,7 +201,7 @@ std::vector<ProjectedFeature> GeoJSONVT::convertFeatures(const std::string& data
 
     uint32_t z2 = 1 << options.maxZoom; // 2^z
 
-    rapidjson::Document deserializedData;
+    JSDocument deserializedData;
     deserializedData.Parse<0>(data.c_str());
 
     if (deserializedData.HasParseError()) {

test/util.cpp

@@ -121,7 +121,7 @@ bool operator==(const ProjectedRing& a, const ProjectedRing& b) {
     return true;
 }
 
-std::vector<TileFeature> parseJSONTile(const rapidjson::Value& tile) {
+std::vector<TileFeature> parseJSONTile(const rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAllocator>& tile) {
     std::vector<TileFeature> features;
     EXPECT_TRUE(tile.IsArray());
     for (rapidjson::SizeType k = 0; k < tile.Size(); ++k) {
@@ -205,7 +205,7 @@ std::vector<TileFeature> parseJSONTile(const rapidjson::Value& tile) {
 }
 
 std::vector<TileFeature> parseJSONTile(const std::string& data) {
-    rapidjson::Document d;
+    rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> d;
     d.Parse<0>(data.c_str());
 
     if (d.HasParseError()) {
@@ -219,7 +219,7 @@ std::vector<TileFeature> parseJSONTile(const std::string& data) {
 
 std::map<std::string, std::vector<TileFeature>> parseJSONTiles(const std::string& data) {
     std::map<std::string, std::vector<TileFeature>> result;
-    rapidjson::Document d;
+    rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> d;
     d.Parse<0>(data.c_str());
 
     if (d.HasParseError()) {

test/util.hpp

@@ -25,7 +25,7 @@ bool operator==(const TileFeature& a, const TileFeature& b);
 bool operator==(const ProjectedFeature& a, const ProjectedFeature& b);
 bool operator==(const ProjectedRing& a, const ProjectedRing& b);
 
-std::vector<TileFeature> parseJSONTile(const rapidjson::Value& tile);
+std::vector<TileFeature> parseJSONTile(const rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAllocator>& tile);
 std::vector<TileFeature> parseJSONTile(const std::string& data);
 std::map<std::string, std::vector<TileFeature>> parseJSONTiles(const std::string& data);