kimgio: handle BMP, JPEG, TIFF and TGA formats via magick plugin

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

kimgio/CMakeLists.txt

@@ -22,6 +22,11 @@ if(IMAGEMAGICK_FOUND)
     )
     install(
         FILES
+        bmp.desktop
+        ico.desktop
+        jpg.desktop
+        tga.desktop
+        tiff.desktop
         dds.desktop
         eps.desktop
         exr.desktop

kimgio/README

@@ -9,6 +9,11 @@ along with whatever ImageMagick supports but it is assumed that it supports
 reading atleast the following formats (even if they cannot be loaded) for
 compatibility:
 
+BMP     <read>
+ICO     <read>
+JPEG    <read>
+TGA     <read>
+TIFF    <read>
 DDS     <read>
 EPS     <read>
 EXR     <read>

kimgio/bmp.desktop

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

kimgio/ico.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=QImageIOPlugins
+X-KDE-ImageFormat=magick
+X-KDE-MimeType=image/vnd.microsoft.icon
+X-KDE-Read=true
+X-KDE-Write=false

kimgio/jpg.desktop

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

kimgio/tga.desktop

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

kimgio/tiff.desktop

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

kio/kio/kimageio.cpp

@@ -21,20 +21,12 @@ static const struct ImageFormatTblData {
     const QLatin1String format;
 } ImageFormatTbl[] = {
     { "image/png", QLatin1String("png") },
-    { "image/bmp", QLatin1String("bmp") },
     { "image/x-portable-pixmap", QLatin1String("ppm") },
     { "image/x-portable-graymap", QLatin1String("pgm") },
     { "image/x-portable-bitmap", QLatin1String("pbm") },
     { "image/x-xbitmap", QLatin1String("xbm") },
     { "image/x-xpixmap", QLatin1String("xpm") },
-    { "video/x-mng", QLatin1String("mng") },
     { "image/gif", QLatin1String("gif") },
-    { "image/vnd.microsoft.icon", QLatin1String("ico") },
-    { "image/jpeg", QLatin1String("jpeg") },
-    { "image/jpeg", QLatin1String("jpg") },
-    { "image/tiff", QLatin1String("tiff") },
-    { "image/tiff", QLatin1String("tif") },
-    { "image/x-tga", QLatin1String("tga") },
     { "image/svg+xml", QLatin1String("svg") },
     { "image/svg+xml-compressed", QLatin1String("svgz") },
 };

kio/kio/kimageio.h

@@ -24,6 +24,11 @@
  * \b Formats:
  *
  * Currently supported formats include:
+ * @li BMP     \<read\>
+ * @li ICO     \<read\>
+ * @li JPEG    \<read\>
+ * @li TGA     \<read\>
+ * @li TIFF    \<read\>
  * @li DDS     \<read\>
  * @li EPS     \<read\>
  * @li EXR     \<read\>