Changeset 7223

Timestamp:

03/25/12 19:05:07 (14 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/branches/ImageMagick-6/coders

Files:

• pango.c (modified) (2 diffs)
• pdf.c (modified) (1 diff)

ImageMagick/branches/ImageMagick-6/coders/pango.c

@@ -61 +61 @@
 #include "magick/string_.h"
 #include "magick/string-private.h"
+#include "magick/token.h"
 #include "magick/utility.h"
 #if defined(MAGICKCORE_PANGOFT2_DELEGATE)
@@ -178 +179 @@
   option=GetImageOption(image_info,"filename");
   if (option == (const char *) NULL)
-    property=InterpretImageProperties(image_info,image,image_info->filename,
-      exception);
+    property=InterpretImageProperties(image_info,image,image_info->filename);
   else
     if (LocaleNCompare(option,"pango:",6) == 0)
-      property=InterpretImageProperties(image_info,image,option+6,exception);
+      property=InterpretImageProperties(image_info,image,option+6);
     else
-      property=InterpretImageProperties(image_info,image,option,exception);
-  (void) SetImageProperty(image,"caption",property,exception);
+      property=InterpretImageProperties(image_info,image,option);
+  (void) SetImageProperty(image,"caption",property);
   property=DestroyString(property);
-  caption=ConstantString(GetImageProperty(image,"caption",exception));
+  caption=ConstantString(GetImageProperty(image,"caption"));
   /*
     Get context.

ImageMagick/branches/ImageMagick-6/coders/pdf.c

@@ -72 +72 @@
 #include "magick/string_.h"
 #include "magick/module.h"
+#include "magick/token.h"
 #include "magick/transform.h"
 #include "magick/utility.h"