diff options
| author | Carol Hansen <carol@mapbox.com> | 2016-07-22 16:05:16 -0400 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-07-22 13:05:16 -0700 |
| commit | 4b1eeada9eaa416585b8e908265240c409c1368f (patch) | |
| tree | 01497005adfcd47608a773b066287610141574d4 | |
| parent | 8df881a781370b6ec18aca63a59f4ab95c8c7b8d (diff) | |
| download | qtlocation-mapboxgl-4b1eeada9eaa416585b8e908265240c409c1368f.tar.gz | |
[node] Fix integer conversion of filter values
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | platform/node/src/node_conversion.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index 808feb9160..ab3d95380a 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "express": "^4.11.1", "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#4d1f89514bf03536c8e682439df165c33a37122a", "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#83b1a3e5837d785af582efd5ed1a212f2df6a4ae", - "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#3fabb909ba50af1175a2409e9a3cda56fb41b5c7", + "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#fbd511a54a8c27d86c5b2d7cdab94d0e507ba8e8", "node-gyp": "^3.3.1", "request": "^2.72.0", "tape": "^4.5.1" diff --git a/platform/node/src/node_conversion.hpp b/platform/node/src/node_conversion.hpp index 4be1670ea0..6ebc846d11 100644 --- a/platform/node/src/node_conversion.hpp +++ b/platform/node/src/node_conversion.hpp @@ -98,9 +98,9 @@ inline optional<Value> toValue(v8::Local<v8::Value> value) { } else if (value->IsString()) { return { std::string(*Nan::Utf8String(value)) }; } else if (value->IsUint32()) { - return { value->Uint32Value() }; + return { std::uint64_t(value->Uint32Value()) }; } else if (value->IsInt32()) { - return { value->Int32Value() }; + return { std::int64_t(value->Int32Value()) }; } else if (value->IsNumber()) { return { value->NumberValue() }; } else { |