diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-09-18 17:48:42 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-09-18 17:48:42 +0000 |
| commit | 07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8 (patch) | |
| tree | 3a4c8c7f4f8de2878adbe5eabaf75460d35b8bcb /src/sp-image.cpp | |
| parent | NR ==> Geom conversion in sp-canvas (diff) | |
| download | inkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.tar.gz inkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.zip | |
Next roud of NR ==> Geom conversion
(bzr r6839)
Diffstat (limited to 'src/sp-image.cpp')
| -rw-r--r-- | src/sp-image.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sp-image.cpp b/src/sp-image.cpp index f49812ac7..a3112bd03 100644 --- a/src/sp-image.cpp +++ b/src/sp-image.cpp @@ -71,7 +71,7 @@ static void sp_image_set (SPObject *object, unsigned int key, const gchar *value static void sp_image_update (SPObject *object, SPCtx *ctx, unsigned int flags); static Inkscape::XML::Node *sp_image_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); -static void sp_image_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags); +static void sp_image_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags); static void sp_image_print (SPItem * item, SPPrintContext *ctx); static gchar * sp_image_description (SPItem * item); static void sp_image_snappoints(SPItem const *item, SnapPointsIter p); @@ -1033,7 +1033,7 @@ sp_image_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XM } static void -sp_image_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const /*flags*/) +sp_image_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const /*flags*/) { SPImage const &image = *SP_IMAGE(item); @@ -1043,10 +1043,10 @@ sp_image_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, uns double const x1 = x0 + image.width.computed; double const y1 = y0 + image.height.computed; - nr_rect_union_pt(bbox, NR::Point(x0, y0) * transform); - nr_rect_union_pt(bbox, NR::Point(x1, y0) * transform); - nr_rect_union_pt(bbox, NR::Point(x1, y1) * transform); - nr_rect_union_pt(bbox, NR::Point(x0, y1) * transform); + nr_rect_union_pt(bbox, Geom::Point(x0, y0) * transform); + nr_rect_union_pt(bbox, Geom::Point(x1, y0) * transform); + nr_rect_union_pt(bbox, Geom::Point(x1, y1) * transform); + nr_rect_union_pt(bbox, Geom::Point(x0, y1) * transform); } } |