summaryrefslogtreecommitdiffstats
path: root/src/sp-marker.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/sp-marker.cpp')
-rw-r--r--src/sp-marker.cpp25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/sp-marker.cpp b/src/sp-marker.cpp
index 9334614dc..3505e2fe8 100644
--- a/src/sp-marker.cpp
+++ b/src/sp-marker.cpp
@@ -43,14 +43,18 @@ public:
std::vector<Inkscape::DrawingItem *> items;
};
-SPMarker::SPMarker() : SPGroup(), SPViewBox() {
-
- this->markerUnits = 0;
- this->markerUnits_set = 0;
-
- this->orient_mode = MARKER_ORIENT_ANGLE;
- this->orient_set = 0;
- this->orient = 0;
+SPMarker::SPMarker() : SPGroup(), SPViewBox(),
+ markerUnits_set(0),
+ markerUnits(0),
+ refX(),
+ refY(),
+ markerWidth(),
+ markerHeight(),
+ orient_set(0),
+ orient_mode(MARKER_ORIENT_ANGLE)
+{
+ // cppcheck-suppress useInitializationList
+ orient = 0;
}
/**
@@ -390,7 +394,8 @@ sp_marker_show_instance ( SPMarker *marker, Inkscape::DrawingItem *parent,
if (marker->orient_mode == MARKER_ORIENT_AUTO) {
m = base;
} else if (marker->orient_mode == MARKER_ORIENT_AUTO_START_REVERSE) {
- m = Geom::Rotate::from_degrees( 180.0 ) * base;
+ // m = Geom::Rotate::from_degrees( 180.0 ) * base;
+ // Rotating is done at rendering time if necessary
m = base;
} else {
/* fixme: Orient units (Lauris) */
@@ -442,7 +447,7 @@ const gchar *generate_marker(std::vector<Inkscape::XML::Node*> &reprs, Geom::Rec
const gchar *mark_id = repr->attribute("id");
SPObject *mark_object = document->getObjectById(mark_id);
- for (std::vector<Inkscape::XML::Node*>::const_iterator i=reprs.begin();i!=reprs.end();i++){
+ for (std::vector<Inkscape::XML::Node*>::const_iterator i=reprs.begin();i!=reprs.end();++i){
Inkscape::XML::Node *node = *i;
SPItem *copy = SP_ITEM(mark_object->appendChildRepr(node));