update to trunk

(bzr r11950.1.253)

2 files changed, 13 insertions, 5 deletions

diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index d7d692091..ec04b1dad 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -95,6 +95,11 @@ GdkpixbufInput::open(Inkscape::Extension::Input *mod, char const *uri)
         Inkscape::XML::Node *image_node = xml_doc->createElement("svg:image");
         sp_repr_set_svg_double(image_node, "width", width);
         sp_repr_set_svg_double(image_node, "height", height);
+
+        // Added 11 Feb 2014 as we now honor "preserveAspectRatio" and this is
+        // what Inkscaper's expect.
+        image_node->setAttribute("preserveAspectRatio", "none");
+
         if( scale.compare( "auto" ) != 0 ) {
             SPCSSAttr *css = sp_repr_css_attr_new();
             sp_repr_css_set_property(css, "image-rendering", scale.c_str());
@@ -122,6 +127,7 @@ GdkpixbufInput::open(Inkscape::Extension::Input *mod, char const *uri)
         
         // Set viewBox if it doesn't exist
         if (!doc->getRoot()->viewBox_set) {
+            std::cout << "Viewbox not set, setting" << std::endl;
             doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().value(doc->getDefaultUnit()), doc->getHeight().value(doc->getDefaultUnit())));
         }
         
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index 2f9d0ff25..c2ef2b27c 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -112,11 +112,13 @@ Grid::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc
         bounding_area = temprec;
     }
 
-    float spacings[2] = { module->get_param_float("xspacing"),
-                          module->get_param_float("yspacing") };
-    float line_width = module->get_param_float("lineWidth");
-    float offsets[2] = { module->get_param_float("xoffset"),
-                         module->get_param_float("yoffset") };
+    gdouble scale = Inkscape::Util::Quantity::convert(1, "px", (document->doc())->getDefaultUnit());
+    bounding_area *= Geom::Scale(scale);
+    float spacings[2] = { scale*module->get_param_float("xspacing"),
+                          scale*module->get_param_float("yspacing") };
+    float line_width = scale*module->get_param_float("lineWidth");
+    float offsets[2] = { scale*module->get_param_float("xoffset"),
+                         scale*module->get_param_float("yoffset") };
 
     Glib::ustring path_data("");