summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-03-26 01:54:08 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-03-26 01:54:08 +0000
commite80a86b84d1e5cd64139df6aee147795067cb938 (patch)
tree53fb3e0050a406d48dd4c869997db4ff92832bc1 /src/display
parentUpdate to trunk (diff)
parentPatch for several issues in libuemf. (diff)
downloadinkscape-e80a86b84d1e5cd64139df6aee147795067cb938.tar.gz
inkscape-e80a86b84d1e5cd64139df6aee147795067cb938.zip
Update to trunk
(bzr r13090.1.32)
Diffstat (limited to 'src/display')
-rw-r--r--src/display/nr-filter-turbulence.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp
index e63b335d2..a2a8c5756 100644
--- a/src/display/nr-filter-turbulence.cpp
+++ b/src/display/nr-filter-turbulence.cpp
@@ -288,7 +288,7 @@ private:
static double constexpr PerlinOffset = 4096.0;
#else
#if (__cplusplus < 201103L)
- static double const PerlinOffset = 4096.0;
+ static double const PerlinOffset;
#else
static double constexpr PerlinOffset = 4096.0;
#endif
@@ -309,6 +309,10 @@ private:
bool _fractalnoise;
};
+#if !defined(CPP11) && __cplusplus < 201103L
+ double const TurbulenceGenerator::PerlinOffset = 4096.0;
+#endif
+
FilterTurbulence::FilterTurbulence()
: gen(new TurbulenceGenerator())
, XbaseFrequency(0)