summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2013-10-06 21:08:32 +0000
committerKris <Kris.De.Gussem@hotmail.com>2013-10-06 21:08:32 +0000
commit3962e37e9e3a26e0f48ec92668892df3439e7cbe (patch)
tree484c11f9d900191d95e5154ab9a03f8e54d4e410 /src/libnrtype
parentcppcheck (diff)
downloadinkscape-3962e37e9e3a26e0f48ec92668892df3439e7cbe.tar.gz
inkscape-3962e37e9e3a26e0f48ec92668892df3439e7cbe.zip
initialisation
(bzr r12667)
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/Layout-TNG.cpp5
-rw-r--r--src/libnrtype/Layout-TNG.h7
2 files changed, 9 insertions, 3 deletions
diff --git a/src/libnrtype/Layout-TNG.cpp b/src/libnrtype/Layout-TNG.cpp
index bda0d1697..dd9c90949 100644
--- a/src/libnrtype/Layout-TNG.cpp
+++ b/src/libnrtype/Layout-TNG.cpp
@@ -16,9 +16,10 @@ namespace Text {
const gunichar Layout::UNICODE_SOFT_HYPHEN = 0x00AD;
const double Layout::LINE_HEIGHT_NORMAL = 1.25;
-Layout::Layout()
+Layout::Layout() :
+ _input_truncated(0),
+ _path_fitted(NULL)
{
- _path_fitted = NULL;
}
Layout::~Layout()
diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h
index 573301c69..d16c2843d 100644
--- a/src/libnrtype/Layout-TNG.h
+++ b/src/libnrtype/Layout-TNG.h
@@ -817,7 +817,12 @@ class Layout::iterator {
public:
friend class Layout;
// this is just so you can create uninitialised iterators - don't actually try to use one
- iterator() : _parent_layout(NULL) {}
+ iterator() :
+ _parent_layout(NULL),
+ _glyph_index(-1),
+ _char_index(0),
+ _cursor_moving_vertically(false),
+ _x_coordinate(0.0){}
// no copy constructor required, the default does what we want
bool operator== (iterator const &other) const
{return _glyph_index == other._glyph_index && _char_index == other._char_index;}