% October 1998 %
% %
% %
-% Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",map);
assert(pixels != (void *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage((ImageInfo *) NULL,exception);
if (image == (Image *) NULL)
return((Image *) NULL);
*ping_info;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
ExceptionInfo *exception)
{
char
- ping_filename[MaxTextExtent];
+ ping_filename[MagickPathExtent];
Image
*image,
Ping image list from a file.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
(void) SetImageOption(image_info,"filename",filename);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
(void) InterpretImageFilename(image_info,(Image *) NULL,image_info->filename,
(int) image_info->scene,ping_filename,exception);
if (LocaleCompare(ping_filename,image_info->filename) != 0)
read_info=DestroyImageInfo(read_info);
return(PingImage(image_info,exception));
}
- (void) CopyMagickString(ping_filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(ping_filename,read_info->filename,MagickPathExtent);
images=NewImageList();
extent=(ssize_t) (read_info->scene+read_info->number_scenes);
for (scene=(ssize_t) read_info->scene; scene < (ssize_t) extent; scene++)
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- magick[MaxTextExtent],
- magick_filename[MaxTextExtent];
+ filename[MagickPathExtent],
+ magick[MagickPathExtent],
+ magick_filename[MagickPathExtent];
const char
*value;
*read_info;
MagickStatusType
- flags,
- thread_support;
+ flags;
PolicyDomain
domain;
Determine image type from filename prefix or suffix (e.g. image.jpg).
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image_info->filename != (char *) NULL);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
read_info=CloneImageInfo(image_info);
- (void) CopyMagickString(magick_filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(magick_filename,read_info->filename,MagickPathExtent);
(void) SetImageInfo(read_info,0,exception);
- (void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
- (void) CopyMagickString(magick,read_info->magick,MaxTextExtent);
+ (void) CopyMagickString(filename,read_info->filename,MagickPathExtent);
+ (void) CopyMagickString(magick,read_info->magick,MagickPathExtent);
domain=CoderPolicyDomain;
rights=ReadPolicyRights;
if (IsRightsAuthorized(domain,rights,read_info->magick) == MagickFalse)
image=AcquireImage(read_info,exception);
(void) CopyMagickString(image->filename,read_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
if (delegate_info == (const DelegateInfo *) NULL)
{
(void) SetImageInfo(read_info,0,exception);
- (void) CopyMagickString(read_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(read_info->filename,filename,MagickPathExtent);
magick_info=GetMagickInfo(read_info->magick,exception);
}
}
if ((magick_info != (const MagickInfo *) NULL) &&
(GetImageDecoder(magick_info) != (DecodeImageHandler *) NULL))
{
- thread_support=GetMagickThreadSupport(magick_info);
- if ((thread_support & DecoderThreadSupport) == 0)
+ if (GetMagickDecoderThreadSupport(magick_info) == MagickFalse)
LockSemaphoreInfo(magick_info->semaphore);
image=GetImageDecoder(magick_info)(read_info,exception);
- if ((thread_support & DecoderThreadSupport) == 0)
+ if (GetMagickDecoderThreadSupport(magick_info) == MagickFalse)
UnlockSemaphoreInfo(magick_info->semaphore);
}
else
{
(void) ThrowMagickException(exception,GetMagickModule(),
MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'",
- read_info->filename);
+ read_info->magick);
if (read_info->temporary != MagickFalse)
(void) RelinquishUniqueFileResource(read_info->filename);
read_info=DestroyImageInfo(read_info);
return((Image *) NULL);
}
(void) CopyMagickString(image->filename,read_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
*read_info->filename='\0';
if (GetDelegateThreadSupport(delegate_info) == MagickFalse)
LockSemaphoreInfo(delegate_info->semaphore);
if (IsPathAccessible(read_info->filename) != MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'",
- read_info->filename);
+ read_info->magick);
else
ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
read_info->filename);
read_info=DestroyImageInfo(read_info);
return((Image *) NULL);
}
- thread_support=GetMagickThreadSupport(magick_info);
- if ((thread_support & DecoderThreadSupport) == 0)
+ if (GetMagickDecoderThreadSupport(magick_info) == MagickFalse)
LockSemaphoreInfo(magick_info->semaphore);
image=(Image *) (GetImageDecoder(magick_info))(read_info,exception);
- if ((thread_support & DecoderThreadSupport) == 0)
+ if (GetMagickDecoderThreadSupport(magick_info) == MagickFalse)
UnlockSemaphoreInfo(magick_info->semaphore);
}
if (read_info->temporary != MagickFalse)
(void) RelinquishUniqueFileResource(read_info->filename);
read_info->temporary=MagickFalse;
if (image != (Image *) NULL)
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
}
if (image == (Image *) NULL)
{
image=GetFirstImageInList(clones);
}
}
- if (GetBlobError(image) != MagickFalse)
- ThrowFileException(exception,FileOpenError,
- "AnErrorHasOccurredReadingFromFile",read_info->filename);
for (next=image; next != (Image *) NULL; next=GetNextImageInList(next))
{
char
- magick_path[MaxTextExtent],
+ magick_path[MagickPathExtent],
*property,
- timestamp[MaxTextExtent];
+ timestamp[MagickPathExtent];
const char
*option;
next->taint=MagickFalse;
GetPathComponent(magick_filename,MagickPath,magick_path);
- if (*magick_path == '\0')
- (void) CopyMagickString(next->magick,magick,MaxTextExtent);
+ if (*magick_path == '\0' && *next->magick == '\0')
+ (void) CopyMagickString(next->magick,magick,MagickPathExtent);
(void) CopyMagickString(next->magick_filename,magick_filename,
- MaxTextExtent);
+ MagickPathExtent);
if (IsBlobTemporary(image) != MagickFalse)
- (void) CopyMagickString(next->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(next->filename,filename,MagickPathExtent);
if (next->magick_columns == 0)
next->magick_columns=next->columns;
if (next->magick_rows == 0)
profile=GetImageProfile(next,"iptc");
if (profile == (const StringInfo *) NULL)
profile=GetImageProfile(next,"8bim");
- (void) FormatMagickTime(GetBlobProperties(next)->st_mtime,MaxTextExtent,
+ (void) FormatMagickTime(GetBlobProperties(next)->st_mtime,MagickPathExtent,
timestamp);
(void) SetImageProperty(next,"date:modify",timestamp,exception);
- (void) FormatMagickTime(GetBlobProperties(next)->st_ctime,MaxTextExtent,
+ (void) FormatMagickTime(GetBlobProperties(next)->st_ctime,MagickPathExtent,
timestamp);
(void) SetImageProperty(next,"date:create",timestamp,exception);
option=GetImageOption(image_info,"delay");
ExceptionInfo *exception)
{
char
- read_filename[MaxTextExtent];
+ read_filename[MagickPathExtent];
Image
*image,
Read image list from a file.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- (void) SetImageOption(image_info,"filename",filename);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
- (void) InterpretImageFilename(image_info,(Image *) NULL,filename,
- (int) image_info->scene,read_filename,exception);
- if (LocaleCompare(read_filename,image_info->filename) != 0)
+ read_info=CloneImageInfo(image_info);
+ *read_info->magick='\0';
+ (void) SetImageOption(read_info,"filename",filename);
+ (void) CopyMagickString(read_info->filename,filename,MagickPathExtent);
+ (void) InterpretImageFilename(read_info,(Image *) NULL,filename,
+ (int) read_info->scene,read_filename,exception);
+ if (LocaleCompare(read_filename,read_info->filename) != 0)
{
ExceptionInfo
*sans;
/*
Images of the form image-%d.png[1-5].
*/
- read_info=CloneImageInfo(image_info);
sans=AcquireExceptionInfo();
(void) SetImageInfo(read_info,0,sans);
sans=DestroyExceptionInfo(sans);
read_info=DestroyImageInfo(read_info);
return(ReadImage(image_info,exception));
}
- (void) CopyMagickString(read_filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(read_filename,read_info->filename,MagickPathExtent);
images=NewImageList();
extent=(ssize_t) (read_info->scene+read_info->number_scenes);
for (scene=(ssize_t) read_info->scene; scene < (ssize_t) extent; scene++)
read_info=DestroyImageInfo(read_info);
return(images);
}
- return(ReadImage(image_info,exception));
+ image=ReadImage(read_info,exception);
+ read_info=DestroyImageInfo(read_info);
+ return(image);
}
\f
/*
Image *image,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
const char
*option;
status,
temporary;
- MagickStatusType
- thread_support;
-
PolicyDomain
domain;
Determine image type from filename prefix or suffix (e.g. image.jpg).
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
sans_exception=AcquireExceptionInfo();
write_info=CloneImageInfo(image_info);
- (void) CopyMagickString(write_info->filename,image->filename,MaxTextExtent);
- if (*write_info->magick == '\0')
- (void) CopyMagickString(write_info->magick,image->magick,MaxTextExtent);
+ (void) CopyMagickString(write_info->filename,image->filename,MagickPathExtent);
(void) SetImageInfo(write_info,1,sans_exception);
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
- (void) CopyMagickString(image->filename,write_info->filename,MaxTextExtent);
+ if (*write_info->magick == '\0')
+ (void) CopyMagickString(write_info->magick,image->magick,MagickPathExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
+ (void) CopyMagickString(image->filename,write_info->filename,MagickPathExtent);
domain=CoderPolicyDomain;
rights=WritePolicyRights;
if (IsRightsAuthorized(domain,rights,write_info->magick) == MagickFalse)
}
}
(void) SyncImageProfiles(image);
+ DisassociateImageStream(image);
option=GetImageOption(image_info,"delegate:bimodal");
if ((IfMagickTrue(IsStringTrue(option))) &&
(write_info->page == (char *) NULL) &&
Process image with bi-modal delegate.
*/
(void) CopyMagickString(image->filename,image->magick_filename,
- MaxTextExtent);
+ MagickPathExtent);
status=InvokeDelegate(write_info,image,image->magick,
write_info->magick,exception);
write_info=DestroyImageInfo(write_info);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
return(status);
}
}
(GetMagickSeekableStream(magick_info) != MagickFalse))
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
if (status != MagickFalse)
{
if (IsBlobSeekable(image) == MagickFalse)
*/
write_info->adjoin=MagickTrue;
(void) CopyMagickString(write_info->filename,image->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) AcquireUniqueFilename(image->filename);
temporary=MagickTrue;
}
/*
Call appropriate image writer based on image type.
*/
- thread_support=GetMagickThreadSupport(magick_info);
- if ((thread_support & EncoderThreadSupport) == 0)
+ if (GetMagickEncoderThreadSupport(magick_info) == MagickFalse)
LockSemaphoreInfo(magick_info->semaphore);
status=GetImageEncoder(magick_info)(write_info,image,exception);
- if ((thread_support & EncoderThreadSupport) == 0)
+ if (GetMagickEncoderThreadSupport(magick_info) == MagickFalse)
UnlockSemaphoreInfo(magick_info->semaphore);
}
else
write_info->magick,exception);
if (GetDelegateThreadSupport(delegate_info) == MagickFalse)
UnlockSemaphoreInfo(delegate_info->semaphore);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
}
else
{
(magick_info == (const MagickInfo *) NULL))
{
(void) CopyMagickString(write_info->magick,image->magick,
- MaxTextExtent);
+ MagickPathExtent);
magick_info=GetMagickInfo(write_info->magick,exception);
}
if ((magick_info == (const MagickInfo *) NULL) ||
(GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
{
char
- extension[MaxTextExtent];
+ extension[MagickPathExtent];
GetPathComponent(image->filename,ExtensionPath,extension);
if (*extension != '\0')
magick_info=GetMagickInfo(extension,exception);
else
magick_info=GetMagickInfo(image->magick,exception);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
}
if ((magick_info == (const MagickInfo *) NULL) ||
(GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
(GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
(void) ThrowMagickException(exception,GetMagickModule(),
MissingDelegateError,"NoEncodeDelegateForThisImageFormat",
- "`%s'",image->filename);
+ "`%s'",write_info->magick);
else
(void) ThrowMagickException(exception,GetMagickModule(),
MissingDelegateWarning,"NoEncodeDelegateForThisImageFormat",
- "`%s'",image->filename);
+ "`%s'",write_info->magick);
}
if ((magick_info != (const MagickInfo *) NULL) &&
(GetImageEncoder(magick_info) != (EncodeImageHandler *) NULL))
/*
Call appropriate image writer based on image type.
*/
- thread_support=GetMagickThreadSupport(magick_info);
- if ((thread_support & EncoderThreadSupport) == 0)
+ if (GetMagickEncoderThreadSupport(magick_info) == MagickFalse)
LockSemaphoreInfo(magick_info->semaphore);
status=GetImageEncoder(magick_info)(write_info,image,exception);
- if ((thread_support & EncoderThreadSupport) == 0)
+ if (GetMagickEncoderThreadSupport(magick_info) == MagickFalse)
UnlockSemaphoreInfo(magick_info->semaphore);
}
}
}
- if (GetBlobError(image) != MagickFalse)
- ThrowFileException(exception,FileOpenError,
- "AnErrorHasOccurredWritingToFile",image->filename);
if (temporary != MagickFalse)
{
/*
(void) CloseBlob(image);
(void) RelinquishUniqueFileResource(image->filename);
(void) CopyMagickString(image->filename,write_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
}
if ((LocaleCompare(write_info->magick,"info") != 0) &&
(write_info->verbose != MagickFalse))
{
#define WriteImageTag "Write/Image"
- BlobInfo
- *blob;
-
ExceptionInfo
*sans_exception;
*p;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
write_info=CloneImageInfo(image_info);
+ *write_info->magick='\0';
images=GetFirstImageInList(images);
- blob=CloneBlobInfo(images->blob); /* thread specific I/O handler */
- DestroyBlob(images);
- images->blob=blob;
if (filename != (const char *) NULL)
for (p=images; p != (Image *) NULL; p=GetNextImageInList(p))
- (void) CopyMagickString(p->filename,filename,MaxTextExtent);
- (void) CopyMagickString(write_info->filename,images->filename,MaxTextExtent);
- if (*write_info->magick == '\0')
- (void) CopyMagickString(write_info->magick,images->magick,MaxTextExtent);
+ (void) CopyMagickString(p->filename,filename,MagickPathExtent);
+ (void) CopyMagickString(write_info->filename,images->filename,MagickPathExtent);
sans_exception=AcquireExceptionInfo();
(void) SetImageInfo(write_info,(unsigned int) GetImageListLength(images),
sans_exception);
sans_exception=DestroyExceptionInfo(sans_exception);
+ if (*write_info->magick == '\0')
+ (void) CopyMagickString(write_info->magick,images->magick,MagickPathExtent);
p=images;
for ( ; GetNextImageInList(p) != (Image *) NULL; p=GetNextImageInList(p))
if (p->scene >= GetNextImageInList(p)->scene)
projects / imagemagick / blobdiff