Skip to content

Commit 5310d23

Browse files
committed
fix some errors
1 parent cc9bc09 commit 5310d23

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

binding.gyp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@
4141
],
4242
[
4343
'OS=="mac"', {
44+
'cflags+': ['-fvisibility=hidden'],
4445
"xcode_settings": {
45-
"GCC_ENABLE_CPP_EXCEPTIONS": "YES"
46+
"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
47+
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
4648
}
4749
}
4850
]
@@ -52,6 +54,7 @@
5254
"./src/polygon/include"
5355
],
5456
"dependencies": [
57+
"<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except_all",
5558
"<!(node -p \"require('node-addon-api').gyp\")"
5659
]
5760
}

build-windows.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ $NodeVersion = &node -v
1313
[System.Environment]::SetEnvironmentVariable('ELECTRON_VERSION2', "34.3.0", [System.EnvironmentVariableTarget]::Process)
1414

1515
npm install --arch=ia32
16-
1716
npx prebuildify -t $env:NODE_VERSION -t $env:NODE_VERSION2 -t $env:NODE_VERSION3 -t electron@$env:ELECTRON_VERSION -t electron@$env:ELECTRON_VERSION2 --napi=false --tag-libc --strip -n calculateNfp --arch ia32
1817
npx prebuildify -t $env:NODE_VERSION -t $env:NODE_VERSION2 -t $env:NODE_VERSION3 -t electron@$env:ELECTRON_VERSION -t electron@$env:ELECTRON_VERSION2 --napi=true --tag-libc --strip -n calculateNfp --arch ia32
1918

src/minkowski.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,36 +232,36 @@ Napi::Value CalculateNFP(const Napi::CallbackInfo& info) {
232232
Napi::Array pointlist = Napi::Array::New(env);
233233
int j = 0;
234234

235-
for(polygon_traits<polygon>::iterator_type itr = polys[i].begin(); itr != polys[i].end(); ++itr) {
235+
for(boost::polygon::polygon_traits<polygon>::iterator_type itr = polys[i].begin(); itr != polys[i].end(); ++itr) {
236236
Napi::Object p = Napi::Object::New(env);
237237
p.Set("x", ((double)(*itr).get(boost::polygon::HORIZONTAL)) / inputscale + xshift);
238238
p.Set("y", ((double)(*itr).get(boost::polygon::VERTICAL)) / inputscale + yshift);
239239

240-
pointlist[j] = p;
240+
pointlist.Set(j, p);
241241
j++;
242242
}
243243

244244
// holes
245245
Napi::Array children = Napi::Array::New(env);
246246
int k = 0;
247-
for(polygon_with_holes_traits<polygon>::iterator_holes_type itrh = begin_holes(polys[i]); itrh != end_holes(polys[i]); ++itrh){
247+
for(boost::polygon::polygon_with_holes_traits<polygon>::iterator_holes_type itrh = begin_holes(polys[i]); itrh != end_holes(polys[i]); ++itrh){
248248
Napi::Array child = Napi::Array::New(env);
249249
int z = 0;
250-
for(polygon_traits<polygon>::iterator_type itr2 = (*itrh).begin(); itr2 != (*itrh).end(); ++itr2) {
250+
for(boost::polygon::polygon_traits<polygon>::iterator_type itr2 = (*itrh).begin(); itr2 != (*itrh).end(); ++itr2) {
251251
Napi::Object c = Napi::Object::New(env);
252252
c.Set("x", ((double)(*itr2).get(boost::polygon::HORIZONTAL)) / inputscale + xshift);
253253
c.Set("y", ((double)(*itr2).get(boost::polygon::VERTICAL)) / inputscale + yshift);
254254

255-
child[z] = c;
255+
child.Set(z, c);
256256
z++;
257257
}
258-
children[k] = child;
258+
children.Set(k, child);
259259
k++;
260260
}
261261

262262
pointlist.Set("children", children);
263263

264-
result_list[i] = pointlist;
264+
result_list.Set(i, pointlist);
265265
}
266266

267267
return result_list;

0 commit comments

Comments
 (0)