Build-related fixes in src/Matrix.cc #212
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
January 16, 2015 12:11
Noticed a compiler warning for this during build, and the code looks like the sort of thing that may often work accidentally, but is not at all guaranteed to work. This is the simplest fix I could imagine; keep the logic about whether to return NULL or not in setRect(), but pass it a reference to some memory in the caller's stack frame to use for the result. This fixes the warning, but I haven't had a chance to verify functionality.
This fixes two instances of a compile error I'd been getting with
OpenCV 2.4.9 (via Homebrew) on Mac OS:
../node_modules/nan/nan_new.h:184:10: error: call to 'New' is ambiguous
return NanIntern::Factory<T>::New(arg0);
^~~~~~~~~~~~~~~~~~~~~~~~~~
../src/Matrix.cc:453:51: note: in instantiation of function template specialization 'NanNew<v8::Integer, unsigned long>' requested here
v8::Handle<v8::Value> constructorArgs[3] = {buf, NanNew<v8::Integer>(vec.size()), NanNew<v8::Integer>(0)};
^
../node_modules/nan/nan_new.h:86:26: note: candidate function
static inline return_t New(int32_t value);
^
../node_modules/nan/nan_new.h:87:26: note: candidate function
static inline return_t New(uint32_t value);
|
Thanks! |
peterbraden
added a commit
that referenced
this pull request
Jan 19, 2015
Build-related fixes in src/Matrix.cc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello!
These are two problems I noticed while trying to build OpenCV on my machine. The setRect() issue was a warning only, but the code seemed to be a clear error unless there's something I'm missing. The other change is a simple typecast which fixes a compile error I'd been hitting.
Thanks for taking a look!