- Added .ico support, which is really useful for RSS favicons. We use libMagick++ in order to convert ICO icons to PNG. If this library is not installed, qBittorrent will still compile but this feature will be disabled.

configure

@@ -24,6 +24,9 @@ Dependency options:
   --with-libboost-inc=[path]              Path to libboost include files
   --with-libcommoncpp2-inc=[path]         Path to libcommoncpp2 include files
   --with-libcommoncpp2-lib=[path]         Path to libcommoncpp2 library files
+  --disable-libmagick                    Disable use of libmagick
+  --with-libmagick-inc=[path]             Path to libmagick++ include files
+  --with-libmagick-lib=[path]             Path to libmagick++ library files
 
 EOT
 }
@@ -170,6 +173,21 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--disable-libmagick)
+			QC_DISABLE_libmagick="Y"
+			shift
+			;;
+
+		--with-libmagick-inc=*)
+			QC_WITH_LIBMAGICK_INC=$optarg
+			shift
+			;;
+
+		--with-libmagick-lib=*)
+			QC_WITH_LIBMAGICK_LIB=$optarg
+			shift
+			;;
+
 		--verbose)
 			QC_DEBUG="Y"
 			shift
@@ -197,6 +215,9 @@ echo QC_WITH_LIBTORRENT_STATIC_LIB=$QC_WITH_LIBTORRENT_STATIC_LIB
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_WITH_LIBCOMMONCPP2_INC=$QC_WITH_LIBCOMMONCPP2_INC
 echo QC_WITH_LIBCOMMONCPP2_LIB=$QC_WITH_LIBCOMMONCPP2_LIB
+echo QC_DISABLE_libmagick=$QC_DISABLE_libmagick
+echo QC_WITH_LIBMAGICK_INC=$QC_WITH_LIBMAGICK_INC
+echo QC_WITH_LIBMAGICK_LIB=$QC_WITH_LIBMAGICK_LIB
 echo
 fi
 
@@ -500,6 +521,65 @@ public:
 		return true;
 	}
 };
+#line 1 "libmagick.qcm"
+/*
+-----BEGIN QCMOD-----
+name: libmagick
+arg: with-libmagick-inc=[path], Path to libmagick++ include files
+arg: with-libmagick-lib=[path], Path to libmagick++ library files
+-----END QCMOD-----
+*/
+class qc_libmagick : public ConfObj
+{
+public:
+	qc_libmagick(Conf *c) : ConfObj(c) {}
+	QString name() const { return "ImageMagick library (libmagick++)"; }
+	QString shortname() const { return "libmagick++"; }
+	bool exec(){
+    QString s;
+		s = conf->getenv("QC_WITH_LIBMAGICK_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "Magick++.h")) {
+				return false;
+    	}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "Magick++.h")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) {
+				return false;
+      }
+		}
+		conf->addIncludePath(s);
+
+		s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
+		if(!s.isEmpty()) {
+			if(!QFile::exists(s+QString("libMagick++.so")))
+		    return false;
+    	conf->addLib(QString("-L") + s);
+		}else{
+			QStringList sl;
+			sl << "/usr/lib/";
+			sl << "/usr/local/lib/";
+			bool found = false;
+			foreach(s, sl){
+				if(QFile::exists(s+QString("libMagick++.so"))){
+					found = true;
+				}
+			}
+			if(!found) return false;
+			conf->addLib(QString("-L") + s);
+		}
+		return true;
+	}
+};
 #line 1 "python.qcm"
 /*
 -----BEGIN QCMOD-----
@@ -535,6 +615,9 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_libcommoncpp2(conf);
     o->required = true;
     o->disabled = false;
+    o = new qc_libmagick(conf);
+    o->required = false;
+    o->disabled = false;
     o = new qc_python(conf);
     o->required = true;
     o->disabled = false;
@@ -1470,6 +1553,9 @@ export QC_WITH_LIBTORRENT_STATIC_LIB
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBCOMMONCPP2_INC
 export QC_WITH_LIBCOMMONCPP2_LIB
+export QC_DISABLE_libmagick
+export QC_WITH_LIBMAGICK_INC
+export QC_WITH_LIBMAGICK_LIB
 export QC_DEBUG
 rm -rf .qconftemp
 (