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

try built-in image handlers first

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-07-26 01:09:35 +03:00
parent b92789cbc0
commit 29f4377276
2 changed files with 95 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

208
src/gui/image/qimagereader.cpp
View file

@ -173,163 +173,37 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
QByteArray form = format.toLower(); QByteArray form = format.toLower();
QImageIOHandler *handler = Q_NULLPTR; QImageIOHandler *handler = Q_NULLPTR;
#ifndef QT_NO_LIBRARY
// check if we have plugins that support the image format
QFactoryLoader *l = imageloader();
QStringList keys = l->keys();
#endif
QByteArray suffix;
#ifdef QIMAGEREADER_DEBUG // check if we have built-in support for the format first
qDebug() << "QImageReader::createReadHandler( device =" << (void *)device << ", format =" << format << ")," if (form == "png") {
<< keys.size() << "plugins available: " << keys; handler = new QPngHandler;
#endif
#ifndef QT_NO_LIBRARY
int suffixPluginIndex = -1;
if (device && format.isEmpty() && autoDetectImageFormat) {
// if there's no format, see if \a device is a file, and if so, find
// the file suffix and find support for that format among our plugins.
// this allows plugins to override our built-in handlers.
if (QFile *file = qobject_cast<QFile *>(device)) {
#ifdef QIMAGEREADER_DEBUG
qDebug() << "QImageReader::createReadHandler: device is a file:" << file->fileName();
#endif
suffix = QFileInfo(file->fileName()).suffix().toLower().toLatin1();
if (!suffix.isEmpty()) {
int index = keys.indexOf(QString::fromLatin1(suffix));
if (index != -1) {
#ifdef QIMAGEREADER_DEBUG
qDebug() << "QImageReader::createReadHandler: suffix recognized; the"
<< suffix << "plugin might be able to read this";
#endif
suffixPluginIndex = index;
}
}
}
}
#endif // QT_NO_LIBRARY
QByteArray testFormat = !form.isEmpty() ? form : suffix;
#ifndef QT_NO_LIBRARY
if (suffixPluginIndex != -1) {
// check if the plugin that claims support for this format can load
// from this device with this format.
const qint64 pos = device ? device->pos() : 0;
QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(l->instance(QString::fromLatin1(suffix)));
if (plugin && plugin->capabilities(device, testFormat) & QImageIOPlugin::CanRead) {
handler = plugin->create(device, testFormat);
#ifdef QIMAGEREADER_DEBUG
qDebug() << "QImageReader::createReadHandler: using the" << suffix
<< "plugin";
#endif
}
if (device && !device->isSequential())
device->seek(pos);
}
if (!handler && !testFormat.isEmpty()) {
// check if any plugin supports the format (they are not allowed to
// read from the device yet).
const qint64 pos = device ? device->pos() : 0;
if (autoDetectImageFormat) {
for (int i = 0; i < keys.size(); i++) {
if (i != suffixPluginIndex) {
QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(l->instance(keys.at(i)));
if (plugin && plugin->capabilities(device, testFormat) & QImageIOPlugin::CanRead) {
#ifdef QIMAGEREADER_DEBUG
qDebug() << "QImageReader::createReadHandler: the" << keys.at(i) << "plugin can read this format";
#endif
handler = plugin->create(device, testFormat);
break;
}
}
}
} else {
QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(l->instance(QLatin1String(testFormat)));
if (plugin && plugin->capabilities(device, testFormat) & QImageIOPlugin::CanRead) {
#ifdef QIMAGEREADER_DEBUG
qDebug() << "QImageReader::createReadHandler: the" << testFormat << "plugin can read this format";
#endif
handler = plugin->create(device, testFormat);
}
}
if (device && !device->isSequential())
device->seek(pos);
}
#endif // QT_NO_LIBRARY
// if we don't have a handler yet, check if we have built-in support for
// the format
if (!handler && !testFormat.isEmpty()) {
if (testFormat == "png") {
handler = new QPngHandler;
#ifndef QT_NO_IMAGEFORMAT_BMP #ifndef QT_NO_IMAGEFORMAT_BMP
} else if (testFormat == "bmp") { } else if (form == "bmp") {
handler = new QBmpHandler; handler = new QBmpHandler;
#endif #endif
#ifndef QT_NO_IMAGEFORMAT_XPM #ifndef QT_NO_IMAGEFORMAT_XPM
} else if (testFormat == "xpm") { } else if (form == "xpm") {
handler = new QXpmHandler; handler = new QXpmHandler;
#endif #endif
#ifndef QT_NO_IMAGEFORMAT_XBM #ifndef QT_NO_IMAGEFORMAT_XBM
} else if (testFormat == "xbm") { } else if (form == "xbm") {
handler = new QXbmHandler; handler = new QXbmHandler;
#endif #endif
#ifndef QT_NO_IMAGEFORMAT_PPM #ifndef QT_NO_IMAGEFORMAT_PPM
} else if (testFormat == "pbm" || testFormat == "pbmraw" || testFormat == "pgm" } else if (form == "pbm" || form == "pbmraw" || form == "pgm"
|| testFormat == "pgmraw" || testFormat == "ppm" || testFormat == "ppmraw") { || form == "pgmraw" || form == "ppm" || form == "ppmraw") {
handler = new QPpmHandler; handler = new QPpmHandler;
handler->setOption(QImageIOHandler::SubType, testFormat); handler->setOption(QImageIOHandler::SubType, form);
#endif
}
#ifdef QIMAGEREADER_DEBUG
if (handler)
qDebug() << "QImageReader::createReadHandler: using the built-in handler for" << testFormat;
#endif #endif
} }
#ifndef QT_NO_LIBRARY
if (!handler && autoDetectImageFormat) {
// check if any of our plugins recognize the file from its contents.
const qint64 pos = device ? device->pos() : 0;
for (int i = 0; i < keys.size(); i++) {
if (i != suffixPluginIndex) {
QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(l->instance(keys.at(i)));
if (plugin && plugin->capabilities(device, QByteArray()) & QImageIOPlugin::CanRead) {
handler = plugin->create(device, testFormat);
#ifdef QIMAGEREADER_DEBUG #ifdef QIMAGEREADER_DEBUG
qDebug() << "QImageReader::createReadHandler: the" << keys.at(i) << "plugin can read this data"; if (handler)
qDebug() << "QImageReader::createReadHandler: using the built-in handler for" << testFormat;
#endif #endif
break;
}
}
}
if (device && !device->isSequential())
device->seek(pos);
}
#endif // QT_NO_LIBRARY
if (!handler && autoDetectImageFormat) { if (!handler && device && autoDetectImageFormat) {
// check if any of our built-in handlers recognize the file from its for (qint16 i = 0; i < ImageFormatTblSize; i++) {
// contents.
qint16 currentFormat = 0;
if (!suffix.isEmpty()) {
// If reading from a file with a suffix, start testing our
// built-in handler for that suffix first.
for (qint16 i = 0; i < ImageFormatTblSize; i++) {
if (ImageFormatTbl[i].extension == suffix) {
currentFormat = i;
break;
}
}
}
for (qint16 i = currentFormat; device && i < ImageFormatTblSize; i++) {
const qint64 pos = device->pos(); const qint64 pos = device->pos();
switch (ImageFormatTbl[i].format) { switch (ImageFormatTbl[i].format) {
case qPngFormat: { case qPngFormat: {
@ -384,12 +258,58 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
} }
} }
#ifndef QT_NO_LIBRARY
QFactoryLoader *l = imageloader();
QStringList keys = l->keys();
#ifdef QIMAGEREADER_DEBUG
if (!handler) {
qDebug() << "QImageReader::createReadHandler( device =" << (void *)device << ", format =" << format << "),"
<< keys.size() << "plugins available: " << keys;
}
#endif
// check if any plugin recognize the format
if (!handler && !form.isEmpty()) {
const qint64 pos = device ? device->pos() : 0;
for (int i = 0; i < keys.size(); i++) {
QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(l->instance(keys.at(i)));
if (plugin && plugin->capabilities(device, form) & QImageIOPlugin::CanRead) {
handler = plugin->create(device, keys.at(i).toLatin1());
#ifdef QIMAGEREADER_DEBUG
qDebug() << "QImageReader::createReadHandler: the" << keys.at(i) << "plugin can read this format";
#endif
break;
}
}
if (device && !device->isSequential())
device->seek(pos);
}
// check if any plugin recognize the content
if (!handler && device && autoDetectImageFormat) {
const qint64 pos = device->pos();
for (int i = 0; i < keys.size(); i++) {
QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(l->instance(keys.at(i)));
if (plugin && plugin->capabilities(device, QByteArray()) & QImageIOPlugin::CanRead) {
handler = plugin->create(device, keys.at(i).toLatin1());
#ifdef QIMAGEREADER_DEBUG
qDebug() << "QImageReader::createReadHandler: the" << keys.at(i) << "plugin can read this data";
#endif
break;
}
}
if (!device->isSequential())
device->seek(pos);
}
#endif // QT_NO_LIBRARY
if (!handler) { if (!handler) {
#ifdef QIMAGEREADER_DEBUG #ifdef QIMAGEREADER_DEBUG
qDebug() << "QImageReader::createReadHandler: no handlers found. giving up."; qDebug() << "QImageReader::createReadHandler: no handlers found. giving up.";
#endif #endif
// no handler: give up. // no handler: give up.
return 0; return Q_NULLPTR;
} }
handler->setDevice(device); handler->setDevice(device);

95
src/gui/image/qimagewriter.cpp
View file

@ -100,75 +100,42 @@ static QImageIOHandler *createWriteHandlerHelper(QIODevice *device,
const QByteArray &format) const QByteArray &format)
{ {
QByteArray form = format.toLower(); QByteArray form = format.toLower();
QByteArray suffix; QImageIOHandler *handler = Q_NULLPTR;
QImageIOHandler *handler = 0;
// check if any built-in handlers can write the image
if (form == "png") {
handler = new QPngHandler;
#ifndef QT_NO_IMAGEFORMAT_BMP
} else if (form == "bmp") {
handler = new QBmpHandler;
#endif
#ifndef QT_NO_IMAGEFORMAT_XPM
} else if (form == "xpm") {
handler = new QXpmHandler;
#endif
#ifndef QT_NO_IMAGEFORMAT_XBM
} else if (form == "xbm") {
handler = new QXbmHandler;
#endif
#ifndef QT_NO_IMAGEFORMAT_PPM
} else if (form == "pbm" || form == "pbmraw" || form == "pgm"
|| form == "pgmraw" || form == "ppm" || form == "ppmraw") {
handler = new QPpmHandler;
handler->setOption(QImageIOHandler::SubType, form);
#endif
}
#ifndef QT_NO_LIBRARY #ifndef QT_NO_LIBRARY
// check if any plugins can write the image // check if any plugins can write the image
QFactoryLoader *l = imageloader(); QFactoryLoader *l = imageloader();
QStringList keys = l->keys(); QStringList keys = l->keys();
int suffixPluginIndex = -1;
#endif
if (device && format.isEmpty()) { if (!handler) {
// if there's no format, see if \a device is a file, and if so, find
// the file suffix and find support for that format among our plugins.
// this allows plugins to override our built-in handlers.
if (QFile *file = qobject_cast<QFile *>(device)) {
if (!(suffix = QFileInfo(file->fileName()).suffix().toLower().toLatin1()).isEmpty()) {
#ifndef QT_NO_LIBRARY
int index = keys.indexOf(QString::fromLatin1(suffix));
if (index != -1)
suffixPluginIndex = index;
#endif
}
}
}
QByteArray testFormat = !form.isEmpty() ? form : suffix;
#ifndef QT_NO_LIBRARY
if (suffixPluginIndex != -1) {
// when format is missing, check if we can find a plugin for the
// suffix.
QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(l->instance(QString::fromLatin1(suffix)));
if (plugin && (plugin->capabilities(device, suffix) & QImageIOPlugin::CanWrite))
handler = plugin->create(device, suffix);
}
#endif // QT_NO_LIBRARY
// check if any built-in handlers can write the image
if (!handler && !testFormat.isEmpty()) {
if (testFormat == "png") {
handler = new QPngHandler;
#ifndef QT_NO_IMAGEFORMAT_BMP
} else if (testFormat == "bmp") {
handler = new QBmpHandler;
#endif
#ifndef QT_NO_IMAGEFORMAT_XPM
} else if (testFormat == "xpm") {
handler = new QXpmHandler;
#endif
#ifndef QT_NO_IMAGEFORMAT_XBM
} else if (testFormat == "xbm") {
handler = new QXbmHandler;
#endif
#ifndef QT_NO_IMAGEFORMAT_PPM
} else if (testFormat == "pbm" || testFormat == "pbmraw" || testFormat == "pgm"
|| testFormat == "pgmraw" || testFormat == "ppm" || testFormat == "ppmraw") {
handler = new QPpmHandler;
handler->setOption(QImageIOHandler::SubType, testFormat);
#endif
}
}
#ifndef QT_NO_LIBRARY
if (!testFormat.isEmpty()) {
for (int i = 0; i < keys.size(); ++i) { for (int i = 0; i < keys.size(); ++i) {
QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(l->instance(keys.at(i))); QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(l->instance(keys.at(i)));
if (plugin && (plugin->capabilities(device, testFormat) & QImageIOPlugin::CanWrite)) { if (plugin && (plugin->capabilities(device, form) & QImageIOPlugin::CanWrite)) {
delete handler; handler = plugin->create(device, keys.at(i).toLatin1());
handler = plugin->create(device, testFormat);
break; break;
} }
} }
@ -176,11 +143,11 @@ static QImageIOHandler *createWriteHandlerHelper(QIODevice *device,
#endif // QT_NO_LIBRARY #endif // QT_NO_LIBRARY
if (!handler) if (!handler)
return 0; return Q_NULLPTR;
handler->setDevice(device); handler->setDevice(device);
if (!testFormat.isEmpty()) if (!form.isEmpty())
handler->setFormat(testFormat); handler->setFormat(form);
return handler; return handler;
} }