Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix regression since 0f720fe9d2

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-09-17 18:55:21 +03:00
parent 649a655c37
commit 1366224266
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/painting/qpainterpath.cpp
View file

@ -38,6 +38,7 @@
#include "qpathclipper_p.h"
#include "qstroker_p.h"
#include "qtextengine_p.h"
#include "qguicommon_p.h"
#include <limits.h>
@ -2173,8 +2174,6 @@ bool QPainterPath::operator==(const QPainterPath &path) const
else if (d->elements.size() != path.d_func()->elements.size())
return false;
static const qreal qt_epsilon = std::numeric_limits<qreal>::epsilon();;
QSizeF epsilon = boundingRect().size();
epsilon.rwidth() *= qt_epsilon;
epsilon.rheight() *= qt_epsilon;

4
src/gui/painting/qpathclipper.cpp
View file

@ -20,11 +20,11 @@
****************************************************************************/
#include "qpathclipper_p.h"
#include "qbezier_p.h"
#include "qmath.h"
#include "qnumeric.h"
#include "qdebug.h"
#include "qguicommon_p.h"
/**
The algorithm is as follows:
@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
static inline bool fuzzyIsNull(qreal d)
{
return qAbs(d) <= std::numeric_limits<qreal>::epsilon();
return qAbs(d) <= qt_epsilon;
}
static inline bool comparePoints(const QPointF &a, const QPointF &b)

6
src/gui/qguicommon_p.h
View file

@ -9,6 +9,12 @@
QT_BEGIN_NAMESPACE
#ifdef QT_NO_FPU
static const qreal qt_epsilon = qreal(1e-12);
#else
static const qreal qt_epsilon = qreal(1e-5);
#endif
// same as QColor(Qt::color0).rgba() and QColor(Qt::white).rgba()
static const QRgb qt_whitergba = qRgba(255, 255, 255, 255);
// same as QColor(Qt::color0).rgb() and QColor(Qt::white).rgb()