Merge pull request #926 from tomhughes/node12fixes

Fix some issues introduced by Node 12.x fixes
mapnik · Jun 24, 2019 · 3fecdfa · 3fecdfa
2 parents 81488c5 + 12ce4d1
commit 3fecdfa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/blend.cpp b/src/blend.cpp
@@ -576,7 +576,7 @@ NAN_METHOD(Blend) {
             baton->palette = Nan::ObjectWrap::Unwrap<Palette>(palette_val->ToObject(Nan::GetCurrentContext()).ToLocalChecked())->palette();
         }
 
-        v8::Local<v8::Value> mode_val = palette_val = Nan::Get(options, Nan::New("mode").ToLocalChecked()).ToLocalChecked();
+        v8::Local<v8::Value> mode_val = Nan::Get(options, Nan::New("mode").ToLocalChecked()).ToLocalChecked();
         if (!mode_val.IsEmpty() && mode_val->IsString()) {
             std::string mode_string = TOSTR(mode_val);
             if (mode_string == "octree" || mode_string == "o") {

diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp
@@ -818,7 +818,7 @@ v8::Local<v8::Value> Image::_fillSync(Nan::NAN_METHOD_ARGS_TYPE info) {
         }
         else if (info[0]->IsInt32())
         {
-            std::int32_t val = Nan::To<int32_t>(info[2]).FromJust();
+            std::int32_t val = Nan::To<int32_t>(info[0]).FromJust();
             mapnik::fill<std::int32_t>(*im->this_,val);
         }
         else if (info[0]->IsNumber())
@@ -909,7 +909,7 @@ NAN_METHOD(Image::fill)
     }
     else if (info[0]->IsInt32())
     {
-        closure->val_32 = Nan::To<int32_t>(info[2]).FromJust();
+        closure->val_32 = Nan::To<int32_t>(info[0]).FromJust();
         closure->type = FILL_INT32;
     }
     else if (info[0]->IsNumber())