diff options
| author | Niko Kiirala <niko@kiirala.com> | 2007-08-15 14:17:14 +0000 |
|---|---|---|
| committer | kiirala <kiirala@users.sourceforge.net> | 2007-08-15 14:17:14 +0000 |
| commit | 0ea9c30e62eb0e857cc8ddc83c5a319c904cc2b1 (patch) | |
| tree | 4ddc8905ffd1530ed64a97cd69f740a5f4935a0f /src | |
| parent | Commit LivePathEffect branch to trunk! (diff) | |
| download | inkscape-0ea9c30e62eb0e857cc8ddc83c5a319c904cc2b1.tar.gz inkscape-0ea9c30e62eb0e857cc8ddc83c5a319c904cc2b1.zip | |
Fixed a problem compiling 2geom/poly.h on 64-bit platform
(bzr r3473)
Diffstat (limited to 'src')
| -rw-r--r-- | src/2geom/poly.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/2geom/poly.h b/src/2geom/poly.h index 4fc68098f..f653e80a6 100644 --- a/src/2geom/poly.h +++ b/src/2geom/poly.h @@ -95,7 +95,10 @@ public: // equivalent to multiply by x^terms, discard negative terms Poly shifted(unsigned terms) const { Poly result; - const unsigned out_size = std::max(unsigned(0), size()+terms); + // This was a no-op and breaks the build on x86_64, as it's trying + // to take maximum of 32-bit and 64-bit integers + //const unsigned out_size = std::max(unsigned(0), size()+terms); + const size_type out_size = size() + terms; result.reserve(out_size); if(terms < 0) { |