Skip to content
This repository has been archived by the owner on Jun 6, 2021. It is now read-only.

Commit

Permalink
Address deprecation and compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@nstepien
nstepien committed Apr 24, 2019
1 parent a02cd10 commit d3aa1b4
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 17 deletions.
3 changes: 2 additions & 1 deletion src/common/allocator.cc
View file
Expand Up @@ -32,7 +32,8 @@ void Allocator::Free(void* opaque, void* address) {
Allocator* alloc = static_cast<Allocator*>(opaque);
alloc->allocated_unreported_memory -= buf->size + sizeof(*buf);
} else {
Nan::AdjustExternalMemory(-(buf->size + sizeof(*buf)));
int64_t count = buf->size + sizeof(*buf);
Nan::AdjustExternalMemory(-count);
}

free(buf);
Expand Down
8 changes: 4 additions & 4 deletions src/dec/stream_decode.cc
View file
Expand Up @@ -26,21 +26,21 @@ void StreamDecode::Init(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
}

NAN_METHOD(StreamDecode::New) {
StreamDecode* obj = new StreamDecode(info[0]->BooleanValue());
StreamDecode* obj = new StreamDecode(Nan::To<bool>(info[0]).FromJust());
obj->Wrap(info.This());
info.GetReturnValue().Set(info.This());
}

NAN_METHOD(StreamDecode::Transform) {
StreamDecode* obj = ObjectWrap::Unwrap<StreamDecode>(info.Holder());

Local<Object> buffer = info[0]->ToObject();
Local<Object> buffer = Nan::To<Object>(info[0]).ToLocalChecked();
obj->next_in = (const uint8_t*) node::Buffer::Data(buffer);
obj->available_in = node::Buffer::Length(buffer);

Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
StreamDecodeWorker *worker = new StreamDecodeWorker(callback, obj);
if (info[2]->BooleanValue()) {
if (Nan::To<bool>(info[2]).FromJust()) {
Nan::AsyncQueueWorker(worker);
} else {
worker->Execute();
Expand All @@ -56,7 +56,7 @@ NAN_METHOD(StreamDecode::Flush) {
obj->next_in = nullptr;
obj->available_in = 0;
StreamDecodeWorker *worker = new StreamDecodeWorker(callback, obj);
if (info[1]->BooleanValue()) {
if (Nan::To<bool>(info[1]).FromJust()) {
Nan::AsyncQueueWorker(worker);
} else {
worker->Execute();
Expand Down
37 changes: 25 additions & 12 deletions src/enc/stream_encode.cc
View file
Expand Up @@ -7,59 +7,69 @@ StreamEncode::StreamEncode(bool isAsync, Local<Object> params): isAsync(isAsync)
state = BrotliEncoderCreateInstance(Allocator::Alloc, Allocator::Free, &alloc);

Local<String> key;
Local<Value> localVal;
uint32_t val;

key = Nan::New<String>("mode").ToLocalChecked();
if (Nan::Has(params, key).FromJust()) {
val = Nan::Get(params, key).ToLocalChecked()->Int32Value();
localVal = Nan::Get(params, key).ToLocalChecked();
val = Nan::To<uint32_t>(localVal).FromJust();
BrotliEncoderSetParameter(state, BROTLI_PARAM_MODE, val);
}

key = Nan::New<String>("quality").ToLocalChecked();
if (Nan::Has(params, key).FromJust()) {
val = Nan::Get(params, key).ToLocalChecked()->Int32Value();
localVal = Nan::Get(params, key).ToLocalChecked();
val = Nan::To<uint32_t>(localVal).FromJust();
BrotliEncoderSetParameter(state, BROTLI_PARAM_QUALITY, val);
}

key = Nan::New<String>("lgwin").ToLocalChecked();
if (Nan::Has(params, key).FromJust()) {
val = Nan::Get(params, key).ToLocalChecked()->Int32Value();
localVal = Nan::Get(params, key).ToLocalChecked();
val = Nan::To<uint32_t>(localVal).FromJust();
BrotliEncoderSetParameter(state, BROTLI_PARAM_LGWIN, val);
}

key = Nan::New<String>("lgblock").ToLocalChecked();
if (Nan::Has(params, key).FromJust()) {
val = Nan::Get(params, key).ToLocalChecked()->Int32Value();
localVal = Nan::Get(params, key).ToLocalChecked();
val = Nan::To<uint32_t>(localVal).FromJust();
BrotliEncoderSetParameter(state, BROTLI_PARAM_LGBLOCK, val);
}

key = Nan::New<String>("disable_literal_context_modeling").ToLocalChecked();
if (Nan::Has(params, key).FromJust()) {
val = Nan::Get(params, key).ToLocalChecked()->Int32Value();
localVal = Nan::Get(params, key).ToLocalChecked();
val = Nan::To<uint32_t>(localVal).FromJust();
BrotliEncoderSetParameter(state, BROTLI_PARAM_DISABLE_LITERAL_CONTEXT_MODELING, val);
}

key = Nan::New<String>("size_hint").ToLocalChecked();
if (Nan::Has(params, key).FromJust()) {
val = Nan::Get(params, key).ToLocalChecked()->Int32Value();
localVal = Nan::Get(params, key).ToLocalChecked();
val = Nan::To<uint32_t>(localVal).FromJust();
BrotliEncoderSetParameter(state, BROTLI_PARAM_SIZE_HINT, val);
}

key = Nan::New<String>("large_window").ToLocalChecked();
if (Nan::Has(params, key).FromJust()) {
val = Nan::Get(params, key).ToLocalChecked()->Int32Value();
localVal = Nan::Get(params, key).ToLocalChecked();
val = Nan::To<uint32_t>(localVal).FromJust();
BrotliEncoderSetParameter(state, BROTLI_PARAM_LARGE_WINDOW, val);
}

key = Nan::New<String>("npostfix").ToLocalChecked();
if (Nan::Has(params, key).FromJust()) {
val = Nan::Get(params, key).ToLocalChecked()->Int32Value();
localVal = Nan::Get(params, key).ToLocalChecked();
val = Nan::To<uint32_t>(localVal).FromJust();
BrotliEncoderSetParameter(state, BROTLI_PARAM_NPOSTFIX, val);
}

key = Nan::New<String>("ndirect").ToLocalChecked();
if (Nan::Has(params, key).FromJust()) {
val = Nan::Get(params, key).ToLocalChecked()->Int32Value();
localVal = Nan::Get(params, key).ToLocalChecked();
val = Nan::To<uint32_t>(localVal).FromJust();
BrotliEncoderSetParameter(state, BROTLI_PARAM_NDIRECT, val);
}
}
Expand All @@ -82,15 +92,18 @@ void StreamEncode::Init(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
}

NAN_METHOD(StreamEncode::New) {
StreamEncode* obj = new StreamEncode(info[0]->BooleanValue(), info[1]->ToObject());
StreamEncode* obj = new StreamEncode(
Nan::To<bool>(info[0]).FromJust(),
Nan::To<Object>(info[1]).ToLocalChecked()
);
obj->Wrap(info.This());
info.GetReturnValue().Set(info.This());
}

NAN_METHOD(StreamEncode::Transform) {
StreamEncode* obj = ObjectWrap::Unwrap<StreamEncode>(info.Holder());

Local<Object> buffer = info[0]->ToObject();
Local<Object> buffer = Nan::To<Object>(info[0]).ToLocalChecked();
obj->next_in = (const uint8_t*) node::Buffer::Data(buffer);
obj->available_in = node::Buffer::Length(buffer);

Expand All @@ -109,7 +122,7 @@ NAN_METHOD(StreamEncode::Flush) {
StreamEncode* obj = ObjectWrap::Unwrap<StreamEncode>(info.Holder());

Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
BrotliEncoderOperation op = info[0]->BooleanValue()
BrotliEncoderOperation op = Nan::To<bool>(info[0]).FromJust()
? BROTLI_OPERATION_FINISH
: BROTLI_OPERATION_FLUSH;
obj->next_in = nullptr;
Expand Down

0 comments on commit d3aa1b4

Please sign in to comment.