diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-25 11:17:41 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-25 11:17:41 +0000 |
| commit | f86f093b618fb7747b708cf293a2e62d4c9e834f (patch) | |
| tree | a521c84a52fb7222bdb37565027f9f26d51e4668 /src/display | |
| parent | update to trunk (diff) | |
| parent | Updating libdepixelize. (diff) | |
| download | inkscape-f86f093b618fb7747b708cf293a2e62d4c9e834f.tar.gz inkscape-f86f093b618fb7747b708cf293a2e62d4c9e834f.zip | |
update to trunk
(bzr r11950.1.313)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/nr-filter-turbulence.cpp | 6 |
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) |