summaryrefslogtreecommitdiffstats
path: root/src/widgets/gimp/ruler.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2017-02-06 15:34:17 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2017-02-06 15:34:17 +0000
commit1e3e159499532a145cf09af2dbd1de2ae4d8d565 (patch)
tree77ef4131505efaf531c260d52afecba0137a372c /src/widgets/gimp/ruler.cpp
parentExtensions: Support for very old versions of Scour (<= 0.26) (diff)
downloadinkscape-1e3e159499532a145cf09af2dbd1de2ae4d8d565.tar.gz
inkscape-1e3e159499532a145cf09af2dbd1de2ae4d8d565.zip
Remove some unneeded < C++11 fallback code
(bzr r15485)
Diffstat (limited to 'src/widgets/gimp/ruler.cpp')
-rw-r--r--src/widgets/gimp/ruler.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/gimp/ruler.cpp b/src/widgets/gimp/ruler.cpp
index 2a71b5c08..6a1f7f903 100644
--- a/src/widgets/gimp/ruler.cpp
+++ b/src/widgets/gimp/ruler.cpp
@@ -34,11 +34,10 @@
#include <cstdio>
#include "ruler.h"
-#include "round.h"
#include <glibmm/i18n.h>
#include "util/units.h"
-#define ROUND(x) ((int) ((x) + 0.5))
+#define ROUND(x) ((int) round(x))
#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
@@ -1217,7 +1216,7 @@ sp_ruler_draw_ticks (SPRuler *ruler)
// be e.g. 641.50000000000; rounding behaviour is not defined in such a case (see round.h)
// and jitter will be apparent (upon redrawing some of the lines on the ruler might jump a
// by a pixel, and jump back on the next redraw). This is suppressed by adding 1e-9 (that's only one nanopixel ;-))
- pos = gint(Inkscape::round((cur - lower) * increment + 1e-12));
+ pos = gint(round((cur - lower) * increment + 1e-12));
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{