lyx_mirror/src/frontends/qt4/GuiImage.cpp
Christian Ridderström e30f3d76d2 Bulk cleanup/fix incorrect annotation at the end of namespaces.
This commit does a bulk fix of incorrect annotations (comments) at the
end of namespaces.

The commit was generated by initially running clang-format, and then
from the diff of the result extracting the hunks corresponding to
fixes of namespace comments. The changes being applied and all the
results have been manually reviewed. The source code successfully
builds on macOS.

Further details on the steps below, in case they're of interest to
someone else in the future.

1. Checkout a fresh and up to date version of src/

    git pull && git checkout -- src && git status src

2. Ensure there's a suitable .clang-format in place, i.e. with options
   to fix the comment at the end of namespaces, including:

    FixNamespaceComments:                           true
    SpacesBeforeTrailingComments:                   1

and that clang-format is >= 5.0.0, by doing e.g.:

    clang-format -dump-config | grep Comments:
    clang-format --version

3. Apply clang-format to the source:

    clang-format -i $(find src -name "*.cpp" -or -name "*.h")

4. Create and filter out hunks related to fixing the namespace

    git diff -U0 src > tmp.patch
    grepdiff '^} // namespace' --output-matching=hunk tmp.patch  > fix_namespace.patch

5. Filter out hunks corresponding to simple fixes into to a separate patch:

    pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n'  \
        -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n'         \
        fix_namespace.patch > fix_namespace_simple.patch

6. Manually review the simple patch and then apply it, after first
   restoring the source.

    git checkout -- src
    patch -p1 < fix_namespace_simple.path

7. Manually review the (simple) changes and then stage the changes

    git diff src
    git add src

8. Again apply clang-format and filter out hunks related to any
   remaining fixes to the namespace, this time filter with more
   context. There will be fewer hunks as all the simple cases have
   already been handled:

    clang-format -i $(find src -name "*.cpp" -or -name "*.h")
    git diff src > tmp.patch
    grepdiff '^} // namespace' --output-matching=hunk tmp.patch  > fix_namespace2.patch

9. Manually review/edit the resulting patch file to remove hunks for files
   which need to be dealt with manually, noting the file names and
   line numbers. Then restore files to as before applying clang-format
   and apply the patch:

    git checkout src
    patch -p1 < fix_namespace2.patch

10. Manually fix the files noted in the previous step. Stage files,
    review changes and commit.
2017-07-23 13:11:54 +02:00

217 lines
4.9 KiB
C++

/**
* \file GuiImage.cpp
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Angus Leeming
* \author John Levon
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include <math.h> /* ceil */
#include "GuiImage.h"
#include "qt_helpers.h"
#include "Format.h"
#include "graphics/GraphicsParams.h"
#include "support/debug.h"
#include "support/FileName.h"
#include "support/lstrings.h" // ascii_lowercase
#include <QPainter>
#include <QImageReader>
using namespace std;
using namespace lyx::support;
namespace lyx {
namespace graphics {
/// Implement factory method defined in GraphicsImage.h
Image * newImage()
{
return new GuiImage;
}
GuiImage::GuiImage() : is_transformed_(false)
{}
GuiImage::GuiImage(GuiImage const & other)
: Image(other), original_(other.original_),
transformed_(other.transformed_), is_transformed_(other.is_transformed_),
fname_(other.fname_)
{}
Image * GuiImage::clone() const
{
return new GuiImage(*this);
}
QImage const & GuiImage::image() const
{
return is_transformed_ ? transformed_ : original_;
}
unsigned int GuiImage::width() const
{
#if QT_VERSION >= 0x050000
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
}
unsigned int GuiImage::height() const
{
#if QT_VERSION >= 0x050000
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
}
bool GuiImage::load(FileName const & filename)
{
if (!original_.isNull()) {
LYXERR(Debug::GRAPHICS, "Image is loaded already!");
return false;
}
fname_ = toqstr(filename.absFileName());
return load();
}
bool GuiImage::load()
{
if (!original_.load(fname_)) {
LYXERR(Debug::GRAPHICS, "Unable to open image");
return false;
}
return true;
}
bool GuiImage::setPixmap(Params const & params)
{
if (!params.display)
return false;
if (original_.isNull()) {
if (!load())
return false;
}
#if QT_VERSION >= 0x050000
original_.setDevicePixelRatio(params.pixel_ratio);
#endif
is_transformed_ = clip(params);
is_transformed_ |= rotate(params);
is_transformed_ |= scale(params);
// Clear the pixmap to save some memory.
if (is_transformed_)
original_ = QImage();
else
transformed_ = QImage();
return true;
}
bool GuiImage::clip(Params const & params)
{
if (params.bb.empty())
// No clipping is necessary.
return false;
#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_;
// No need to check if the width, height are > 0 because the
// Bounding Box would be empty() in this case.
if (new_width > image.width() || new_height > image.height()) {
// Bounds are invalid.
return false;
}
if (new_width == image.width() && new_height == image.height())
return false;
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;
}
bool GuiImage::rotate(Params const & params)
{
if (!params.angle)
return false;
QImage const & image = is_transformed_ ? transformed_ : original_;
QMatrix m;
m.rotate(- params.angle);
transformed_ = image.transformed(m);
return true;
}
bool GuiImage::scale(Params const & params)
{
QImage const & image = is_transformed_ ? transformed_ : original_;
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
// scaling factors and sizes of the image.
// see bug #5957: http://www.lyx.org/trac/ticket/5957
scale += 0.0001;
#endif
QMatrix m;
m.scale(scale, scale);
// Bilinear filtering is used to scale graphics preview
transformed_ = image.transformed(m, Qt::SmoothTransformation);
return true;
}
} // namespace graphics
} // namespace lyx