projects
/
svrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes to deal with newer png lib and C++11, as suggested by Mark van Rossum.
[svrt.git]
/
shape.h
diff --git
a/shape.h
b/shape.h
index
5440197
..
190e7bd
100644
(file)
--- a/
shape.h
+++ b/
shape.h
@@
-31,7
+31,13
@@
class Shape {
static const int margin = 1;
static const int nb_max_pixels = Vignette::width * Vignette::height;
class Shape {
static const int margin = 1;
static const int nb_max_pixels = Vignette::width * Vignette::height;
+
+#if __cplusplus >= 201103L
+ static constexpr scalar_t gap_max = 0.25;
+#else
static const scalar_t gap_max = 0.25;
static const scalar_t gap_max = 0.25;
+#endif
+
int n_pixels1, n_pixels2, n_pixels3, n_pixels4;
int nb_pixels;
scalar_t xc, yc;
int n_pixels1, n_pixels2, n_pixels3, n_pixels4;
int nb_pixels;
scalar_t xc, yc;