merge from trunk (r14473)

(bzr r14425.1.3)

5 files changed, 5 insertions, 8 deletions

diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 29c2b5537..27d19fdff 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -61,7 +61,7 @@ ExecutionEnv::ExecutionEnv (Effect * effect, Inkscape::UI::View::View * doc, Imp
 
     if (desktop != NULL) {
     	std::vector<SPItem*> selected = desktop->getSelection()->itemList();
-        for(std::vector<SPItem*>::const_iterator x = selected.begin(); x != selected.end(); x++){
+        for(std::vector<SPItem*>::const_iterator x = selected.begin(); x != selected.end(); ++x){
             Glib::ustring selected_id;
             selected_id = (*x)->getId();
             _selected.insert(_selected.end(), selected_id);
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 5a5553e97..a4561fd11 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -295,7 +295,7 @@ static void sp_group_render(SPGroup *group, CairoRenderContext *ctx)
     TRACE(("sp_group_render opacity: %f\n", SP_SCALE24_TO_FLOAT(item->style->opacity.value)));
 
     std::vector<SPObject*> l(group->childList(false));
-    for(std::vector<SPObject*>::const_iterator x = l.begin(); x!= l.end(); x++){
+    for(std::vector<SPObject*>::const_iterator x = l.begin(); x!= l.end(); ++x){
         SPItem *item = dynamic_cast<SPItem*>(*x);
         if (item) {
             renderer->renderItem(ctx, item);
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index e88cf3d42..68b38f5ee 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -1174,10 +1174,7 @@ Emf::select_extpen(PEMF_CALLBACK_DATA d, int index)
                 if (!d->dc[d->level].style.stroke_dasharray.values.empty() && (d->level==0 || (d->level>0 && d->dc[d->level].style.stroke_dasharray.values!=d->dc[d->level-1].style.stroke_dasharray.values)))
                     d->dc[d->level].style.stroke_dasharray.values.clear();
                 for (unsigned int i=0; i<pEmr->elp.elpNumEntries; i++) {
-//  Doing it this way typically results in a pattern that is tiny, better to assume the array
-//  is the same scale as for dot/dash below, that is, no scaling should be applied
-//                    double dash_length = pix_to_abs_size( d, pEmr->elp.elpStyleEntry[i] );
-                    double dash_length = pEmr->elp.elpStyleEntry[i];
+                    double dash_length = pix_to_abs_size( d, pEmr->elp.elpStyleEntry[i] );
                     d->dc[d->level].style.stroke_dasharray.values.push_back(dash_length);
                 }
                 d->dc[d->level].style.stroke_dasharray.set = 1;
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 5b8aae655..cc798cc5f 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -708,7 +708,7 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
                     n_dash = style->stroke_dasharray.values.size();
                     dash = new uint32_t[n_dash];
                     for (i = 0; i < n_dash; i++) {
-                        dash[i] = style->stroke_dasharray.values[i];
+                        dash[i] = MAX(1, (uint32_t) round(scale * style->stroke_dasharray.values[i] * PX2WORLD));
                     }
                 }
             }
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp
index 5933dd526..dec75aeb6 100644
--- a/src/extension/internal/latex-text-renderer.cpp
+++ b/src/extension/internal/latex-text-renderer.cpp
@@ -229,7 +229,7 @@ LaTeXTextRenderer::writePostamble()
 void LaTeXTextRenderer::sp_group_render(SPGroup *group)
 {
 	std::vector<SPObject*> l = (group->childList(false));
-    for(std::vector<SPObject*>::const_iterator x = l.begin(); x != l.end(); x++){
+    for(std::vector<SPObject*>::const_iterator x = l.begin(); x != l.end(); ++x){
         SPItem *item = dynamic_cast<SPItem*>(*x);
         if (item) {
             renderItem(item);