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

« back to all changes in this revision

Viewing changes to src/libnr/nr-types.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:
4
4
 
5
5
#include <libnr/nr-types.h>
6
6
 
7
 
#include "isnan.h" //temporary fix for isnan()
 
7
#include "2geom/isnan.h"
8
8
 
9
9
/** Scales this vector to make it a unit vector (within rounding error).
10
10
 *
18
18
void NR::Point::normalize() {
19
19
        double len = hypot(_pt[0], _pt[1]);
20
20
        g_return_if_fail(len != 0);
21
 
        g_return_if_fail(!isNaN(len));
 
21
        g_return_if_fail(!IS_NAN(len));
22
22
        static double const inf = 1e400;
23
23
        if(len != inf) {
24
24
                *this /= len;