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

stream QRegion as vector

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-21 10:14:59 +00:00
parent 2d1e4adf57
commit 5c2c2eb6c8
2 changed files with 6 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/gui/painting/qregion.cpp
View file

@ -261,97 +261,8 @@ void QRegion::detach()
#endif
}
// duplicates in qregion_win.cpp and qregion_wce.cpp
#define QRGN_SETRECT 1 // region stream commands
#define QRGN_SETELLIPSE 2 // (these are internal)
#define QRGN_SETPTARRAY_ALT 3
#define QRGN_SETPTARRAY_WIND 4
#define QRGN_TRANSLATE 5
#define QRGN_OR 6
#define QRGN_AND 7
#define QRGN_SUB 8
#define QRGN_XOR 9
#define QRGN_RECTS 10
#ifndef QT_NO_DATASTREAM
/*
Executes region commands in the internal buffer and rebuilds the
original region.
We do this when we read a region from the data stream.
If \a ver is non-0, uses the format version \a ver on reading the
byte array.
*/
void QRegion::exec(const QByteArray &buffer, QDataStream::Version ver, QDataStream::ByteOrder byteOrder)
{
QByteArray copy = buffer;
QDataStream s(&copy, QIODevice::ReadOnly);
s.setVersion(ver);
s.setByteOrder(byteOrder);
QRegion rgn;
#ifndef QT_NO_DEBUG
int test_cnt = 0;
#endif
while (!s.atEnd()) {
qint32 id;
s >> id;
#ifndef QT_NO_DEBUG
if (test_cnt > 0 && id != QRGN_TRANSLATE)
qWarning("QRegion::exec: Internal error");
test_cnt++;
#endif
if (id == QRGN_SETRECT || id == QRGN_SETELLIPSE) {
QRect r;
s >> r;
rgn = QRegion(r, id == QRGN_SETRECT ? Rectangle : Ellipse);
} else if (id == QRGN_SETPTARRAY_ALT || id == QRGN_SETPTARRAY_WIND) {
QPolygon a;
s >> a;
rgn = QRegion(a, id == QRGN_SETPTARRAY_WIND ? Qt::WindingFill : Qt::OddEvenFill);
} else if (id == QRGN_TRANSLATE) {
QPoint p;
s >> p;
rgn.translate(p.x(), p.y());
} else if (id >= QRGN_OR && id <= QRGN_XOR) {
QByteArray bop1, bop2;
QRegion r1, r2;
s >> bop1;
r1.exec(bop1);
s >> bop2;
r2.exec(bop2);
switch (id) {
case QRGN_OR:
rgn = r1.united(r2);
break;
case QRGN_AND:
rgn = r1.intersected(r2);
break;
case QRGN_SUB:
rgn = r1.subtracted(r2);
break;
case QRGN_XOR:
rgn = r1.xored(r2);
break;
}
} else if (id == QRGN_RECTS) {
// (This is the only form used in Qt 2.0)
quint32 n;
s >> n;
QRect r;
for (int i=0; i<(int)n; i++) {
s >> r;
rgn = rgn.united(QRegion(r));
}
}
}
*this = rgn;
}
/*****************************************************************************
QRegion stream functions
*****************************************************************************/
@ -381,14 +292,7 @@ void QRegion::exec(const QByteArray &buffer, QDataStream::Version ver, QDataStre
QDataStream &operator<<(QDataStream &s, const QRegion &r)
{
QVector<QRect> a = r.rects();
if (a.isEmpty()) {
s << (quint32)0;
} else {
s << (quint32)(4 + 4 + 16 * a.size()); // 16: storage size of QRect
s << (qint32)QRGN_RECTS;
s << a;
}
s << r.rects();
return s;
}
@ -403,9 +307,11 @@ QDataStream &operator<<(QDataStream &s, const QRegion &r)
QDataStream &operator>>(QDataStream &s, QRegion &r)
{
QByteArray b;
s >> b;
r.exec(b, s.version(), s.byteOrder());
QVector<QRect> rects;
s >> rects;
foreach (const QRect &rect, rects) {
r = r.united(rect);
}
return s;
}
#endif //QT_NO_DATASTREAM

3
src/gui/painting/qregion.h
View file

@ -144,9 +144,6 @@ private:
friend bool qt_region_strictContains(const QRegion &region,
const QRect &rect);
#ifndef QT_NO_DATASTREAM
void exec(const QByteArray &ba, QDataStream::Version ver = QDataStream::Qt_Default, QDataStream::ByteOrder byteOrder = QDataStream::BigEndian);
#endif
struct QRegionData {
QAtomicInt ref;
#if defined(Q_WS_X11)