← Back to branch summary

~ubuntu-branches/ubuntu/natty/inkscape/natty

« back to all changes in this revision

Viewing changes to src/live_effects/lpe-gears.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-gears.cpp
2
2
 
3
3
/*
4
4
 * Copyright (C) Johan Engelen 2007 <j.b.c.engelen@utwente.nl>
 
5
 * Copyright 2006 Michael G. Sloan <mgsloan@gmail.com>
 
6
 * Copyright 2006 Aaron Spike <aaron@ekips.org>
5
7
 *
6
8
 * Released under GNU GPL, read the file 'COPYING' for more information
7
9
 */
14
16
#include <2geom/bezier-to-sbasis.h>
15
17
#include <2geom/path.h>
16
18
 
17
 
#include "nodepath.h"
18
 
 
19
19
using std::vector;
20
20
using namespace Geom;
21
21
 
220
220
     */
221
221
 
222
222
    teeth.param_make_integer();
223
 
    teeth.param_set_range(3, NR_HUGE);
 
223
    teeth.param_set_range(3, 1e10);
224
224
    registerParameter( dynamic_cast<Parameter *>(&teeth) );
225
225
    registerParameter( dynamic_cast<Parameter *>(&phi) );
226
226
}
261
261
    return path_out;
262
262
}
263
263
 
264
 
void
265
 
LPEGears::setup_nodepath(Inkscape::NodePath::Path *np)
266
 
{
267
 
    Effect::setup_nodepath(np);
268
 
    sp_nodepath_make_straight_path(np);
269
 
}
270
 
 
271
264
} // namespace LivePathEffect
272
265
} /* namespace Inkscape */
273
266