Improve wording (#10670)

[lyx.git] / src / frontends / qt4 / GuiImage.cpp

diff --git a/src/frontends/qt4/GuiImage.cpp b/src/frontends/qt4/GuiImage.cpp
index 7e3307f3e4c44469f313950d2f09e8f73860caa2..08259ecd92b43a6e69e339ad2869b5d203adc3e8 100644 (file)
--- a/src/frontends/qt4/GuiImage.cpp
+++ b/src/frontends/qt4/GuiImage.cpp
@@ -65,9 +65,9 @@ QImage const & GuiImage::image() const
 unsigned int GuiImage::width() const
 {
 #if QT_VERSION >= 0x050000
-       return is_transformed_ ?
-               ceil(transformed_.width() / transformed_.devicePixelRatio()) :
-               ceil(original_.width() / original_.devicePixelRatio());
+       return static_cast<unsigned int>(ceil(is_transformed_ ?
+               (transformed_.width() / transformed_.devicePixelRatio()) :
+               (original_.width() / original_.devicePixelRatio())));
 #else
        return is_transformed_ ? transformed_.width() : original_.width();
 #endif
@@ -77,9 +77,9 @@ unsigned int GuiImage::width() const
 unsigned int GuiImage::height() const
 {
 #if QT_VERSION >= 0x050000
-       return is_transformed_ ?
-               ceil(transformed_.height() / transformed_.devicePixelRatio()) :
-               ceil(original_.height() / original_.devicePixelRatio());
+       return static_cast<unsigned int>(ceil(is_transformed_ ?
+               (transformed_.height() / transformed_.devicePixelRatio()) :
+               (original_.height() / original_.devicePixelRatio())));
 #else
        return is_transformed_ ? transformed_.height() : original_.height();
 #endif
@@ -141,8 +141,14 @@ bool GuiImage::clip(Params const & params)
                // No clipping is necessary.
                return false;
 
-       int const new_width  = params.bb.xr - params.bb.xl;
-       int const new_height = params.bb.yt - params.bb.yb;
+#if QT_VERSION >= 0x050000
+       double const pixelRatio = is_transformed_ ? transformed_.devicePixelRatio() : original_.devicePixelRatio();
+       int const new_width  = static_cast<int>((params.bb.xr.inBP() - params.bb.xl.inBP()) * pixelRatio);
+       int const new_height = static_cast<int>((params.bb.yt.inBP() - params.bb.yb.inBP()) * pixelRatio);
+#else
+       int const new_width  = static_cast<int>((params.bb.xr.inBP() - params.bb.xl.inBP()));
+       int const new_height = static_cast<int>((params.bb.yt.inBP() - params.bb.yb.inBP()));
+#endif
 
        QImage const & image = is_transformed_ ? transformed_ : original_;
 
@@ -156,9 +162,9 @@ bool GuiImage::clip(Params const & params)
        if (new_width == image.width() && new_height == image.height())
                return false;
 
-       int const xoffset_l = params.bb.xl;
-       int const yoffset_t = (image.height() > int(params.bb.yt))
-               ? image.height() - params.bb.yt : 0;
+       int const xoffset_l = params.bb.xl.inBP();
+       int const yoffset_t = (image.height() > params.bb.yt.inBP())
+               ? image.height() - params.bb.yt.inBP() : 0;
 
        transformed_ = image.copy(xoffset_l, yoffset_t, new_width, new_height);
        return true;
@@ -185,7 +191,12 @@ bool GuiImage::scale(Params const & params)
        if (params.scale == 100)
                return false;
 
+#if QT_VERSION >= 0x050000
+       double const pixelRatio = is_transformed_ ? transformed_.devicePixelRatio() : original_.devicePixelRatio();
+       qreal scale = qreal(params.scale) / 100.0 * pixelRatio;
+#else
        qreal scale = qreal(params.scale) / 100.0;
+#endif
 
 #if (QT_VERSION >= 0x040500) && (QT_VERSION <= 0x040502)
        // Due to a bug in Qt, LyX will crash for certain
@@ -196,7 +207,8 @@ bool GuiImage::scale(Params const & params)
 
        QMatrix m;
        m.scale(scale, scale);
-       transformed_ = image.transformed(m);
+       // Bilinear filtering is used to scale graphics preview
+       transformed_ = image.transformed(m, Qt::SmoothTransformation);
        return true;
 }