Upgrade ECM and KF5 version requirements for 5.2.0 release.

Put the shorter description in metainfo.yaml, and the longer one in
README.md.

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(KImageFormats)
 
-find_package(ECM 0.0.13 REQUIRED NO_MODULE)
+find_package(ECM 1.2.0 REQUIRED NO_MODULE)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
@@ -30,13 +30,17 @@ if (UNIX)
     endif()
 endif()
 
-find_package(Jasper)
+# QtImageFormats 5.3 comes with a JPEG-2000 plugin; don't duplicate it here
-set_package_properties(Jasper PROPERTIES
+# TODO: remove our JPEG-2000 plugin when we depend on Qt 5.3.
-    DESCRIPTION "A library for handling JPEG-2000 images"
+if (Qt5Gui_VERSION VERSION_LESS 5.3.0)
-    PURPOSE "Required for the QImage plugin for JPEG-2000 images"
+    find_package(Jasper)
-    URL "http://www.ece.uvic.ca/~mdadams/jasper"
+    set_package_properties(Jasper PROPERTIES
-    TYPE OPTIONAL
+        DESCRIPTION "A library for handling JPEG-2000 images"
-)
+        PURPOSE "Required for the QImage plugin for JPEG-2000 images"
+        URL "http://www.ece.uvic.ca/~mdadams/jasper"
+        TYPE OPTIONAL
+    )
+endif()
 
 find_package(OpenEXR)
 set_package_properties(OpenEXR PROPERTIES

README.md

@@ -1,6 +1,6 @@
 # KImageFormats
 
-Image format plugins for Qt
+Plugins to allow QImage to support extra file formats.
 
 ## Introduction
 
@@ -63,9 +63,3 @@ This framework is licensed under the
 The CMake code in this framework is licensed under the
 [BSD license](http://opensource.org/licenses/BSD-3-Clause).
 
-## Links
-
-- Home page: <https://projects.kde.org/projects/frameworks/kimageformats>
-- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel>
-- IRC channel: \#kde-devel on Freenode
-- Git repository: <https://projects.kde.org/projects/frameworks/kimageformats/repository>

metainfo.yaml

@@ -1,9 +1,12 @@
 maintainer: alexmerry
-description: Addons to QtImageFormats
+description: Image format plugins for Qt
 tier: 1
 type: functional
 platforms:
-    - name: All
+    - name: Linux
+    - name: MacOSX
+    - name: Windows
+      note: No EPS support on Windows
 portingAid: false
 deprecated: false
 release: true

src/imageformats/CMakeLists.txt

@@ -2,11 +2,15 @@
 
 ##################################
 
-add_library(kimg_dds MODULE dds.cpp)
+if (Qt5Gui_VERSION VERSION_LESS 5.3.0)
-target_link_libraries(kimg_dds Qt5::Gui)
+    add_library(kimg_dds MODULE dds.cpp)
+    target_link_libraries(kimg_dds Qt5::Gui)
 
-install(TARGETS kimg_dds  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+    install(TARGETS kimg_dds  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
-install(FILES dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+    install(FILES dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+else()
+    install(FILES dds-qt.desktop RENAME dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+endif()
 
 ##################################
 
@@ -34,6 +38,9 @@ if(JASPER_FOUND)
 
     install(TARGETS kimg_jp2  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
     install(FILES jp2.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+elseif (NOT Qt5Gui_VERSION VERSION_LESS 5.3.0)
+    # need this for Qt's version of the plugin
+    install(FILES jp2.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
 endif()
 
 ##################################

src/imageformats/dds-qt.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=QImageIOPlugins
+X-KDE-ImageFormat=dds
+X-KDE-MimeType=image/x-dds
+X-KDE-Read=true
+X-KDE-Write=true

src/imageformats/dds.cpp

@@ -19,7 +19,7 @@
  *     rgb dds files only -- TODO
  */
 
-#include "dds.h"
+#include "dds_p.h"
 
 #include <QtCore/QStringList>
 #include <QImage>

src/imageformats/eps.cpp

@@ -1,4 +1,4 @@
-/**
+/*
 * QImageIO Routines to read/write EPS images.
 * copyright (c) 1998 Dirk Schoenberger <dirk.schoenberger@freenet.de>
 * Copyright (c) 2013 Alex Merry <alex.merry@kdemail.net>
@@ -6,7 +6,7 @@
 *
 * This library is distributed under the conditions of the GNU LGPL.
 */
-#include "eps.h"
+#include "eps_p.h"
 
 #include <QDebug>
 #include <QImage>

src/imageformats/eps_p.h

@@ -1,4 +1,4 @@
-/**
+/*
 * QImageIO Routines to read/write EPS images.
 * copyright (c) 1998 Dirk Schoenberger <dirk.schoenberger@freenet.de>
 *

src/imageformats/exr.cpp

@@ -1,5 +1,5 @@
 
-/**
+/*
 * KImageIO Routines to read (and perhaps in the future, write) images
 * in the high dynamic range EXR format.
 * Copyright (c) 2003, Brad Hards <bradh@frogmouth.net>
@@ -7,7 +7,7 @@
 * This library is distributed under the conditions of the GNU LGPL.
 */
 
-#include "exr.h"
+#include "exr_p.h"
 
 #include <ImfRgbaFile.h>
 #include <ImfStandardAttributes.h>

src/imageformats/exr_p.h

@@ -1,4 +1,4 @@
-/**
+/*
 * QImageIO Routines to read (and perhaps in the future, write) images
 * in the high definition EXR format.
 *

src/imageformats/hdr.cpp

@@ -8,7 +8,7 @@
    version 2 of the License, or (at your option) any later version.
 */
 
-#include "hdr.h"
+#include "hdr_p.h"
 
 #include <QImage>
 #include <QtCore/QDataStream>

src/imageformats/jp2.cpp

@@ -1,11 +1,11 @@
-/**
+/*
 * QImageIO Routines to read/write JPEG2000 images.
 * copyright (c) 2002 Michael Ritzert <michael@ritzert.de>
 *
 * This library is distributed under the conditions of the GNU LGPL.
 */
 
-#include "jp2.h"
+#include "jp2_p.h"
 
 #include <config-jp2.h>
 

src/imageformats/jp2_p.h

@@ -1,4 +1,4 @@
-/**
+/*
 * QImageIO Routines to read/write JPEG2000 images.
 * copyright (c) 2002 Michael Ritzert <michael@ritzert.de>
 *

src/imageformats/pcx.cpp

@@ -7,7 +7,7 @@
    version 2 of the License, or (at your option) any later version.
 */
 
-#include "pcx.h"
+#include "pcx_p.h"
 
 #include <QColor>
 #include <QDataStream>

src/imageformats/pic.cpp

@@ -1,4 +1,4 @@
-/**
+/*
  * Softimage PIC support for QImage
  * Copyright 1998 Halfdan Ingvarsson
  * Copyright 2007 Ruben Lopez <r.lopez@bren.es>
@@ -25,7 +25,7 @@
  * with his permission.
  */
 
-#include "pic.h"
+#include "pic_p.h"
 
 #include <QDataStream>
 #include <QDebug>
@@ -340,7 +340,7 @@ static void encodeMixedRLEData(QDataStream &stream, const Item *data, unsigned l
             chunkLength = 1;
             chunkEnd = chunkStart + 1;
             while (chunkLength < maxChunk &&
-                    (chunkLength + 1 == maxChunk ||
+                    (chunkLength + 1u == maxChunk ||
                      !itemsEqual(*chunkEnd, *(chunkEnd+1))))
             {
                 ++chunkEnd;

src/imageformats/pic_p.h

@@ -1,4 +1,4 @@
-/**
+/*
  * PIC_RW - Qt PIC Support
  * Copyright (C) 2007 Ruben Lopez <r.lopez@bren.es>
  *
@@ -60,6 +60,8 @@ enum PicChannelCode {
 
 /**
  * The header for a SoftImage PIC file.
+ *
+ * @private
  */
 struct PicHeader {
     /**
@@ -111,6 +113,8 @@ struct PicHeader {
 
 /**
  * Describes a channel in a SoftImage PIC file.
+ *
+ * @private
  */
 struct PicChannel {
     quint8 size; /**< Bits per component per pixel. */

src/imageformats/psd.cpp

@@ -17,7 +17,7 @@
  *     not supported
  */
 
-#include "psd.h"
+#include "psd_p.h"
 
 #include <QImage>
 #include <QtCore/QDataStream>

src/imageformats/ras.cpp

@@ -9,7 +9,7 @@
    version 2 of the License, or (at your option) any later version.
 */
 
-#include "ras.h"
+#include "ras_p.h"
 
 #include <QImage>
 #include <QtCore/QDataStream>

src/imageformats/rgb.cpp

@@ -21,7 +21,7 @@
  * saved by this filter.
  */
 
-#include "rgb.h"
+#include "rgb_p.h"
 
 #include <QtCore/QMap>
 #include <QtCore/QVector>

src/imageformats/tga.cpp

@@ -18,7 +18,7 @@
  *     uncompressed true color tga files
  */
 
-#include "tga.h"
+#include "tga_p.h"
 
 #include <assert.h>
 

src/imageformats/xcf.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include "xcf.h"
+#include "xcf_p.h"
 
 #include <stdlib.h>
 #include <QImage>
@@ -29,7 +29,7 @@
 #include <QtCore/QVector>
 // #include <QDebug>
 
-#include "gimp.h"
+#include "gimp_p.h"
 
 const float INCHESPERMETER = (100.0f / 2.54f);