diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-02-07 17:04:27 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-02-07 17:04:27 +0000 |
| commit | e1f0d7a8e726072bf8452164fafc8bb037dfebff (patch) | |
| tree | 7e5c50a03cd0eab373005ba1c49eb0076d011395 /src/display/canvas-grid.cpp | |
| parent | update to trunk (diff) | |
| parent | Distribute autogen.sh. Fixes build on systems that need to reconfigure intltool (diff) | |
| download | inkscape-e1f0d7a8e726072bf8452164fafc8bb037dfebff.tar.gz inkscape-e1f0d7a8e726072bf8452164fafc8bb037dfebff.zip | |
update to trunk
(bzr r13645.1.5)
Diffstat (limited to 'src/display/canvas-grid.cpp')
| -rw-r--r-- | src/display/canvas-grid.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 0a43ed8b7..0f58096ce 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -547,6 +547,9 @@ CanvasXYGrid::readRepr() if (Geom::are_near(scale_x / scale_y, 1.0, Geom::EPSILON)) { // scaling is uniform, try to reduce numerical error scale_x = (scale_x + scale_y)/2.0; + double scale_none = Inkscape::Util::Quantity::convert(1, doc->getDisplayUnit(), "px"); + if (Geom::are_near(scale_x / scale_none, 1.0, Geom::EPSILON)) + scale_x = scale_none; // objects are same size, reduce numerical error scale_y = scale_x; } } |