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.

Sign up for GitHub

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

Jump to bottom

Fix dss3 d #1254

Merged
merged 4 commits into from
Mar 29, 2017
Merged

Fix dss3 d #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7d9d19
fix missing example
kerautret Mar 28, 2017
311ecbf
changelog
kerautret Mar 28, 2017
2ef2cbe
Merge branch 'master' of github.com:DGtal-team/DGtal into fixExDSS3D
kerautret Mar 28, 2017
a0ee71e
cmake cairo
kerautret Mar 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
- Fix testBasicPointFunctor. (Bertrand Kerautret
[#1245](https://github.com/DGtal-team/DGtal/pull/1245))

- *Documentation*
- Fix exampleArithDSS3d compilation (which was not activated).
(Bertrand Kerautret [#1254](https://github.com/DGtal-team/DGtal/pull/1254))


# DGtal 0.9.3

## New Features / Critical Changes
Expand Down
14 changes: 5 additions & 9 deletions examples/geometry/curves/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,13 @@ ENDIF(MAGICK++_FOUND)
### Test with QGLViewer
if ( WITH_VISU3D_QGLVIEWER )
SET(DGTAL_EXAMPLES_QGL_SRC

exampleArithDSS3d
exampleGridCurve3d
exampleGridCurve3d-2
)
### Test with QGLViewer and CAIRO
IF( WITH_CAIRO)
SET(DGTAL_EXAMPLES_QGL_CAIRO_SRC
exampleArithDSS3d
)
endif(WITH_CAIRO)
FOREACH(FILE ${DGTAL_EXAMPLES_QGL_SRC} ${DGTAL_EXAMPLES_QGL_CAIRO_SRC})

)

FOREACH(FILE ${DGTAL_EXAMPLES_QGL_SRC} )
add_executable(${FILE} ${FILE})
target_link_libraries ( ${FILE} DGtal)
ENDFOREACH(FILE)
Expand Down
2 changes: 2 additions & 0 deletions examples/geometry/curves/exampleArithDSS3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
#include <iostream>

#include "DGtal/io/viewers/Viewer3D.h"
#ifdef WITH_CAIRO
#include "DGtal/io/boards/Board3DTo2D.h"
#endif

#include "DGtal/io/DrawWithDisplay3DModifier.h"
#include "DGtal/io/readers/PointListReader.h"
Expand Down