diff --git a/package.json b/package.json index fee05cfae0..37e6ec2232 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "url": "http://github.com/mapnik/node-mapnik", "homepage": "http://mapnik.org", "author": "Dane Springmeyer (mapnik.org)", - "version": "4.5.2", + "version": "4.5.2-exp2", "mapnik_version": "26d3084ea", "main": "./lib/mapnik.js", "binary": { diff --git a/src/blend.cpp b/src/blend.cpp index db6cf626e2..84eb5de9c1 100644 --- a/src/blend.cpp +++ b/src/blend.cpp @@ -473,14 +473,14 @@ struct AsyncBlend : Napi::AsyncWorker std::string & str = *output_buffer_; auto buffer = Napi::Buffer::New(env, &str[0], str.size(), [](Napi::Env env_, char* /*unused*/, std::string * str_ptr) { - if (str_ptr != nullptr) { - Napi::MemoryManagement::AdjustExternalMemory - (env_, -static_cast(str_ptr->size())); - } + //if (str_ptr != nullptr) { + // Napi::MemoryManagement::AdjustExternalMemory + // (env_, -static_cast(str_ptr->size())); + //} delete str_ptr; }, output_buffer_.release()); - Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); + //Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); return {env.Null(), buffer}; } return Base::GetResult(env); diff --git a/src/mapnik_image_encode.cpp b/src/mapnik_image_encode.cpp index 7f406aa0f0..22fc814588 100644 --- a/src/mapnik_image_encode.cpp +++ b/src/mapnik_image_encode.cpp @@ -81,14 +81,14 @@ struct AsyncEncode : Napi::AsyncWorker std::string & str = *result_; auto buffer = Napi::Buffer::New(env, &str[0], str.size(), [](Napi::Env env_, char* /*unused*/, std::string * str_ptr) { - if (str_ptr != nullptr) { - Napi::MemoryManagement::AdjustExternalMemory - (env_, -static_cast(str_ptr->size())); - } + //if (str_ptr != nullptr) { + // Napi::MemoryManagement::AdjustExternalMemory + // (env_, -static_cast(str_ptr->size())); + //} delete str_ptr; }, result_.release()); - Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); + //Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); return {env.Null(), buffer}; } return Base::GetResult(env); @@ -133,14 +133,14 @@ Napi::Value Image::encodeSync(Napi::CallbackInfo const& info) std::string & str = *result; auto buffer = Napi::Buffer::New(env, &str[0], str.size(), [](Napi::Env env_, char* /*unused*/, std::string * str_ptr) { - if (str_ptr != nullptr) { - Napi::MemoryManagement::AdjustExternalMemory - (env_, -static_cast(str_ptr->size())); - } + //if (str_ptr != nullptr) { + // Napi::MemoryManagement::AdjustExternalMemory + // (env_, -static_cast(str_ptr->size())); + //} delete str_ptr; }, result.release()); - Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); + //Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); return scope.Escape(buffer); } catch (std::exception const& ex) diff --git a/src/mapnik_image_view.cpp b/src/mapnik_image_view.cpp index 310e8e53c4..265d5e5537 100644 --- a/src/mapnik_image_view.cpp +++ b/src/mapnik_image_view.cpp @@ -293,14 +293,14 @@ struct AsyncEncode : Napi::AsyncWorker std::string & str = *result_; auto buffer = Napi::Buffer::New(env, &str[0], str.size(), [](Napi::Env env_, char* /*unused*/, std::string * str_ptr) { - if (str_ptr != nullptr) { - Napi::MemoryManagement::AdjustExternalMemory - (env_, -static_cast(str_ptr->size())); - } + //if (str_ptr != nullptr) { + // Napi::MemoryManagement::AdjustExternalMemory + // (env_, -static_cast(str_ptr->size())); + //} delete str_ptr; }, result_.release()); - Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); + //Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); return {env.Null(), buffer}; } return Base::GetResult(env); @@ -330,14 +330,14 @@ Napi::Value ImageView::encodeSync(Napi::CallbackInfo const& info) std::string & str = *result; auto buffer = Napi::Buffer::New(env, &str[0], str.size(), [](Napi::Env env_, char* /*unused*/, std::string * str_ptr) { - if (str_ptr != nullptr) { - Napi::MemoryManagement::AdjustExternalMemory - (env_, -static_cast(str_ptr->size())); - } + //if (str_ptr != nullptr) { + // Napi::MemoryManagement::AdjustExternalMemory + // (env_, -static_cast(str_ptr->size())); + //} delete str_ptr; }, result.release()); - Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); + //Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(str.size())); return scope.Escape(buffer); } catch (std::exception const& ex) diff --git a/src/mapnik_vector_tile_data.cpp b/src/mapnik_vector_tile_data.cpp index 52a7e3ce04..08c28938d8 100644 --- a/src/mapnik_vector_tile_data.cpp +++ b/src/mapnik_vector_tile_data.cpp @@ -100,13 +100,13 @@ struct AsyncGetData : Napi::AsyncWorker &data[0], data.size(), [](Napi::Env env_, char* /*unused*/, std::string* str_ptr) { - if (str_ptr != nullptr) { - Napi::MemoryManagement::AdjustExternalMemory(env_, -static_cast(str_ptr->size())); - } + //if (str_ptr != nullptr) { + //Napi::MemoryManagement::AdjustExternalMemory(env_, -static_cast(str_ptr->size())); + //} delete str_ptr; }, data_.release()); - Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(data.size())); + //Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(data.size())); return {env.Undefined(), buffer}; } else @@ -120,13 +120,13 @@ struct AsyncGetData : Napi::AsyncWorker &data[0], data.size(), [](Napi::Env env_, char* /*unused*/, std::string* str_ptr) { - if (str_ptr != nullptr) { - Napi::MemoryManagement::AdjustExternalMemory(env_, -static_cast(str_ptr->size())); - } + //if (str_ptr != nullptr) { + // Napi::MemoryManagement::AdjustExternalMemory(env_, -static_cast(str_ptr->size())); + // } delete str_ptr; }, ptr.release()); - Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(data.size())); + //Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(data.size())); return {env.Undefined(), buffer}; } else @@ -505,13 +505,13 @@ Napi::Value VectorTile::getDataSync(Napi::CallbackInfo const& info) &data[0], data.size(), [](Napi::Env env_, char* /*unused*/, std::string* str_ptr) { - if (str_ptr != nullptr) { - Napi::MemoryManagement::AdjustExternalMemory(env_, -static_cast(str_ptr->size())); - } + //if (str_ptr != nullptr) { + // Napi::MemoryManagement::AdjustExternalMemory(env_, -static_cast(str_ptr->size())); + //} delete str_ptr; }, ptr.release()); - Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(data.size())); + //Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(data.size())); return scope.Escape(buffer); } else @@ -535,13 +535,13 @@ Napi::Value VectorTile::getDataSync(Napi::CallbackInfo const& info) &data[0], data.size(), [](Napi::Env env_, char* /*unused*/, std::string* str_ptr) { - if (str_ptr != nullptr) { - Napi::MemoryManagement::AdjustExternalMemory(env_, -static_cast(str_ptr->size())); - } + //if (str_ptr != nullptr) { + // Napi::MemoryManagement::AdjustExternalMemory(env_, -static_cast(str_ptr->size())); + //} delete str_ptr; }, compressed.release()); - Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(data.size())); + //Napi::MemoryManagement::AdjustExternalMemory(env, static_cast(data.size())); return scope.Escape(buffer); } }