(no commit message)

[imagemagick] / MagickCore / property.c

diff --git a/MagickCore/property.c b/MagickCore/property.c
index afe15293be5284aafa635b1f6f057c80d79f6a60..460c85b6c897b2193b668b46fc51a9c480c2d9b7 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1295,8 +1295,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
             case EXIF_FMT_BYTE:
             case EXIF_FMT_UNDEFINED:
             {
-              EXIFMultipleValues(1,"%.20g",(double)
-                (*(unsigned char *) p1));
+              EXIFMultipleValues(1,"%.20g",(double) (*(unsigned char *) p1));
               break;
             }
             case EXIF_FMT_SBYTE:
@@ -1474,8 +1473,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
   return(status);
 }
 
-static MagickBooleanType GetXMPProperty(const Image *image,
-  const char *property)
+static MagickBooleanType GetXMPProperty(const Image *image,const char *property)
 {
   char
     *xmp_profile;
@@ -2128,8 +2126,8 @@ MagickExport const char *GetImageProperty(const Image *image,
 %
 %  The format of the GetMagickProperty method is:
 %
-%      const char *GetMagickProperty(const ImageInfo *image_info,
-%        Image *image,const char *key)
+%      const char *GetMagickProperty(const ImageInfo *image_info,Image *image,
+%        const char *key)
 %
 %  A description of each parameter follows:
 %
@@ -2344,7 +2342,7 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
       if (LocaleNCompare("page",property,4) == 0)
         {
           (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
-              GetImageIndexInList(image)+1);
+            GetImageIndexInList(image)+1);
           break;
         }
       break;
@@ -2784,7 +2782,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
           Number of images in the list.
         */
         q+=FormatLocaleString(q,extent,"%.20g",(double)
-             GetImageListLength(image));
+          GetImageListLength(image));
         break;
       }
       case 'o':
@@ -3308,7 +3306,8 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
             value);
           if (colorspace < 0)
             break;
-          (void) SetImageColorspace(image,(ColorspaceType) colorspace);
+          (void) SetImageColorspace(image,(ColorspaceType) colorspace,
+            exception);
           break;
         }
       if (LocaleCompare(property,"compose") == 0)