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

Merge branch 'master' of https://github.com/fluxer/kdelibs into devinfo

Browse source
This commit is contained in:
Ivailo Monev 2021-08-01 02:02:40 +03:00
commit 404947818e
2 changed files with 63 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
kimgio/webp.cpp
View file

@ -29,15 +29,11 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
#include <QImage>
#include <QVariant>
//---------------------------------------------------------------------
WebPHandler::WebPHandler()
: quality(75)
{
}
//---------------------------------------------------------------------
bool WebPHandler::canRead() const
{
if (canRead(device())) {
@ -47,14 +43,13 @@ bool WebPHandler::canRead() const
return false;
}
//---------------------------------------------------------------------
bool WebPHandler::read(QImage *retImage)
{
QByteArray data = device()->readAll();
WebPBitstreamFeatures features;
VP8StatusCode ret = WebPGetFeatures(reinterpret_cast<const uint8_t*>(data.constData()), data.size(), &features);
const VP8StatusCode ret = WebPGetFeatures(reinterpret_cast<const uint8_t*>(data.constData()),
data.size(), &features);
if (ret != VP8_STATUS_OK) {
return false;
}
@ -86,14 +81,13 @@ bool WebPHandler::read(QImage *retImage)
return true;
}
//---------------------------------------------------------------------
bool WebPHandler::write(const QImage &image)
{
// limitation in WebP
if ( (image.height() > 16383) || (image.height() == 0) ||
(image.width() > 16383) || (image.width() == 0) )
if (image.height() > 16383 || image.height() == 0 ||
image.width() > 16383 || image.width() == 0) {
return false;
}
uint8_t *imageData = new uint8_t[image.width() * image.height() * (3 + image.hasAlphaChannel())];
@ -116,7 +110,7 @@ bool WebPHandler::write(const QImage &image)
if (image.hasAlphaChannel()) {
size = WebPEncodeRGBA(imageData, image.width(), image.height(), image.width() * 4, quality, &output);
} else {
size = WebPEncodeRGB(imageData, image.width(), image.height(), image.width() * 4, quality, &output);
size = WebPEncodeRGB(imageData, image.width(), image.height(), image.width() * 3, quality, &output);
}
delete []imageData;
@ -131,106 +125,83 @@ bool WebPHandler::write(const QImage &image)
return true;
}
//---------------------------------------------------------------------
QByteArray WebPHandler::format() const
QByteArray WebPHandler::name() const
{
return "webp";
}
//---------------------------------------------------------------------
bool WebPHandler::supportsOption(ImageOption option) const
{
return (option == Quality) || (option == Size);
}
//---------------------------------------------------------------------
QVariant WebPHandler::option(ImageOption option) const
{
switch ( option )
{
case Quality:
switch (option) {
case Quality: {
return quality;
}
case Size: {
QByteArray data = device()->peek(26);
const QByteArray data = device()->peek(26);
int width = 0, height = 0;
if (WebPGetInfo(reinterpret_cast<const uint8_t*>(data.constData()),
data.size(), &width, &height) == 0 )
data.size(), &width, &height) == 0) {
return QSize(); // header error
}
return QSize(width, height);
}
default: return QVariant();
default: {
return QVariant();
}
}
//---------------------------------------------------------------------
Q_UNREACHABLE();
}
void WebPHandler::setOption(ImageOption option, const QVariant &value)
{
if (option == Quality)
if (option == Quality) {
quality = qBound(0, value.toInt(), 100);
}
//---------------------------------------------------------------------
}
bool WebPHandler::canRead(QIODevice *device)
{
if (!device) {
if (Q_UNLIKELY(!device)) {
qWarning("WebPHandler::canRead() called with no device");
return false;
}
// WebP file header: 4 bytes "RIFF", 4 bytes length, 4 bytes "WEBP"
QByteArray header = device->peek(12);
const QByteArray header = device->peek(12);
return (header.size() == 12) && header.startsWith("RIFF") && header.endsWith("WEBP");
}
//---------------------------------------------------------------------
//---------------------------------------------------------------------
class WebPPlugin : public QImageIOPlugin
{
public:
QStringList keys() const;
Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
};
//---------------------------------------------------------------------
QStringList WebPPlugin::keys() const
{
return QStringList() << "webp";
}
//---------------------------------------------------------------------
QImageIOPlugin::Capabilities WebPPlugin::capabilities(QIODevice *device, const QByteArray &format) const
{
if (format == "webp")
if (format == "webp") {
return Capabilities(CanRead | CanWrite);
if (!format.isEmpty())
}
if (!format.isEmpty()) {
return 0;
if (!device->isOpen())
}
if (!device->isOpen()) {
return 0;
Capabilities cap;
if (device->isReadable() && WebPHandler::canRead(device))
cap |= CanRead;
if (device->isWritable())
cap |= CanWrite;
return cap;
}
//---------------------------------------------------------------------
Capabilities cap;
if (device->isReadable() && WebPHandler::canRead(device)) {
cap |= CanRead;
}
if (device->isWritable()) {
cap |= CanWrite;
}
return cap;
}
QImageIOHandler *WebPPlugin::create(QIODevice *device, const QByteArray &format) const
{

23
kimgio/webp.h
View file

@ -30,15 +30,15 @@ class WebPHandler : public QImageIOHandler
public:
WebPHandler();
virtual bool canRead() const;
virtual bool read(QImage *image);
virtual bool write(const QImage &image);
bool canRead() const final;
bool read(QImage *image) final;
bool write(const QImage &image) final;
virtual QByteArray format() const;
QByteArray name() const final;
virtual bool supportsOption(ImageOption option) const;
virtual QVariant option(ImageOption option) const;
virtual void setOption(ImageOption option, const QVariant &value);
bool supportsOption(ImageOption option) const final;
QVariant option(ImageOption option) const final;
void setOption(ImageOption option, const QVariant &value) final;
static bool canRead(QIODevice *device);
@ -46,4 +46,13 @@ private:
int quality;
};
class WebPPlugin : public QImageIOPlugin
{
public:
QStringList keys() const final;
Capabilities capabilities(QIODevice *device, const QByteArray &format) const final;
QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const final;
};
#endif