diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/nr-filter-turbulence.cpp | 35 | ||||
| -rw-r--r-- | src/widgets/sp-color-wheel-selector.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/sp-color-wheel-selector.h | 6 |
3 files changed, 26 insertions, 19 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; }; diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp index 148f3e834..89008288a 100644 --- a/src/widgets/sp-color-wheel-selector.cpp +++ b/src/widgets/sp-color-wheel-selector.cpp @@ -82,9 +82,9 @@ ColorWheelSelector::ColorWheelSelector( SPColorSelector* csel ) _dragging( FALSE ), _adj(0), _wheel(0), + _slider(0), _sbtn(0), - _label(0), - _slider(0) + _label(0) { } diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h index d8bcb730b..5674850cb 100644 --- a/src/widgets/sp-color-wheel-selector.h +++ b/src/widgets/sp-color-wheel-selector.h @@ -38,11 +38,11 @@ protected: gboolean _updating : 1; gboolean _dragging : 1; - GtkAdjustment* _adj; /* Channel adjustment */ + GtkAdjustment* _adj; // Channel adjustment GtkWidget* _wheel; GtkWidget* _slider; - GtkWidget* _sbtn; /* Spinbutton */ - GtkWidget* _label; /* Label */ + GtkWidget* _sbtn; // Spinbutton + GtkWidget* _label; // Label private: // By default, disallow copy constructor and assignment operator |