← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu5

« back to all changes in this revision

Viewing changes to src/sp-use.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sp-use.cpp
52
52
static void sp_use_modified(SPObject *object, guint flags);
53
53
 
54
54
static void sp_use_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags);
55
 
static void sp_use_snappoints(SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const *snapprefs);
 
55
static void sp_use_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
56
56
static void sp_use_print(SPItem *item, SPPrintContext *ctx);
57
57
static gchar *sp_use_description(SPItem *item);
58
58
static NRArenaItem *sp_use_show(SPItem *item, NRArena *arena, unsigned key, unsigned flags);
288
288
                             * Geom::Translate(use->x.computed,
289
289
                                               use->y.computed)
290
290
                             * transform );
291
 
        sp_item_invoke_bbox_full(child, bbox, ct, flags, FALSE);
 
291
        Geom::OptRect optbbox;
 
292
        sp_item_invoke_bbox_full(child, optbbox, ct, flags, FALSE);
 
293
        if (optbbox) {
 
294
            bbox->x0 = (*optbbox)[0][0];
 
295
            bbox->y0 = (*optbbox)[1][0];
 
296
            bbox->x1 = (*optbbox)[0][1];
 
297
            bbox->y1 = (*optbbox)[1][1];
 
298
        }
292
299
    }
293
300
}
294
301
 
742
749
}
743
750
 
744
751
static void
745
 
sp_use_snappoints(SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const *snapprefs)
 
752
sp_use_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs)
746
753
{
747
754
    g_assert (item != NULL);
748
755
    g_assert (SP_IS_ITEM(item));
755
762
 
756
763
    SPItemClass const &item_class = *(SPItemClass const *) G_OBJECT_GET_CLASS(root);
757
764
    if (item_class.snappoints) {
758
 
        item_class.snappoints(root, target, p, snapprefs);
 
765
        item_class.snappoints(root, p, snapprefs);
759
766
    }
760
767
}
761
768