summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2011-10-29 23:53:45 +0000
committerJon A. Cruz <jon@joncruz.org>2011-10-29 23:53:45 +0000
commit863cfa417c873cf2c9fb9e006dfef98ba30341e8 (patch)
treed71298d371d89e3fa12e023c522aa478fd76afe5 /src/display
parentUpdating use of libpng jump buffer. Fixes bug #721029. (diff)
downloadinkscape-863cfa417c873cf2c9fb9e006dfef98ba30341e8.tar.gz
inkscape-863cfa417c873cf2c9fb9e006dfef98ba30341e8.zip
Fixing initializer order and missing initializers.
(bzr r10708)
Diffstat (limited to 'src/display')
-rw-r--r--src/display/nr-filter-turbulence.cpp35
1 files changed, 21 insertions, 14 deletions
diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp
index fff327590..bce532f21 100644
--- a/src/display/nr-filter-turbulence.cpp
+++ b/src/display/nr-filter-turbulence.cpp
@@ -30,14 +30,20 @@ namespace Filters{
class TurbulenceGenerator {
public:
- TurbulenceGenerator()
- : _wrapx(0)
- , _wrapy(0)
- , _wrapw(0)
- , _wraph(0)
- , _inited(false)
- , _seed(0)
- , _octaves(0)
+ TurbulenceGenerator() :
+ _tile(),
+ _baseFreq(),
+ _latticeSelector(),
+ _gradient(),
+ _seed(0),
+ _octaves(0),
+ _stitchTiles(false),
+ _wrapx(0),
+ _wrapy(0),
+ _wrapw(0),
+ _wraph(0),
+ _inited(false),
+ _fractalnoise(false)
{}
void init(long seed, Geom::Rect const &tile, Geom::Point const &freq, bool stitch,
@@ -275,11 +281,9 @@ private:
RAND_r = 2836; // m % a
// other constants
- static int const
- BSize = 0x100,
- BMask = 0xff;
- static double const
- PerlinOffset = 4096.0;
+ static int const BSize = 0x100;
+ static int const BMask = 0xff;
+ static double const PerlinOffset = 4096.0;
Geom::Rect _tile;
Geom::Point _baseFreq;
@@ -288,7 +292,10 @@ private:
long _seed;
int _octaves;
bool _stitchTiles;
- int _wrapx, _wrapy, _wrapw, _wraph;
+ int _wrapx;
+ int _wrapy;
+ int _wrapw;
+ int _wraph;
bool _inited;
bool _fractalnoise;
};