r21315 by fschmid -

[scribus-commit]

Author: fschmid
Date: Sun May 15 08:59:23 2016
New Revision: 21315

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21315
Log:
Remove wrong detection of .txt and .html files as images.

Modified:
    trunk/Scribus/scribus/util_formats.cpp

Modified: trunk/Scribus/scribus/util_formats.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21315&path=/trunk/Scribus/scribus/util_formats.cpp
==============================================================================
--- trunk/Scribus/scribus/util_formats.cpp	(original)
+++ trunk/Scribus/scribus/util_formats.cpp	Sun May 15 08:59:23 2016
@@ -63,6 +63,7 @@
 	MagickFree(magick_array);
 	//qDebug()<<gmagickformats;
 	gmagickformats.removeAll("eps");
+	gmagickformats.removeAll("html");
 	gmagickformats.removeAll("pdf");
 	gmagickformats.removeAll("pict");
 	gmagickformats.removeAll("ps");
@@ -70,6 +71,7 @@
 	gmagickformats.removeAll("svg");
 	gmagickformats.removeAll("svgz");
 	gmagickformats.removeAll("tiff");
+	gmagickformats.removeAll("txt");
 	gmagickformats.removeAll("wmf");
 	gmagickformats.removeAll("wpg");
 	m_fmts.insert(FormatsManager::GMAGICK, gmagickformats);