r13963 by fschmid - Enable the use of the new GrapicsMagick fileformats in the "Load Image" dialogs.

[scribus-commit]

Revision: 13963
Author: fschmid
Date: 2009-09-05T21:17:37.422962Z
Commit message: Enable the use of the new GrapicsMagick fileformats in the "Load Image" dialogs.

Changeset: 
M  /trunk/Scribus/scribus/util_formats.cpp
M  /trunk/Scribus/scribus/util_formats.h

Diffs:
Index: scribus/util_formats.cpp
===================================================================
--- scribus/util_formats.cpp	(revision 13962)
+++ scribus/util_formats.cpp	(revision 13963)
@@ -32,7 +32,9 @@
 	m_fmts.insert(FormatsManager::XFIG, QStringList() << "fig");
 	m_fmts.insert(FormatsManager::CVG,  QStringList() << "cvg");
 	m_fmts.insert(FormatsManager::WPG,  QStringList() << "wpg");
+#ifdef GMAGICK_FOUND
 	m_fmts.insert(FormatsManager::GMAGICK, QStringList() << "xbm" << "wpg" << "tga" << "ptif" << "ppm" << "pnm" << "pict" << "pgm" << "pcds" << "pcd" << "pbm" << "mng" << "ico" << "gif" << "fax" << "dpx" << "bmp" << "xcf");
+#endif
 	m_fmts.insert(FormatsManager::UNICONV, QStringList() << "cdr" << "cdt" << "ccx" << "cmx" << "cgm" << "aff" << "sk" << "sk1");
 	
 	m_fmtNames[FormatsManager::EPS]  = QObject::tr("Encapsulated PostScript");
@@ -51,7 +53,9 @@
 	m_fmtNames[FormatsManager::XFIG] = QObject::tr("Xfig File");
 	m_fmtNames[FormatsManager::CVG]  = QObject::tr("Calamus Cvg File");
 	m_fmtNames[FormatsManager::WPG]  = QObject::tr("Word Perfect Wpg File");
+#ifdef GMAGICK_FOUND
 	m_fmtNames[FormatsManager::GMAGICK] = QObject::tr("GraphicsMagick File");
+#endif
 	m_fmtNames[FormatsManager::UNICONV] = QObject::tr("UniConvertor File");
 	
 	m_fmtMimeTypes.insert(FormatsManager::EPS,  QStringList() << "application/postscript");
Index: scribus/util_formats.h
===================================================================
--- scribus/util_formats.h	(revision 13962)
+++ scribus/util_formats.h	(revision 13963)
@@ -20,6 +20,7 @@
 #include <QString>
 #include <QStringList>
 #include "scribusapi.h"
+#include "scconfig.h"
 
 bool SCRIBUS_API extensionIndicatesEPS(const QString &ext);
 bool SCRIBUS_API extensionIndicatesEPSorPS(const QString &ext);
@@ -37,7 +38,11 @@
 		enum ScImageFormatType
 		{
 			ALLIMAGES 		= 1|2|4|8|16|32|64|128|256|512|1024|2048|4096|8192|16384|32768,
+#ifdef GMAGICK_FOUND
+			IMAGESIMGFRAME	= 1|2|4|16|32|64|128|256|512|65536,  // all Types suitable for Image Frames
+#else
 			IMAGESIMGFRAME	= 1|2|4|16|32|64|128|256|512,  // all Types suitable for Image Frames
+#endif
 			VECTORIMAGES	= 1|64|1024|2048|16384|32768|131072,  // All pure vector image types
 			RASTORIMAGES	= 2|4|8|32|512|65536,  // All pure rastor image types
 			EPS				= 1,      // Encapsulated PostScript
@@ -56,7 +61,9 @@
 			XFIG			= 8192,   // Xfig files
 			CVG				= 16384,  // Calamus Cvg files
 			WPG				= 32768,  // Word Perfect WPG files
+#ifdef GMAGICK_FOUND
 			GMAGICK			= 65536,  // GraphicsMagick
+#endif
 			UNICONV			= 131072, // UniConvertor
 		};