archive-gh-me/node-opencv
1
0
Fork 0
mirror of https://github.com/peterbraden/node-opencv.git synced 2025-12-08 19:45:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #579 from btsimonh/histogram

Browse Source 
Histogram - fix VS compilation by setting constant size arrays.
This commit is contained in:
Peter Braden 2017-11-07 13:51:31 +01:00 committed by GitHub
commit cc70d63c79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Histogram.cc
View File

@ -22,15 +22,23 @@ NAN_METHOD(Histogram::CalcHist) {
// Arg 1 is the channel // Arg 1 is the channel
Local<Array> nodeChannels = Local<Array>::Cast(info[1]->ToObject()); Local<Array> nodeChannels = Local<Array>::Cast(info[1]->ToObject());
const unsigned int dims = nodeChannels->Length(); // vs does not like this const, no need for it?
int channels[dims]; /*const */unsigned int dims = nodeChannels->Length();
if(dims < 1 || dims > 3){
return Nan::ThrowTypeError("OPENCV nodejs binding error : only dimensions from 1 to 3 are allowed");
}
// in vs, can't create an array of non-constant size; but since we have dims<3, just use 3..
int channels[3];
for (unsigned int i = 0; i < dims; i++) { for (unsigned int i = 0; i < dims; i++) {
channels[i] = nodeChannels->Get(i)->IntegerValue(); channels[i] = nodeChannels->Get(i)->IntegerValue();
} }
// Arg 2 is histogram sizes in each dimension // Arg 2 is histogram sizes in each dimension
Local<Array> nodeHistSizes = Local<Array>::Cast(info[2]->ToObject()); Local<Array> nodeHistSizes = Local<Array>::Cast(info[2]->ToObject());
int histSize[dims]; int histSize[3];
for (unsigned int i = 0; i < dims; i++) { for (unsigned int i = 0; i < dims; i++) {
histSize[i] = nodeHistSizes->Get(i)->IntegerValue(); histSize[i] = nodeHistSizes->Get(i)->IntegerValue();
} }
@ -38,8 +46,8 @@ NAN_METHOD(Histogram::CalcHist) {
// Arg 3 is array of the histogram bin boundaries in each dimension // Arg 3 is array of the histogram bin boundaries in each dimension
Local<Array> nodeRanges = Local<Array>::Cast(info[3]->ToObject()); Local<Array> nodeRanges = Local<Array>::Cast(info[3]->ToObject());
/// Set the ranges ( for B,G,R) ) /// Set the ranges ( for B,G,R) )
float histRanges[dims][2]; float histRanges[3][2];
const float* ranges[dims]; const float* ranges[3];
for (unsigned int i = 0; i < dims; i++) { for (unsigned int i = 0; i < dims; i++) {
Local<Array> nodeRange = Local<Array>::Cast(nodeRanges->Get(i)->ToObject()); Local<Array> nodeRange = Local<Array>::Cast(nodeRanges->Get(i)->ToObject());
@ -61,9 +69,6 @@ NAN_METHOD(Histogram::CalcHist) {
v8::Local<v8::Array> arr = Nan::New<Array>(histSize[0]); v8::Local<v8::Array> arr = Nan::New<Array>(histSize[0]);
if(dims < 1 || dims > 3){
return Nan::ThrowTypeError("OPENCV nodejs binding error : only dimensions from 1 to 3 are allowed");
}
for (unsigned int i=0; i < (unsigned int) histSize[0]; i++) { for (unsigned int i=0; i < (unsigned int) histSize[0]; i++) {
if(dims <= 1){ if(dims <= 1){