% May 2001 %
% %
% %
-% Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2010 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 %
#define MagickCoderFilename "coder.xml"
\f
/*
- Static declarations.
+ Typedef declarations.
*/
typedef struct _CoderMapInfo
{
*magick,
*name;
} CoderMapInfo;
-
+\f
+/*
+ Static declarations.
+*/
static const CoderMapInfo
CoderMap[] =
{
{ "APP1JPEG", "META" },
{ "APP1", "META" },
{ "ARW", "DNG" },
+ { "AVI", "MPEG" },
{ "BIE", "JBIG" },
{ "BMP2", "BMP" },
{ "BMP3", "BMP" },
{ "B", "RAW" },
{ "BRF", "BRAILLE" },
{ "BGR", "RGB" },
+ { "BGRA", "RGB" },
{ "BRG", "RGB" },
{ "CMYKA", "CMYK" },
{ "C", "RAW" },
{ "JBG", "JBIG" },
{ "JNG", "PNG" },
{ "JPC", "JP2" },
+ { "J2C", "JP2" },
{ "JPG", "JPEG" },
{ "JPX", "JP2" },
{ "K", "RAW" },
{ "PNG32", "PNG" },
{ "PNG8", "PNG" },
{ "PPM", "PNM" },
+ { "PSB", "PSD" },
{ "PTIF", "TIFF" },
{ "RADIAL-GRADIENT", "GRADIENT" },
{ "RAF", "DNG" },
{ "XTRNSTREAM", "XTRN" },
{ "XV", "VIFF" },
{ "Y", "RAW" },
- { "YCbCrA", "YCbCr" },
- { (const char *) NULL, (const char *) NULL }
+ { "YCbCrA", "YCbCr" }
};
static SemaphoreInfo
% %
% %
% %
-+ D e s t r o y C o d e r C o m p o n e n t %
++ C o d e r C o m p o n e n t G e n e s i s %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% DestroyCoderComponent() destroys the coder component.
+% CoderComponentGenesis() instantiates the coder component.
%
-% The format of the DestroyCoderComponent method is:
+% The format of the CoderComponentGenesis method is:
%
-% DestroyCoderComponent(void)
+% MagickBooleanType CoderComponentGenesis(void)
%
*/
-MagickExport void DestroyCoderComponent(void)
+MagickExport MagickBooleanType CoderComponentGenesis(void)
{
AcquireSemaphoreInfo(&coder_semaphore);
+ return(MagickTrue);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ C o d e r C o m p o n e n t T e r m i n u s %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% CoderComponentTerminus() destroys the coder component.
+%
+% The format of the CoderComponentTerminus method is:
+%
+% CoderComponentTerminus(void)
+%
+*/
+MagickExport void CoderComponentTerminus(void)
+{
+ if (coder_semaphore == (SemaphoreInfo *) NULL)
+ AcquireSemaphoreInfo(&coder_semaphore);
+ LockSemaphoreInfo(coder_semaphore);
if (coder_list != (SplayTreeInfo *) NULL)
coder_list=DestroySplayTree(coder_list);
instantiate_coder=MagickFalse;
- RelinquishSemaphoreInfo(coder_semaphore);
+ UnlockSemaphoreInfo(coder_semaphore);
DestroySemaphoreInfo(&coder_semaphore);
}
\f
% The format of the GetCoderInfoList function is:
%
% const CoderInfo **GetCoderInfoList(const char *pattern,
-% unsigned long *number_coders,ExceptionInfo *exception)
+% size_t *number_coders,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
}
MagickExport const CoderInfo **GetCoderInfoList(const char *pattern,
- unsigned long *number_coders,ExceptionInfo *exception)
+ size_t *number_coders,ExceptionInfo *exception)
{
const CoderInfo
**coder_map;
register const CoderInfo
*p;
- register long
+ register ssize_t
i;
/*
*/
assert(pattern != (char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern);
- assert(number_coders != (unsigned long *) NULL);
+ assert(number_coders != (size_t *) NULL);
*number_coders=0;
p=GetCoderInfo("*",exception);
if (p == (const CoderInfo *) NULL)
/*
Generate coder list.
*/
- AcquireSemaphoreInfo(&coder_semaphore);
+ LockSemaphoreInfo(coder_semaphore);
ResetSplayTreeIterator(coder_list);
p=(const CoderInfo *) GetNextValueInSplayTree(coder_list);
for (i=0; p != (const CoderInfo *) NULL; )
coder_map[i++]=p;
p=(const CoderInfo *) GetNextValueInSplayTree(coder_list);
}
- RelinquishSemaphoreInfo(coder_semaphore);
+ UnlockSemaphoreInfo(coder_semaphore);
qsort((void *) coder_map,(size_t) i,sizeof(*coder_map),CoderInfoCompare);
coder_map[i]=(CoderInfo *) NULL;
- *number_coders=(unsigned long) i;
+ *number_coders=(size_t) i;
return(coder_map);
}
\f
%
% The format of the GetCoderList function is:
%
-% char **GetCoderList(const char *pattern,unsigned long *number_coders,
+% char **GetCoderList(const char *pattern,size_t *number_coders,
% ExceptionInfo *exception)
%
% A description of each parameter follows:
}
MagickExport char **GetCoderList(const char *pattern,
- unsigned long *number_coders,ExceptionInfo *exception)
+ size_t *number_coders,ExceptionInfo *exception)
{
char
**coder_map;
register const CoderInfo
*p;
- register long
+ register ssize_t
i;
/*
*/
assert(pattern != (char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern);
- assert(number_coders != (unsigned long *) NULL);
+ assert(number_coders != (size_t *) NULL);
*number_coders=0;
p=GetCoderInfo("*",exception);
if (p == (const CoderInfo *) NULL)
/*
Generate coder list.
*/
- AcquireSemaphoreInfo(&coder_semaphore);
+ LockSemaphoreInfo(coder_semaphore);
ResetSplayTreeIterator(coder_list);
p=(const CoderInfo *) GetNextValueInSplayTree(coder_list);
for (i=0; p != (const CoderInfo *) NULL; )
coder_map[i++]=ConstantString(p->name);
p=(const CoderInfo *) GetNextValueInSplayTree(coder_list);
}
- RelinquishSemaphoreInfo(coder_semaphore);
+ UnlockSemaphoreInfo(coder_semaphore);
qsort((void *) coder_map,(size_t) i,sizeof(*coder_map),CoderCompare);
coder_map[i]=(char *) NULL;
- *number_coders=(unsigned long) i;
+ *number_coders=(size_t) i;
return(coder_map);
}
\f
if ((coder_list == (SplayTreeInfo *) NULL) &&
(instantiate_coder == MagickFalse))
{
- AcquireSemaphoreInfo(&coder_semaphore);
+ if (coder_semaphore == (SemaphoreInfo *) NULL)
+ AcquireSemaphoreInfo(&coder_semaphore);
+ LockSemaphoreInfo(coder_semaphore);
if ((coder_list == (SplayTreeInfo *) NULL) &&
(instantiate_coder == MagickFalse))
{
(void) LoadCoderLists(MagickCoderFilename,exception);
instantiate_coder=MagickTrue;
}
- RelinquishSemaphoreInfo(coder_semaphore);
+ UnlockSemaphoreInfo(coder_semaphore);
}
return(coder_list != (SplayTreeInfo *) NULL ? MagickTrue : MagickFalse);
}
% %
% %
% %
-+ I n s t a n t i a t e C o d e r C o m p o n e n t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% InstantiateCoderComponent() instantiates the coder component.
-%
-% The format of the InstantiateCoderComponent method is:
-%
-% MagickBooleanType InstantiateCoderComponent(void)
-%
-*/
-MagickExport MagickBooleanType InstantiateCoderComponent(void)
-{
- AcquireSemaphoreInfo(&coder_semaphore);
- RelinquishSemaphoreInfo(coder_semaphore);
- return(MagickTrue);
-}
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% L i s t C o d e r I n f o %
% %
% %
const CoderInfo
**coder_info;
- long
+ ssize_t
j;
- register long
+ register ssize_t
i;
- unsigned long
+ size_t
number_coders;
if (file == (const FILE *) NULL)
if (coder_info == (const CoderInfo **) NULL)
return(MagickFalse);
path=(const char *) NULL;
- for (i=0; i < (long) number_coders; i++)
+ for (i=0; i < (ssize_t) number_coders; i++)
{
if (coder_info[i]->stealth != MagickFalse)
continue;
}
path=coder_info[i]->path;
(void) fprintf(file,"%s",coder_info[i]->magick);
- for (j=(long) strlen(coder_info[i]->magick); j <= 11; j++)
+ for (j=(ssize_t) strlen(coder_info[i]->magick); j <= 11; j++)
(void) fprintf(file," ");
if (coder_info[i]->name != (char *) NULL)
(void) fprintf(file,"%s",coder_info[i]->name);
% The format of the LoadCoderList coder is:
%
% MagickBooleanType LoadCoderList(const char *xml,const char *filename,
-% const unsigned long depth,ExceptionInfo *exception)
+% const size_t depth,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
}
static MagickBooleanType LoadCoderList(const char *xml,const char *filename,
- const unsigned long depth,ExceptionInfo *exception)
+ const size_t depth,ExceptionInfo *exception)
{
char
keyword[MaxTextExtent],
/*
Coder element.
*/
- coder_info=(CoderInfo *) AcquireMagickMemory(sizeof(*coder_info));
+ coder_info=(CoderInfo *) AcquireAlignedMemory(1,sizeof(*coder_info));
if (coder_info == (CoderInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
(void) ResetMagickMemory(coder_info,0,sizeof(*coder_info));
MagickStatusType
status;
- register const CoderMapInfo
- *p;
+ register ssize_t
+ i;
/*
Load built-in coder map.
return(MagickFalse);
}
}
- for (p=CoderMap; p->magick != (const char *) NULL; p++)
+ for (i=0; i < (ssize_t) (sizeof(CoderMap)/sizeof(*CoderMap)); i++)
{
CoderInfo
*coder_info;
- coder_info=(CoderInfo *) AcquireMagickMemory(sizeof(*coder_info));
+ register const CoderMapInfo
+ *p;
+
+ p=CoderMap+i;
+ coder_info=(CoderInfo *) AcquireAlignedMemory(1,sizeof(*coder_info));
if (coder_info == (CoderInfo *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
projects / imagemagick / blobdiff