From 237476cb794f8ee73ad315d040a4fb0ccbf618b9 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Wed, 13 Jul 2011 02:46:12 +0000
Subject: [PATCH] * Source/GSImageMagickImageRep.m: Log warnings from
 ImageMagick instead of giving up.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33540 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                      |  5 +++++
 Source/GSImageMagickImageRep.m | 29 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f54b43217..51594163d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-12  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/GSImageMagickImageRep.m: Log warnings from ImageMagick
+	instead of giving up.
+
 2011-07-12  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/GSGuiPrivate.h: New rounding rounding function
diff --git a/Source/GSImageMagickImageRep.m b/Source/GSImageMagickImageRep.m
index be5596aef..57150a7d0 100644
--- a/Source/GSImageMagickImageRep.m
+++ b/Source/GSImageMagickImageRep.m
@@ -34,6 +34,7 @@
 #import <Foundation/NSData.h>
 #import <Foundation/NSTask.h>
 #import <Foundation/NSProcessInfo.h>
+#import <GNUstepBase/NSDebug+GNUstepBase.h>
 #import "AppKit/NSBitmapImageRep.h"
 #import "AppKit/NSGraphics.h"
 #import "AppKit/NSPasteboard.h"
@@ -124,23 +125,25 @@
 
   images = BlobToImage(imageinfo, [data bytes], [data length], exception);
 
-  if (exception->severity == UndefinedException)
+  if (exception->severity != UndefinedException)
     {
-      for (image = images; image != NULL; image = image->next)
+      NSWarnLog(@"ImageMagick: %s", GetLocaleExceptionMessage(exception->severity, exception->reason));
+    }
+  
+  for (image = images; image != NULL; image = image->next)
+    {
+      NSBitmapImageRep *bmp = [[self class] imageRepWithImageMagickImage: image];
+      if (bmp != nil)
 	{
-	  NSBitmapImageRep *bmp = [[self class] imageRepWithImageMagickImage: image];
-	  if (bmp != nil)
-	    {
-	      [reps addObject: bmp];
-	    }
-
-	  if (!allImages)
-	    {
-	      break;
-	    }
+	  [reps addObject: bmp];
+	}
+      
+      if (!allImages)
+	{
+	  break;
 	}
     }
-
+  
   DestroyExceptionInfo(exception);
   DestroyImageInfo(imageinfo);
   DestroyImage(images);