[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/core/builder
From:       Bart Coppens <kde () bartcoppens ! be>
Date:       2005-05-06 19:43:40
Message-ID: 1115408620.121101.12893.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 410129 by coppens:

It now should really work with imagemagick 5

 M  +12 -6     trunk/koffice/krita/core/builder/kis_image_magick_converter.cc  


--- trunk/koffice/krita/core/builder/kis_image_magick_converter.cc #410128:410129
@@ -546,21 +546,24 @@
 	QString description;
 	unsigned long matches;
 
+#ifdef HAVE_MAGICK6
 #ifdef HAVE_OLD_GETMAGICKINFOLIST
 	const MagickInfo **mi;
 	mi = GetMagickInfoList("*", &matches);
 #else // HAVE_OLD_GETMAGICKINFOLIST
 	ExceptionInfo ei;
 	GetExceptionInfo(&ei);
-#ifdef HAVE_MAGICK6
 	const MagickInfo **mi;
 	mi = GetMagickInfoList("*", &matches, &ei);
+	DestroyExceptionInfo(&ei);
+#endif // HAVE_OLD_GETMAGICKINFOLIST
 #else // HAVE_MAGICK6
 	const MagickInfo *mi;
+	ExceptionInfo ei;
+	GetExceptionInfo(&ei);
 	mi = GetMagickInfo("*", &ei);
+	DestroyExceptionInfo(&ei);
 #endif // HAVE_MAGICK6
-	DestroyExceptionInfo(&ei);
-#endif // HAVE_OLD_GETMAGICKINFOLIST
 
 	if (!mi)
 		return s;
@@ -617,21 +620,24 @@
 	QString description;
 	unsigned long matches;
 
+#ifdef HAVE_MAGICK6
 #ifdef HAVE_OLD_GETMAGICKINFOLIST
 	const MagickInfo **mi;
 	mi = GetMagickInfoList("*", &matches);
 #else // HAVE_OLD_GETMAGICKINFOLIST
 	ExceptionInfo ei;
 	GetExceptionInfo(&ei);
-#ifdef HAVE_MAGICK6
 	const MagickInfo **mi;
 	mi = GetMagickInfoList("*", &matches, &ei);
+	DestroyExceptionInfo(&ei);
+#endif // HAVE_OLD_GETMAGICKINFOLIST
 #else // HAVE_MAGICK6
 	const MagickInfo *mi;
+	ExceptionInfo ei;
+	GetExceptionInfo(&ei);
 	mi = GetMagickInfo("*", &ei);
+	DestroyExceptionInfo(&ei);
 #endif // HAVE_MAGICK6
-	DestroyExceptionInfo(&ei);
-#endif // HAVE_OLD_GETMAGICKINFOLIST
 
 	if (!mi) {
 		kdDebug() << "Eek, no magick info!\n";
[prev in list] [next in list] [prev in thread] [next in thread]