r14062 by fschmid - Fixed non working preview when there was no thumbnail in the EXIF infos but other EXIF values exists.

[scribus-commit]

Revision: 14062
Author: fschmid
Date: 2009-09-29T11:02:18.054378Z
Commit message: Fixed non working preview when there was no thumbnail in the EXIF infos but other EXIF values exists.

Changeset: 
M  /trunk/Scribus/scribus/scimgdataloader_jpeg.cpp

Diffs:
Index: scribus/scimgdataloader_jpeg.cpp
===================================================================
--- scribus/scimgdataloader_jpeg.cpp	(revision 14061)
+++ scribus/scimgdataloader_jpeg.cpp	(revision 14062)
@@ -314,7 +314,7 @@
 				m_message = QObject::tr("%1 may be corrupted : missing or wrong resolution tags").arg(qfi.fileName());
 				m_msgType = warningMsg;
 			}
-			if (m_imageInfoRecord.exifDataValid && thumbnail)
+			if (m_imageInfoRecord.exifDataValid && !m_imageInfoRecord.exifInfo.thumbnail.isNull() && thumbnail)
 			{
 				m_image = QImage(m_imageInfoRecord.exifInfo.width, m_imageInfoRecord.exifInfo.height, QImage::Format_ARGB32 );
 				m_imageInfoRecord.exifInfo.width = cinfo.output_width;
@@ -346,7 +346,7 @@
 			m_imageInfoRecord.valid = (m_imageInfoRecord.PDSpathData.size())>0?true:false; // The only interest is vectormask
 			arrayPhot.clear();
 			free( PhotoshopBuffer );
-			if (m_imageInfoRecord.exifDataValid && thumbnail)
+			if (m_imageInfoRecord.exifDataValid && !m_imageInfoRecord.exifInfo.thumbnail.isNull() && thumbnail)
 			{
 				jpeg_destroy_decompress(&cinfo);
 				fclose(infile);