update to trunk

(bzr r13708.1.18)

1 files changed, 9 insertions, 12 deletions

diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 890c1f597..4e1c5913d 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -47,16 +47,6 @@
 using Inkscape::DocumentUndo;
 using std::vector;
 
-#include "sp-factory.h"
-
-namespace {
-    SPObject* createGuide() {
-        return new SPGuide();
-    }
-
-    bool guideRegistered = SPFactory::instance().registerObject("sodipodi:guide", createGuide);
-}
-
 SPGuide::SPGuide()
     : SPObject()
     , label(NULL)
@@ -156,8 +146,15 @@ void SPGuide::set(unsigned int key, const gchar *value) {
                 // If root viewBox set, interpret guides in terms of viewBox (90/96)
                 SPRoot *root = document->getRoot();
                 if( root->viewBox_set ) {
-                    newx = newx * root->width.computed  / root->viewBox.width();
-                    newy = newy * root->height.computed / root->viewBox.height();
+                    if(Geom::are_near((root->width.computed * root->viewBox.height()) / (root->viewBox.width() * root->height.computed), 1.0, Geom::EPSILON)) {
+                        // for uniform scaling, try to reduce numerical error
+                        double vbunit2px = (root->width.computed / root->viewBox.width() + root->height.computed / root->viewBox.height())/2.0;
+                        newx = newx * vbunit2px;
+                        newy = newy * vbunit2px;
+                    } else {
+                        newx = newx * root->width.computed  / root->viewBox.width();
+                        newy = newy * root->height.computed / root->viewBox.height();
+                    }
                 }
                 this->point_on_line = Geom::Point(newx, newy);
             } else if (success == 1) {