Use iround function, amend c0ce79452f

diff --git a/src/Row.cpp b/src/Row.cpp
index 9ab7f110376c25e299bbf6167be797079ecc8538..02923d1dd190217a76a2bd329df27749b8db30e0 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -26,6 +26,7 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
+#include "support/lyxlib.h"
 
 #include <algorithm>
 #include <ostream>
@@ -297,7 +298,7 @@ int Row::left_x() const
                x += cit->full_width();
                ++cit;
        }
-       return int(x + 0.5);
+       return support::iround(x);
 }
 
 
@@ -313,7 +314,7 @@ int Row::right_x() const
                else
                        break;
        }
-       return int(x + 0.5);
+       return support::iround(x);
 }
 
 

diff --git a/src/Spacing.cpp b/src/Spacing.cpp
index 9ac8345ab4647077b42a92e1d5b0216c293677dc..ce645398f81e09a8eb821b3c1c349197d11e755b 100644 (file)
--- a/src/Spacing.cpp
+++ b/src/Spacing.cpp
@@ -12,8 +12,9 @@
 #include <config.h>
 
 #include "Spacing.h"
-#include "support/lstrings.h"
 #include "support/convert.h"
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
 
 #include <ostream>
 
@@ -55,7 +56,7 @@ void Spacing::set(Spacing::Space sp, string const & val)
 {
        space = sp;
        if (sp == Other) {
-               switch (int(convert<double>(val) * 1000 + 0.5)) {
+               switch (support::iround(convert<double>(val) * 1000)) {
                case 1000:
                        space = Single;
                        break;

diff --git a/src/graphics/PreviewImage.cpp b/src/graphics/PreviewImage.cpp
index 062dd6e7bccccf189f40f0c7aa31bffb6627e6d0..b31af6fbd946d109eb875bedb2a03b0b9d996219 100644 (file)
--- a/src/graphics/PreviewImage.cpp
+++ b/src/graphics/PreviewImage.cpp
@@ -19,6 +19,7 @@
 #include "PreviewLoader.h"
 
 #include "support/FileName.h"
+#include "support/lyxlib.h"
 
 
 using namespace std;
@@ -85,7 +86,7 @@ Dimension PreviewImage::dim() const
        if (!image)
                return dim;
 
-       dim.asc = int(pimpl_->ascent_frac_ * double(image->height()) + 0.5);
+       dim.asc = support::iround(pimpl_->ascent_frac_ * double(image->height()));
        dim.des = image->height() - dim.asc;
        dim.wid = image->width();
        return dim;