← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/libvpsc/generate-constraints.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/libvpsc/generate-constraints.cpp
16
16
#include "generate-constraints.h"
17
17
#include "constraint.h"
18
18
 
19
 
#include "isnan.h" /* Include last */
 
19
#include "2geom/isnan.h" /* Include last */
20
20
 
21
21
using std::set;
22
22
using std::vector;
79
79
        if (v->pos < u->pos) {
80
80
                return false;
81
81
        }
82
 
        if (isNaN(u->pos) != isNaN(v->pos)) {
83
 
                return isNaN(u->pos);
 
82
        if (IS_NAN(u->pos) != IS_NAN(v->pos)) {
 
83
                return IS_NAN(u->pos);
84
84
        }
85
85
        return u < v;
86
86
 
153
153
                return 1;
154
154
        } else if(ea->pos < eb->pos) {
155
155
                return -1;
156
 
        } else if(isNaN(ea->pos) != isNaN(ea->pos)) {
 
156
        } else if(IS_NAN(ea->pos) != IS_NAN(ea->pos)) {
157
157
                /* See comment in CmpNodePos. */
158
 
                return ( isNaN(ea->pos)
 
158
                return ( IS_NAN(ea->pos)
159
159
                         ? -1
160
160
                         : 1 );
161
161
        }