← Back to branch summary

~ubuntu-branches/ubuntu/lucid/inkscape/lucid

« back to all changes in this revision

Viewing changes to src/2geom/crossing.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/2geom/crossing.cpp
1
 
#include "crossing.h"
2
 
#include "path.h"
 
1
#include <2geom/crossing.h>
 
2
#include <2geom/path.h>
3
3
 
4
4
namespace Geom {
5
5
 
27
27
        }
28
28
    }
29
29
}
30
 
 
 
30
/*
31
31
CrossingGraph create_crossing_graph(std::vector<Path> const &p, Crossings const &crs) {
32
32
    std::vector<Point> locs;
33
33
    CrossingGraph ret;
75
75
    }
76
76
    
77
77
    return ret;
78
 
 
 
78
 */
79
79
 /*  Various incoherent code bits   
80
80
    // list of sets of edges, each set corresponding to those emanating from the path
81
81
    CrossingGraph ret;
111
111
        }
112
112
    }
113
113
*/
114
 
}
 
114
//}
115
115
 
116
116
void merge_crossings(Crossings &a, Crossings &b, unsigned i) {
117
117
    Crossings n;
169
169
    return ret;
170
170
}
171
171
 
172
 
void clean(Crossings &cr_a, Crossings &cr_b) {
 
172
void clean(Crossings &/*cr_a*/, Crossings &/*cr_b*/) {
173
173
/*    if(cr_a.empty()) return;
174
174
    
175
175
    //Remove anything with dupes
190
190
}
191
191
 
192
192
}
 
193
 
 
194
/*
 
195
  Local Variables:
 
196
  mode:c++
 
197
  c-file-style:"stroustrup"
 
198
  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
 
199
  indent-tabs-mode:nil
 
200
  fill-column:99
 
201
  End:
 
202
*/
 
203
// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :