for (p=comment; comment != (char *) NULL; p++)
{
c=ReadBlobByte(image);
- if ((c == EOF) || (c == (int) '}'))
- break;
+ if (c == (int) '\\')
+ c=ReadBlobByte(image);
+ else
+ if ((c == EOF) || (c == (int) '}'))
+ break;
if ((size_t) (p-comment+1) >= length)
{
*p='\0';
"MemoryAllocationFailed");
*p++=(char) c;
c=ReadBlobByte(image);
+ if (c == '\\')
+ {
+ c=ReadBlobByte(image);
+ if (c == (int) '}')
+ {
+ *p++=(char) c;
+ c=ReadBlobByte(image);
+ }
+ }
if (*options != '{')
if (isspace((int) ((unsigned char) c)) != 0)
break;
}
*p='\0';
if (*options == '{')
- (void) CopyMagickString(options,options+1,MaxTextExtent);
+ (void) strcpy(options,options+1);
/*
Assign a value to the specified keyword.
*/
MagickFalse,options);
if (colorspace < 0)
break;
- image->colorspace=(ColorspaceType) colorspace;
+ (void) SetImageColorspace(image,(ColorspaceType) colorspace, exception);
break;
}
if (LocaleCompare(keyword,"compression") == 0)
value=GetImageProperty(image,property,exception);
if (value != (const char *) NULL)
{
- for (i=0; i < (ssize_t) strlen(value); i++)
+ size_t
+ length;
+
+ length=strlen(value);
+ for (i=0; i < (ssize_t) length; i++)
if (isspace((int) ((unsigned char) value[i])) != 0)
break;
- if (i < (ssize_t) strlen(value))
- (void) WriteBlobByte(image,'{');
- (void) WriteBlob(image,strlen(value),(unsigned char *) value);
- if (i < (ssize_t) strlen(value))
- (void) WriteBlobByte(image,'}');
+ if (i == (ssize_t) length)
+ (void) WriteBlob(image,length,(const unsigned char *) value);
+ else
+ {
+ (void) WriteBlobByte(image,'{');
+ if (strchr(value,'}') == (char *) NULL)
+ (void) WriteBlob(image,length,(const unsigned char *) value);
+ else
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ if (value[i] == (int) '}')
+ (void) WriteBlobByte(image,'\\');
+ (void) WriteBlobByte(image,value[i]);
+ }
+ (void) WriteBlobByte(image,'}');
+ }
}
(void) WriteBlobByte(image,'\n');
property=GetNextImageProperty(image);