Skip to content
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

Some fixes for DGtal for dummies #1364

Merged

Conversation

JacquesOlivierLachaud
Copy link
Member

@JacquesOlivierLachaud JacquesOlivierLachaud commented Nov 23, 2018

PR Description

Small fixes in format of some files. Add a few missing methods in Triangulated and Polygonal Surface. Add colormaps to shortcuts and some fixes in TickedColorMap.

Checklist

  • Unit-test of your feature with Catch.
  • Doxygen documentation of the code completed (classes, methods, types, members...)
  • Documentation module page added or updated.
  • New entry in the ChangeLog.md added.
  • No warning raised in Debug cmake mode (otherwise, Travis C.I. will fail).
  • All continuous integration tests pass (Travis & appveyor)

@JacquesOlivierLachaud JacquesOlivierLachaud changed the title [WIP] Some fixes for d gtal for dummies Some fixes for d gtal for dummies Nov 23, 2018
@JacquesOlivierLachaud JacquesOlivierLachaud changed the title Some fixes for d gtal for dummies Some fixes for DGtal for dummies Nov 23, 2018
@JacquesOlivierLachaud JacquesOlivierLachaud added this to the 1.0 milestone Nov 23, 2018
src/DGtal/shapes/doc/moduleHalfEdgeMesh.dox Outdated Show resolved Hide resolved
src/DGtal/shapes/doc/moduleHalfEdgeMesh.dox Outdated Show resolved Hide resolved
src/DGtal/shapes/doc/moduleHalfEdgeMesh.dox Outdated Show resolved Hide resolved
@JacquesOlivierLachaud
Copy link
Member Author

There is a weird error due to ImageMagick in travis CI ...

Scanning dependencies of target testGenericReader [ 61%] Building CXX object tests/io/readers/CMakeFiles/testGenericReader.dir/testGenericReader.cpp.o 2 errors generated. make[2]: *** [tests/io/readers/CMakeFiles/testMagickReader.dir/testMagickReader.cpp.o] Error 1 make[1]: *** [tests/io/readers/CMakeFiles/testMagickReader.dir/all] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /Users/travis/build/DGtal-team/DGtal/tests/io/readers/testGenericReader.cpp:34: In file included from /Users/travis/build/DGtal-team/DGtal/src/DGtal/io/readers/GenericReader.h:56: In file included from /Users/travis/build/DGtal-team/DGtal/src/DGtal/io/readers/MagickReader.h:48: In file included from /usr/local/include/GraphicsMagick/Magick++.h:10: In file included from /usr/local/include/GraphicsMagick/Magick++/Image.h:16: /usr/local/include/GraphicsMagick/Magick++/Drawable.h:2925:26: error: pragma diagnostic pop could not pop, no matching push [-Werror,-Wunknown-pragmas] #pragma clang diagnostic pop ^ /usr/local/include/GraphicsMagick/Magick++/Drawable.h:2926:26: error: pragma diagnostic pop could not pop, no matching push [-Werror,-Wunknown-pragmas] #pragma clang diagnostic pop ^ 2 errors generated. make[2]: *** [tests/io/readers/CMakeFiles/testGenericReader.dir/testGenericReader.cpp.o] Error 1 make[1]: *** [tests/io/readers/CMakeFiles/testGenericReader.dir/all] Error 2 make: *** [all] Error 2

Any idea ?

@dcoeurjo
Copy link
Member

Nope... works fine on my mac.
It seems to be Travis related

@JacquesOlivierLachaud
Copy link
Member Author

Was there a change in version of ImageMagick in the travis CI ?
This error seems completely unrelated to this PR.

@dcoeurjo
Copy link
Member

travis is using the last (brew) version of imagemagick. Weird because on my mac, I have the exact same version and no problem for me

@rolanddenis
Copy link
Member

Also with the -DWARNING_AS_ERROR=ON option ? Because it seems to be a warning initially, but transformed into an error...

@dcoeurjo
Copy link
Member

correct.. I see it as a warning also on my mac
we should deactivate the warning (using pragmas around the header files inclusion)

@dcoeurjo dcoeurjo mentioned this pull request Nov 29, 2018
6 tasks
@dcoeurjo
Copy link
Member

all good, thx, merging

@dcoeurjo dcoeurjo merged commit d124719 into DGtal-team:master Nov 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants