archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

consistent initialization in scriptrun and placement_finder

Browse Source
This commit is contained in:
Dane Springmeyer 2015-06-11 11:44:27 -07:00
parent 3b450f14bf
commit 6a3d63aa40
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mapnik/text/placement_finder.hpp
View File

@ -99,8 +99,8 @@ private:
box2d<double> marker_box_;
bool marker_unlocked_;
pixel_position marker_displacement_;
double move_dx_ = 0.0;
horizontal_alignment_e horizontal_alignment_ = H_LEFT;
double move_dx_;
horizontal_alignment_e horizontal_alignment_;
};
}//ns mapnik

10
include/mapnik/text/scrptrun.hpp
View File

@ -23,15 +23,15 @@
struct ScriptRecord
{
UChar32 startChar;
UChar32 endChar;
UScriptCode scriptCode;
UChar32 startChar = 0;
UChar32 endChar = 0;
UScriptCode scriptCode = USCRIPT_INVALID_CODE;
};
struct ParenStackEntry
{
int32_t pairIndex;
UScriptCode scriptCode;
int32_t pairIndex = 0;
UScriptCode scriptCode = USCRIPT_INVALID_CODE;
};
class ScriptRun : public UObject {

6
src/text/placement_finder.cpp
View File

@ -59,7 +59,11 @@ placement_finder::placement_finder(feature_impl const& feature,
placements_(),
has_marker_(false),
marker_(),
marker_box_() {}
marker_box_(),
marker_unlocked_(false),
marker_displacement_(),
move_dx_(0.0),
horizontal_alignment_(H_LEFT) {}
bool placement_finder::next_position()
{