From: kiirala <kiirala@users.sourceforge.net>
Date: Wed, 15 Aug 2007 14:17:14 +0000 (+0000)
Subject: Fixed a problem compiling 2geom/poly.h on 64-bit platform
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7fb68b59b581f9023f1b4bc530d0d7ce4393d614;p=inkscape.git

Fixed a problem compiling 2geom/poly.h on 64-bit platform
---

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) {