diff options
author | bsudekum <bobby@mapbox.com> | 2015-09-04 12:01:34 -0700 |
---|---|---|
committer | bsudekum <bobby@mapbox.com> | 2015-09-04 12:01:34 -0700 |
commit | 3db1421eb10ec329301effef591be656eb3b61f6 (patch) | |
tree | 1d247ed28965a1b472b65344c39396984cd20618 /platform/node | |
parent | 15a66b8989645b702d207d96f6693ea3ddd93bdc (diff) | |
download | qtlocation-mapboxgl-3db1421eb10ec329301effef591be656eb3b61f6.tar.gz |
Return raw image buffer instead of an object
Diffstat (limited to 'platform/node')
-rw-r--r-- | platform/node/src/node_map.cpp | 8 | ||||
-rw-r--r-- | platform/node/test/js/map.test.js | 6 | ||||
-rw-r--r-- | platform/node/test/render.test.js | 4 |
3 files changed, 5 insertions, 13 deletions
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index 6fd044daec..b624e32e66 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -258,10 +258,6 @@ void NodeMap::renderFinished() { cb->Call(1, argv); } else if (img) { - auto result = NanNew<v8::Object>(); - result->Set(NanNew("width"), NanNew(img->width)); - result->Set(NanNew("height"), NanNew(img->height)); - v8::Local<v8::Object> pixels = NanNewBufferHandle( reinterpret_cast<char *>(img->pixels.get()), size_t(img->width) * size_t(img->height) * sizeof(mbgl::StillImage::Pixel), @@ -274,11 +270,9 @@ void NodeMap::renderFinished() { ); img.release(); - result->Set(NanNew("pixels"), pixels); - v8::Local<v8::Value> argv[] = { NanNull(), - result, + pixels, }; cb->Call(2, argv); } else { diff --git a/platform/node/test/js/map.test.js b/platform/node/test/js/map.test.js index c4e3416322..364907c67b 100644 --- a/platform/node/test/js/map.test.js +++ b/platform/node/test/js/map.test.js @@ -231,14 +231,12 @@ test('Map', function(t) { t.test('returns an image', function(t) { var map = new mbgl.Map(options); map.load(style); - map.render({}, function(err, data) { + map.render({}, function(err, pixels) { t.error(err); map.release(); - t.ok(data.pixels); - t.equal(data.width, 512); - t.equal(data.height, 512); + t.ok(pixels); t.end(); }); }); diff --git a/platform/node/test/render.test.js b/platform/node/test/render.test.js index b9f13a28fe..2050677e9e 100644 --- a/platform/node/test/render.test.js +++ b/platform/node/test/render.test.js @@ -21,8 +21,8 @@ suite.run('native', {tests: tests}, function (style, options, callback) { }); map.load(style); - map.render(options, function (err, result) { + map.render(options, function (err, pixels) { map.release(); - callback(err, result && result.pixels); + callback(err, pixels); }); }); |