-
Notifications
You must be signed in to change notification settings - Fork 191
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix/matlab 2022 macos #513
Conversation
- Adding empty implementation for class CompileTimeError - Chosing correct variable type for matlab based access loop
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the find.
*.orig | ||
*.mexmaci64 | ||
src/matlab/vigraBoundaryTensor.m |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are these types of m files automatically generated?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exactly, auto generated by Matlab . I added them to .gitignore to prevent checkin by accident
@@ -170,13 +170,13 @@ void vigraMexFunction(vigra::matlab::OutputArray outputs, vigra::matlab::InputAr | |||
} | |||
} | |||
|
|||
/*+++++++++++++++++++++++MexEntryFunc++++++++++++++++++++++++++++++++*/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you please undo these purely stylist changes.
git checkout master -- src/matlab/vigraDistance.cpp
git checkout master -- src/matlab/vigraResize2.cpp
git checkout master -- src/matlab/vigraResize3.cpp
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's no stylist changes - the original version creates compiler warnings
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but ok - if you insist I will...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the mex compiler doesn't like multiline comments? i'm maybe out of touch. sorry.
Can you copy paste the warning again?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RIght, I should have listed the warning in the first place. These warnings appear for almost every .cpp file within the Matlab folder
vigraDistance.cpp
compiling: vigraDistance.cpp
mex -O -I../../include -outdir '.' ./vigraDistance.cpp
Building with 'Xcode Clang++'.
vigraDistance.cpp:175:1: warning: '/*' within block comment [-Wcomment]
/* if a certain class is NOT supported - you will have to copy the
^
vigraDistance.cpp:176:1: warning: '/*' within block comment [-Wcomment]
/* body of the callMexFunctor function and edit it here.
^
vigraDistance.cpp:177:1: warning: '/*' within block comment [-Wcomment]
/* Supports (u)int[8|16|32|64], float and double.
^
vigraDistance.cpp:178:1: warning: '/*' within block comment [-Wcomment]
/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
^
4 warnings generated.
MEX completed successfully.
creating: vigraDistance.m
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ohhhh i see, they were opening a comment /*
many times within the comment itself.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hi Marc @hmaarrfk ! Can we merge this fix into master?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes. i was looking at this last night. hsould be ok.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thank you for your patience
Thank you for your review! |
This is the PR for #512