summaryrefslogtreecommitdiffstats
path: root/src/2geom/utils.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
committerMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
commit5a4fb2325f60d292b47330f540b26a3279341c90 (patch)
treed2aa7967be25450b83e625025366c618101ae49f /src/2geom/utils.cpp
parentThe Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff)
parentRemove Snap menu item and improve grid menu item text (diff)
downloadinkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz
inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/2geom/utils.cpp')
-rw-r--r--src/2geom/utils.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/2geom/utils.cpp b/src/2geom/utils.cpp
index a40b7253d..83d93cc87 100644
--- a/src/2geom/utils.cpp
+++ b/src/2geom/utils.cpp
@@ -37,16 +37,15 @@ namespace Geom
{
// return a vector that contains all the binomial coefficients of degree n
-void binomial_coefficients(std::vector<size_t>& bc, size_t n)
+void binomial_coefficients(std::vector<size_t>& bc, std::size_t n)
{
size_t s = n+1;
bc.clear();
bc.resize(s);
bc[0] = 1;
- size_t k;
for (size_t i = 1; i < n; ++i)
{
- k = i >> 1;
+ size_t k = i >> 1;
if (i & 1u)
{
bc[k+1] = bc[k] << 1;