← 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-item-rm-unsatisfied-cns.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-item-rm-unsatisfied-cns.cpp
14
14
    if (item.constraints.empty()) {
15
15
        return;
16
16
    }
17
 
    SnapPointsWithType snappoints;
18
 
    sp_item_snappoints(&item, false, snappoints, NULL);
 
17
    std::vector<Inkscape::SnapCandidatePoint> snappoints;
 
18
    sp_item_snappoints(&item, snappoints, NULL);
19
19
    for (unsigned i = item.constraints.size(); i--;) {
20
20
        g_assert( i < item.constraints.size() );
21
21
        SPGuideConstraint const &cn = item.constraints[i];
22
22
        int const snappoint_ix = cn.snappoint_ix;
23
23
        g_assert( snappoint_ix < int(snappoints.size()) );
24
 
        if (!approx_equal( sp_guide_distance_from_pt(cn.g, snappoints[snappoint_ix].first), 0) ) {
 
24
        if (!approx_equal( sp_guide_distance_from_pt(cn.g, snappoints[snappoint_ix].getPoint()), 0) ) {
25
25
            remove_last(cn.g->attached_items, SPGuideAttachment(&item, cn.snappoint_ix));
26
26
            g_assert( i < item.constraints.size() );
27
27
            vector<SPGuideConstraint>::iterator const ei(&item.constraints[i]);