mirror of
https://github.com/tumic0/QtPBFImagePlugin.git
synced 2025-04-19 20:19:10 +02:00
Compare commits
No commits in common. "da62d0ba638efab55897eb550a5c4a47164d25bb" and "c9f7531f177b051720e2f480bcb3a941fbd7510a" have entirely different histories.
da62d0ba63
...
c9f7531f17
@ -1,4 +1,4 @@
|
||||
version: 4.2.{build}
|
||||
version: 4.1.{build}
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
|
7
.github/workflows/linux.yml
vendored
7
.github/workflows/linux.yml
vendored
@ -8,10 +8,7 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
name: QtPBFImagePlugin
|
||||
runs-on: ubuntu-22.04
|
||||
strategy:
|
||||
matrix:
|
||||
config: ['release', 'debug']
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
@ -20,6 +17,6 @@ jobs:
|
||||
sudo apt-get update
|
||||
sudo apt-get install qtbase5-dev qtbase5-dev-tools qt5-qmake zlib1g-dev
|
||||
- name: Configure build
|
||||
run: qmake CONFIG+=${{ matrix.config }} pbfplugin.pro
|
||||
run: qmake pbfplugin.pro
|
||||
- name: Build project
|
||||
run: make -j2
|
||||
|
2
.github/workflows/osx.yml
vendored
2
.github/workflows/osx.yml
vendored
@ -15,7 +15,7 @@ jobs:
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v4
|
||||
with:
|
||||
version: '6.8.2'
|
||||
version: '6.8.1'
|
||||
- name: Configure build
|
||||
run: qmake pbfplugin.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64"
|
||||
- name: Build project
|
||||
|
@ -67,7 +67,7 @@ repository.
|
||||
|
||||
## Build
|
||||
### Requirements
|
||||
* Qt5 >= 5.15 or Qt6
|
||||
* Qt5 >= 5.11 or Qt6
|
||||
* Zlib
|
||||
|
||||
### Build steps
|
||||
|
@ -2,7 +2,7 @@ TARGET = pbf
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin
|
||||
QT += gui
|
||||
VERSION = 4.2
|
||||
VERSION = 4.1
|
||||
|
||||
HEADERS += src/pbfhandler.h \
|
||||
src/data.h \
|
||||
|
@ -2,6 +2,13 @@
|
||||
#include <QPainter>
|
||||
#include "textpathitem.h"
|
||||
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
#define INTERSECTS intersect
|
||||
#else // QT 5.15
|
||||
#define INTERSECTS intersects
|
||||
#endif // QT 5.15
|
||||
|
||||
static void swap(const QLineF &line, QPointF *p1, QPointF *p2)
|
||||
{
|
||||
|
||||
@ -23,10 +30,10 @@ static bool intersection(const QLineF &line, const QRectF &rect, QPointF *p1,
|
||||
{
|
||||
QPointF *p = p1;
|
||||
|
||||
if (line.intersects(QLineF(rect.topLeft(), rect.topRight()), p)
|
||||
if (line.INTERSECTS(QLineF(rect.topLeft(), rect.topRight()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
p = p2;
|
||||
if (line.intersects(QLineF(rect.topLeft(), rect.bottomLeft()), p)
|
||||
if (line.INTERSECTS(QLineF(rect.topLeft(), rect.bottomLeft()), p)
|
||||
== QLineF::BoundedIntersection) {
|
||||
if (p == p2) {
|
||||
swap(line, p1, p2);
|
||||
@ -34,7 +41,7 @@ static bool intersection(const QLineF &line, const QRectF &rect, QPointF *p1,
|
||||
}
|
||||
p = p2;
|
||||
}
|
||||
if (line.intersects(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
|
||||
if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
|
||||
== QLineF::BoundedIntersection) {
|
||||
if (p == p2) {
|
||||
swap(line, p1, p2);
|
||||
@ -42,7 +49,7 @@ static bool intersection(const QLineF &line, const QRectF &rect, QPointF *p1,
|
||||
}
|
||||
p = p2;
|
||||
}
|
||||
if (line.intersects(QLineF(rect.bottomRight(), rect.topRight()), p)
|
||||
if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.topRight()), p)
|
||||
== QLineF::BoundedIntersection) {
|
||||
if (p == p2) {
|
||||
swap(line, p1, p2);
|
||||
@ -57,16 +64,16 @@ static bool intersection(const QLineF &line, const QRectF &rect, QPointF *p1,
|
||||
|
||||
static bool intersection(const QLineF &line, const QRectF &rect, QPointF *p)
|
||||
{
|
||||
if (line.intersects(QLineF(rect.topLeft(), rect.topRight()), p)
|
||||
if (line.INTERSECTS(QLineF(rect.topLeft(), rect.topRight()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return true;
|
||||
if (line.intersects(QLineF(rect.topLeft(), rect.bottomLeft()), p)
|
||||
if (line.INTERSECTS(QLineF(rect.topLeft(), rect.bottomLeft()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return true;
|
||||
if (line.intersects(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
|
||||
if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return true;
|
||||
if (line.intersects(QLineF(rect.bottomRight(), rect.topRight()), p)
|
||||
if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.topRight()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return true;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user