GIT_SILENT Upgrade ECM and KF5 version requirements for 5.49.0 release.

GIT_SILENT Upgrade ECM and KF5 version requirements for 5.48.0 release.
Use override
2025-07-16 03:24:17 -04:00 · 2018-08-04 08:43:39 +00:00 · 2018-07-07 21:52:47 +00:00 · 2018-06-12 07:01:11 +02:00 · 2018-06-02 16:28:21 +00:00 · 2018-05-25 14:32:11 +03:00
16 changed files with 62 additions and 63 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
 project(KImageFormats)

 include(FeatureSummary)
-find_package(ECM 5.45.0  NO_MODULE)
+find_package(ECM 5.49.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)

--- a/src/imageformats/eps_p.h
+++ b/src/imageformats/eps_p.h
@ -15,9 +15,9 @@ class EPSHandler : public QImageIOHandler
 public:
    EPSHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -28,8 +28,8 @@ class EPSPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "eps.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 Q_DECLARE_LOGGING_CATEGORY(EPSPLUGIN)
--- a/src/imageformats/exr.cpp
+++ b/src/imageformats/exr.cpp
@ -41,10 +41,10 @@ public:
    {
    }

-    bool  read(char c[], int n) Q_DECL_OVERRIDE;
-    Imf::Int64 tellg() Q_DECL_OVERRIDE;
-    void seekg(Imf::Int64 pos) Q_DECL_OVERRIDE;
-    void clear() Q_DECL_OVERRIDE;
+    bool  read(char c[], int n) override;
+    Imf::Int64 tellg() override;
+    void seekg(Imf::Int64 pos) override;
+    void clear() override;

 private:
    QIODevice *m_dev;
--- a/src/imageformats/exr_p.h
+++ b/src/imageformats/exr_p.h
@ -18,8 +18,8 @@ class EXRHandler : public QImageIOHandler
 public:
    EXRHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *outImage) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *outImage) override;

    static bool canRead(QIODevice *device);
 };
@ -30,8 +30,8 @@ class EXRPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "exr.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 #endif // KIMG_EXR_H
--- a/src/imageformats/kra.h
+++ b/src/imageformats/kra.h
@ -17,8 +17,8 @@ class KraHandler : public QImageIOHandler
 public:
    KraHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image)  Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image)  override;

    static bool canRead(QIODevice *device);
 };
@ -29,8 +29,8 @@ class KraPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "kra.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };


--- a/src/imageformats/kra.json
+++ b/src/imageformats/kra.json
@ -1,5 +1,4 @@
 {
    "Keys": [ "kra" ],
-    "MimeTypes": [ "application/x-krita", "application/x-krita" ]
+    "MimeTypes": [ "application/x-krita" ]
 }
-
--- a/src/imageformats/ora.h
+++ b/src/imageformats/ora.h
@ -17,8 +17,8 @@ class OraHandler : public QImageIOHandler
 public:
    OraHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image)  Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image)  override;

    static bool canRead(QIODevice *device);
 };
@ -29,8 +29,8 @@ class OraPlugin : public QImageIOPlugin
    Q_OBJECT
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ora.json")
 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };


--- a/src/imageformats/ora.json
+++ b/src/imageformats/ora.json
@ -1,5 +1,4 @@
 {
    "Keys": [ "ora" ],
-    "MimeTypes": [ "image/openraster", "image/openraster" ]
+    "MimeTypes": [ "image/openraster" ]
 }
-
--- a/src/imageformats/pcx_p.h
+++ b/src/imageformats/pcx_p.h
@ -17,9 +17,9 @@ class PCXHandler : public QImageIOHandler
 public:
    PCXHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -30,8 +30,8 @@ class PCXPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "pcx.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 #endif // KIMG_PCX_H
--- a/src/imageformats/pic_p.h
+++ b/src/imageformats/pic_p.h
@ -154,13 +154,13 @@ struct PicChannel {
 class SoftimagePICHandler : public QImageIOHandler
 {
 public:
-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &) override;

-    QVariant option(ImageOption option) const Q_DECL_OVERRIDE;
-    void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE;
-    bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE;
+    QVariant option(ImageOption option) const override;
+    void setOption(ImageOption option, const QVariant &value) override;
+    bool supportsOption(ImageOption option) const override;

    static bool canRead(QIODevice *device);

@ -195,8 +195,8 @@ class SoftimagePICPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "pic.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 #endif // KIMG_PIC_H
--- a/src/imageformats/psd_p.h
+++ b/src/imageformats/psd_p.h
@ -17,8 +17,8 @@ class PSDHandler : public QImageIOHandler
 public:
    PSDHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;

    static bool canRead(QIODevice *device);
 };
@ -29,8 +29,8 @@ class PSDPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "psd.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 #endif // KIMG_PSD_H
--- a/src/imageformats/ras_p.h
+++ b/src/imageformats/ras_p.h
@ -18,8 +18,8 @@ class RASHandler : public QImageIOHandler
 public:
    RASHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;

    static bool canRead(QIODevice *device);
 };
@ -30,8 +30,8 @@ class RASPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ras.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 #endif // KIMG_RAS_H
--- a/src/imageformats/rgb_p.h
+++ b/src/imageformats/rgb_p.h
@ -17,9 +17,9 @@ class RGBHandler : public QImageIOHandler
 public:
    RGBHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -30,8 +30,8 @@ class RGBPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "rgb.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 #endif // KIMG_RGB_H
--- a/src/imageformats/tga_p.h
+++ b/src/imageformats/tga_p.h
@ -17,9 +17,9 @@ class TGAHandler : public QImageIOHandler
 public:
    TGAHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -30,8 +30,8 @@ class TGAPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "tga.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 #endif // KIMG_TGA_H
--- a/src/imageformats/xcf.cpp
+++ b/src/imageformats/xcf.cpp
@ -713,7 +713,8 @@ bool XCFImageFormat::composeTiles(XCFImage &xcf_image)

    // SANITY CHECK: Catch corrupted XCF image file where the width or height
    // of a tile is reported are bogus. See Bug# 234030.
-    if (layer.width > 32767 || layer.height > 32767 || layer.width * layer.height > 16384 * 16384) {
+    if (layer.width > 32767 || layer.height > 32767
+        || (sizeof(void *) == 4 && layer.width * layer.height > 16384 * 16384)) {
        return false;
    }

--- a/src/imageformats/xcf_p.h
+++ b/src/imageformats/xcf_p.h
@ -29,9 +29,9 @@ class XCFHandler : public QImageIOHandler
 public:
    XCFHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -42,8 +42,8 @@ class XCFPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "xcf.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 #endif // KIMG_XCF_H
Author	SHA1	Message	Date
l10n daemon script	17239a7ea6	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.49.0 release.	2018-08-04 08:43:39 +00:00
l10n daemon script	118d262bec	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.48.0 release.	2018-07-07 21:52:47 +00:00
Laurent Montel	67a84f459d	Use override	2018-06-12 07:01:11 +02:00
l10n daemon script	de2b942b33	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.47.0 release.	2018-06-02 16:28:21 +00:00
Alexander Volkov	813a7bdddb	Remove duplicated mime types from json files Qt expects a bijection between keys and mime types.	2018-05-25 14:32:11 +03:00
Laurent Montel	a4d1f4db1d	Use override	2018-05-23 08:06:50 +02:00
l10n daemon script	29d090f078	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.46.0 release.	2018-05-05 12:39:09 +00:00
Christoph Feck	19f33239e7	[XCF/GIMP loader] Raise maximimum allowed image size to 32767x32767 on 64 bit platforms The GIMP image loader had a limit to 16K x 16K pixels, because this would already exhaust the 2 GByte address space limit of 32 bit systems. Remove this limit on 64 bit systems to allow the full 32K x 32K size. BUG: 391970 Differential Revision: https://phabricator.kde.org/D12557	2018-05-02 02:10:26 +02:00