r21683 by jghali - #14510: Cannot export PDF's with documents that have Krita links

[scribus-commit]

Author: jghali
Date: Wed Dec 28 10:23:31 2016
New Revision: 21683

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21683
Log:
#14510: Cannot export PDF's with documents that have Krita links

Modified:
    trunk/Scribus/scribus/scimage.cpp

Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21683&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp	(original)
+++ trunk/Scribus/scribus/scimage.cpp	Wed Dec 28 10:23:31 2016
@@ -1976,7 +1976,7 @@
 	alpha.resize(0);
 	QString ext = fi.suffix().toLower();
 	QString ext2 = getImageType(fn);
-	if (ext.isEmpty() || (ext2 != ext))
+	if (ext.isEmpty() || (!ext2.isEmpty() && (ext2 != ext)))
 		ext = ext2;
 	QList<QByteArray> fmtList = QImageReader::supportedImageFormats();
 	QStringList fmtImg;
@@ -2127,7 +2127,7 @@
 		return;
 	QString ext = fi.suffix().toLower();
 	QString ext2 = getImageType(fn);
-	if (ext.isEmpty() || (ext2 != ext))
+	if (ext.isEmpty() || (!ext2.isEmpty() && (ext2 != ext)))
 		ext = ext2;
 
 	if (extensionIndicatesPSD(ext))