From kde-commits  Mon May 02 13:30:39 2005
From: Bart Coppens <kde () bartcoppens ! be>
Date: Mon, 02 May 2005 13:30:39 +0000
To: kde-commits
Subject: koffice/krita/core/builder
Message-Id: <20050502133039.38CEE4A6 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111504065916031

CVS commit by coppens: 

Add some more ifdef complexity: the GetMagickInfoList didn't exist in imagemagick 5.x


  M +59 -6     kis_image_magick_converter.cc   1.47


--- koffice/krita/core/builder/kis_image_magick_converter.cc  #1.46:1.47
@@ -545,19 +545,26 @@ QString KisImageMagickConverter::readFil
         QString name;
         QString description;
-        const MagickInfo **mi;
         unsigned long matches;
 
 #ifdef HAVE_OLD_GETMAGICKINFOLIST
+        const MagickInfo **mi;
         mi = GetMagickInfoList("*", &matches);
-#else
+#else // HAVE_OLD_GETMAGICKINFOLIST
         ExceptionInfo ei;
         GetExceptionInfo(&ei);
+#ifdef HAVE_MAGICK6
+        const MagickInfo **mi;
         mi = GetMagickInfoList("*", &matches, &ei);
+#else // HAVE_MAGICK6
+        const MagickInfo *mi;
+        mi = GetMagickInfo("*", &ei);
+#endif // HAVE_MAGICK6
         DestroyExceptionInfo(&ei);
-#endif
+#endif // HAVE_OLD_GETMAGICKINFOLIST
 
         if (!mi)
                 return s;
 
+#ifdef HAVE_MAGICK6
         for (unsigned long i = 0; i < matches; i++) {
                 const MagickInfo *info = mi[i];
@@ -578,4 +585,22 @@ QString KisImageMagickConverter::readFil
                 }
         }
+#else
+        for (; mi; mi = reinterpret_cast<const MagickInfo*>(mi -> next)) {
+                if (mi -> stealth)
+                        continue;
+                if (mi -> decoder) {
+                        name = mi -> name;
+                        description = mi -> description;
+                        kdDebug() << "Found import filter for: " << name << "\n";
+
+                        if (!description.isEmpty() && !description.contains('/')) {
+                                all += "*." + name.lower() + " *." + name + " ";
+                                s += "*." + name.lower() + " *." + name + "|";
+                                s += i18n(description.utf8());
+                                s += "\n";
+                        }
+                }
+        }
+#endif
 
         all += "|" + i18n("All Images");
@@ -591,15 +616,21 @@ QString KisImageMagickConverter::writeFi
         QString name;
         QString description;
-        const MagickInfo **mi;
         unsigned long matches;
 
 #ifdef HAVE_OLD_GETMAGICKINFOLIST
+        const MagickInfo **mi;
         mi = GetMagickInfoList("*", &matches);
-#else
+#else // HAVE_OLD_GETMAGICKINFOLIST
         ExceptionInfo ei;
         GetExceptionInfo(&ei);
+#ifdef HAVE_MAGICK6
+        const MagickInfo **mi;
         mi = GetMagickInfoList("*", &matches, &ei);
+#else // HAVE_MAGICK6
+        const MagickInfo *mi;
+        mi = GetMagickInfo("*", &ei);
+#endif // HAVE_MAGICK6
         DestroyExceptionInfo(&ei);
-#endif
+#endif // HAVE_OLD_GETMAGICKINFOLIST
 
         if (!mi) {
@@ -608,4 +639,5 @@ QString KisImageMagickConverter::writeFi
         }
 
+#ifdef HAVE_MAGICK6
         for (unsigned long i = 0; i < matches; i++) {
                 const MagickInfo *info = mi[i];
@@ -627,4 +659,25 @@ QString KisImageMagickConverter::writeFi
                 }
         }
+#else
+        for (; mi; mi = reinterpret_cast<const MagickInfo*>(mi -> next)) {
+                kdDebug() << "Found export filter for: " << mi -> name << "\n";
+                if (mi -> stealth)
+                        continue;
+
+                if (mi -> encoder) {
+                        name = mi -> name;
+
+                        description = mi -> description;
+
+                        if (!description.isEmpty() && !description.contains('/')) {
+                                all += "*." + name.lower() + " *." + name + " ";
+                                s += "*." + name.lower() + " *." + name + "|";
+                                s += i18n(description.utf8());
+                                s += "\n";
+                        }
+                }
+        }
+#endif
+
 
         all += "|" + i18n("All Images");