← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/inkscape/oneiric-updates

« back to all changes in this revision

Viewing changes to src/live_effects/lpe-recursiveskeleton.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/live_effects/lpe-recursiveskeleton.cpp
1
1
#define INKSCAPE_LPE_RECURSIVESKELETON_CPP
2
2
/** \file
3
 
 * @brief 
 
3
 * @brief
4
4
 *
5
5
 * Inspired by Hofstadter's 'Goedel Escher Bach', chapter V.
6
6
 */
52
52
    std::vector<Piecewise<D2<SBasis> > > pre_output;
53
53
 
54
54
    double prop_scale = 1.0;
55
 
    double fuse_tolerance = 0;
56
55
 
57
56
    D2<Piecewise<SBasis> > patternd2 = make_cuts_independent(pwd2_in);
58
57
    Piecewise<SBasis> x0 = false /*vertical_pattern.get_value()*/ ? Piecewise<SBasis>(patternd2[1]) : Piecewise<SBasis>(patternd2[0]);
95
94
 
96
95
            double scaling = 1;
97
96
            scaling = (uskeleton.domain().extent() - toffset)/pattBndsX->extent();
98
 
            
 
97
 
 
98
            // TODO investigate why pattWidth is not being used:
99
99
            double pattWidth = pattBndsX->extent() * scaling;
100
 
            
 
100
 
101
101
            if (scaling != 1.0) {
102
102
                x*=scaling;
103
103
            }