Merging from trunk

[inkscape.git] / src / display / nr-arena-image.h

diff --git a/src/display/nr-arena-image.h b/src/display/nr-arena-image.h
index 2d7328263b68fd49835caa2905eaf51ff78207a5..d4653a692e5df84cad1d9287b14ea60bc2d2e2f7 100644 (file)
--- a/src/display/nr-arena-image.h
+++ b/src/display/nr-arena-image.h
@@ -32,10 +32,10 @@ struct NRArenaImage : public NRArenaItem {
     double x, y;
     double width, height;
 
-    NR::Point c00, c01, c11, c10; // all 4 corners of the image, for outline mode rect
+    Geom::Point c00, c01, c11, c10; // all 4 corners of the image, for outline mode rect
 
     /* From GRID to PIXELS */
-    NR::Matrix grid2px;
+    Geom::Matrix grid2px;
 
     SPStyle *style;