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

always use QImage for QTextDocument resources

Browse source 
now that QPixmap always uses QImage (internally) it's better to use QImage
directly

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-11-29 03:53:25 +02:00
parent c5970df16f
commit 7dadf0c316
4 changed files with 14 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/painting/qpainter.cpp
View file

@ -71,6 +71,7 @@ static bool qt_painter_thread_test(int devType, const char *what, bool extraCond
{
switch (devType) {
case QInternal::Image:
case QInternal::Pixmap:
case QInternal::Printer:
// can be drawn onto these devices safely from any thread
if (extraCondition)

13
src/gui/text/qtextdocument.cpp
View file

@ -1796,16 +1796,9 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
if (!r.isNull()) {
if (type == ImageResource && r.type() == QVariant::ByteArray) {
if (qApp->thread() != QThread::currentThread()) {
// must use images in non-GUI threads
QImage image = QImage::fromData(r.toByteArray());
if (!image.isNull())
r = image;
} else {
QPixmap pm;
pm.loadFromData(r.toByteArray());
if (!pm.isNull())
r = pm;
QImage image = QImage::fromData(r.toByteArray());
if (!image.isNull()) {
r = image;
}
}
d->cachedResources.insert(name, r);

25
src/gui/text/qtexthtmlparser.cpp
View file

@ -1349,26 +1349,13 @@ void QTextHtmlParserNode::applyBackgroundImage(const QString &url, const QTextDo
{
if (!url.isEmpty() && resourceProvider) {
QVariant val = resourceProvider->resource(QTextDocument::ImageResource, url);
if (qApp->thread() != QThread::currentThread()) {
// must use images in non-GUI threads
if (val.type() == QVariant::Image) {
QImage image = qvariant_cast<QImage>(val);
if (val.type() == QVariant::Image || val.type() == QVariant::Pixmap) {
QImage image = qvariant_cast<QImage>(val);
charFormat.setBackground(image);
} else if (val.type() == QVariant::ByteArray) {
QImage image = QImage::fromData(val.toByteArray());
if (!image.isNull()) {
charFormat.setBackground(image);
} else if (val.type() == QVariant::ByteArray) {
QImage image = QImage::fromData(val.toByteArray());
if (!image.isNull()) {
charFormat.setBackground(image);
}
}
} else {
if (val.type() == QVariant::Image || val.type() == QVariant::Pixmap) {
charFormat.setBackground(qvariant_cast<QPixmap>(val));
} else if (val.type() == QVariant::ByteArray) {
QPixmap pm;
if (pm.loadFromData(val.toByteArray())) {
charFormat.setBackground(pm);
}
}
}
}

84
src/gui/text/qtextimagehandler.cpp
View file

@ -34,71 +34,6 @@
QT_BEGIN_NAMESPACE
static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format)
{
QPixmap pm;
const QString name(format.name());
const QUrl url = QUrl::fromEncoded(name.toUtf8());
const QVariant data = doc->resource(QTextDocument::ImageResource, url);
if (data.type() == QVariant::Pixmap || data.type() == QVariant::Image) {
pm = qvariant_cast<QPixmap>(data);
} else if (data.type() == QVariant::ByteArray) {
pm.loadFromData(data.toByteArray());
}
if (pm.isNull()) {
QImage img;
// try direct loading
if (name.isEmpty() || !img.load(name)) {
return QApplication::style()->standardPixmap(QStyle::SP_FileIcon);
}
pm = QPixmap::fromImage(img);
doc->addResource(QTextDocument::ImageResource, url, pm);
}
return pm;
}
static QSize getPixmapSize(QTextDocument *doc, const QTextImageFormat &format)
{
QPixmap pm;
const bool hasWidth = format.hasProperty(QTextFormat::ImageWidth);
const int width = qRound(format.width());
const bool hasHeight = format.hasProperty(QTextFormat::ImageHeight);
const int height = qRound(format.height());
QSize size(width, height);
if (!hasWidth || !hasHeight) {
pm = getPixmap(doc, format);
if (!hasWidth) {
if (!hasHeight)
size.setWidth(pm.width());
else
size.setWidth(qRound(height * (pm.width() / (qreal) pm.height())));
}
if (!hasHeight) {
if (!hasWidth)
size.setHeight(pm.height());
else
size.setHeight(qRound(width * (pm.height() / (qreal) pm.width())));
}
}
qreal scale = 1.0;
QPaintDevice *pdev = doc->documentLayout()->paintDevice();
if (pdev) {
if (pm.isNull())
pm = getPixmap(doc, format);
if (!pm.isNull())
scale = qreal(pdev->logicalDpiY()) / qreal(QX11Info::appDpiY());
}
size *= scale;
return size;
}
static QImage getImage(QTextDocument *doc, const QTextImageFormat &format)
{
QImage image;
@ -106,7 +41,7 @@ static QImage getImage(QTextDocument *doc, const QTextImageFormat &format)
const QString name(format.name());
const QUrl url = QUrl::fromEncoded(name.toUtf8());
const QVariant data = doc->resource(QTextDocument::ImageResource, url);
if (data.type() == QVariant::Image) {
if (data.type() == QVariant::Image || data.type() == QVariant::Pixmap) {
image = qvariant_cast<QImage>(data);
} else if (data.type() == QVariant::ByteArray) {
image.loadFromData(data.toByteArray());
@ -162,25 +97,14 @@ QTextImageHandler::QTextImageHandler(QObject *parent)
QSizeF QTextImageHandler::intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format)
{
Q_UNUSED(posInDocument)
const QTextImageFormat imageFormat = format.toImageFormat();
if (qApp->thread() != QThread::currentThread())
return getImageSize(doc, imageFormat);
return getPixmapSize(doc, imageFormat);
return getImageSize(doc, format.toImageFormat());
}
void QTextImageHandler::drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format)
{
Q_UNUSED(posInDocument)
const QTextImageFormat imageFormat = format.toImageFormat();
if (qApp->thread() != QThread::currentThread()) {
const QImage image = getImage(doc, imageFormat);
p->drawImage(rect, image, image.rect());
} else {
const QPixmap pixmap = getPixmap(doc, imageFormat);
p->drawPixmap(rect, pixmap, pixmap.rect());
}
const QImage image = getImage(doc, format.toImageFormat());
p->drawImage(rect, image, image.rect());
}