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

kioslave: do not use shared memory region for thumbnails

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-06-24 15:12:16 +03:00
parent df2915970b
commit 04da6ee41b
1 changed files with 7 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
kioslave/thumbnail/thumbnail.cpp
View file

@ -23,11 +23,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#ifdef Q_OS_FREEBSD
#include <machine/param.h>
#endif
#include <QBuffer>
#include <QFile>
@ -79,14 +74,7 @@
// plugin - the name of the plugin library to be used for thumbnail creation.
// Provided by the application to save an addition KTrader
// query here.
// shmid - the shared memory segment id to write the image's data to.
// The segment is assumed to provide enough space for a 32-bit
// image sized width x height pixels.
// If this is given, the data returned by the slave will be:
// int width
// int height
// int depth
// Otherwise, the data returned is the image in PNG format.
// The data returned is the image in PNG format.
using namespace KIO;
@ -269,38 +257,12 @@ void ThumbnailProtocol::get(const KUrl &url)
return;
}
const QString shmid = metaData("shmid");
if (shmid.isEmpty()) {
QByteArray imgData;
QDataStream stream( &imgData, QIODevice::WriteOnly );
//kDebug(7115) << "IMAGE TO STREAM";
stream << img;
mimeType("application/octet-stream");
data(imgData);
} else {
QByteArray imgData;
QDataStream stream( &imgData, QIODevice::WriteOnly );
//kDebug(7115) << "IMAGE TO SHMID";
void *shmaddr = shmat(shmid.toInt(), 0, 0);
if (shmaddr == (void *)-1) {
error(KIO::ERR_INTERNAL, i18n("Failed to attach to shared memory segment %1", shmid));
return;
}
if (img.width() * img.height() > m_width * m_height) {
error(KIO::ERR_INTERNAL, i18n("Image is too big for the shared memory segment"));
shmdt((char*)shmaddr);
return;
}
if( img.format() != QImage::Format_ARGB32 ) { // KIO::PreviewJob and this code below completely ignores colortable :-/,
img = img.convertToFormat(QImage::Format_ARGB32); // so make sure there is none
}
// Keep in sync with kdelibs/kio/kio/previewjob.cpp
stream << img.width() << img.height() << quint8(img.format());
memcpy(shmaddr, img.bits(), img.byteCount());
shmdt((char*)shmaddr);
mimeType("application/octet-stream");
data(imgData);
}
QByteArray imgData;
QDataStream stream( &imgData, QIODevice::WriteOnly );
//kDebug(7115) << "IMAGE TO STREAM";
stream << img;
mimeType("application/octet-stream");
data(imgData);
finished();
}