summaryrefslogtreecommitdiffstats
path: root/src/document.cpp
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-09-18 21:10:10 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-09-18 21:10:10 +0000
commit7acb88bc149adabcd57d71e733aabdf3fcb898f8 (patch)
tree6b5d49b049c6a5f99081c9c2a067c28236aa1c13 /src/document.cpp
parentNext roud of NR ==> Geom conversion (diff)
downloadinkscape-7acb88bc149adabcd57d71e733aabdf3fcb898f8.tar.gz
inkscape-7acb88bc149adabcd57d71e733aabdf3fcb898f8.zip
Yet another NR ==> Geom change
(bzr r6840)
Diffstat (limited to 'src/document.cpp')
-rw-r--r--src/document.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/document.cpp b/src/document.cpp
index 57ac0f1f1..c3ebdcdb2 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -42,7 +42,6 @@
#include <cstring>
#include "application/application.h"
#include "application/editor.h"
-#include "libnr/nr-matrix-fns.h"
#include "xml/repr.h"
#include "helper/units.h"
#include "inkscape-private.h"
@@ -55,7 +54,6 @@
#include "unit-constants.h"
#include "prefs-utils.h"
#include "libavoid/router.h"
-#include "libnr/nr-rect.h"
#include "sp-item-group.h"
#include "profile-manager.h"
#include "persp3d.h"
@@ -542,7 +540,7 @@ gdouble sp_document_height(SPDocument *document)
}
/**
- * Given an NR::Rect that may, for example, correspond to the bbox of an object,
+ * Given a Geom::Rect that may, for example, correspond to the bbox of an object,
* this function fits the canvas to that rect by resizing the canvas
* and translating the document root into position.
*/
@@ -789,7 +787,7 @@ void
sp_document_setup_viewport (SPDocument *doc, SPItemCtx *ctx)
{
ctx->ctx.flags = 0;
- ctx->i2doc = NR::identity();
+ ctx->i2doc = Geom::identity();
/* Set up viewport in case svg has it defined as percentages */
if (SP_ROOT(doc->root)->viewBox_set) { // if set, take from viewBox
ctx->vp.x0 = SP_ROOT(doc->root)->viewBox.x0;
@@ -802,7 +800,7 @@ sp_document_setup_viewport (SPDocument *doc, SPItemCtx *ctx)
ctx->vp.x1 = 210 * PX_PER_MM;
ctx->vp.y1 = 297 * PX_PER_MM;
}
- ctx->i2vp = NR::identity();
+ ctx->i2vp = Geom::identity();
}
/**