% July 1992 %
% %
% %
-% Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2011 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 %
#include "wand/studio.h"
#include "wand/MagickWand.h"
#include "wand/mogrify-private.h"
+#include "magick/string-private.h"
\f
/*
Typedef declarations.
GravityType
gravity;
- long
+ ssize_t
stegano;
RectangleInfo
case ModulateCompositeOp:
case ThresholdCompositeOp:
(void) SetImageArtifact(composite_image,"compose:args",
- composite_options->compose_args);
+ composite_options->compose_args);
break;
default:
break;
else
if (composite_options->tile != MagickFalse)
{
- long
+ ssize_t
x,
y;
- unsigned long
+ size_t
columns;
/*
(void) SetImageArtifact(composite_image,"compose:outside-overlay",
"false");
columns=composite_image->columns;
- for (y=0; y < (long) (*image)->rows; y+=composite_image->rows)
- for (x=0; x < (long) (*image)->columns; x+=columns)
+ for (y=0; y < (ssize_t) (*image)->rows; y+=(ssize_t) composite_image->rows)
+ for (x=0; x < (ssize_t) (*image)->columns; x+=(ssize_t) columns)
status&=CompositeImageChannel(*image,
composite_options->channel,composite_options->compose,
composite_image,x,y);
"-scene value image scene number",
"-seed value seed a new sequence of pseudo-random numbers",
"-size geometry width and height of image",
+ "-synchronize synchronize image to storage device",
+ "-taint declare the image as modified",
"-transparent-color color",
" transparent color",
"-treedepth value color tree depth",
};
- (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL));
- (void) printf("Copyright: %s\n\n",GetMagickCopyright());
+ (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
+ (void) printf("Copyright: %s\n",GetMagickCopyright());
+ (void) printf("Features: %s\n\n",GetMagickFeatures());
(void) printf("Usage: %s [options ...] image [options ...] composite\n"
" [ [options ...] mask ] [options ...] composite\n",
GetClientName());
{ \
RelinquishCompositeOptions(&composite_options); \
DestroyImageStack(); \
- for (i=0; i < (long) argc; i++) \
+ for (i=0; i < (ssize_t) argc; i++) \
argv[i]=DestroyString(argv[i]); \
argv=(char **) RelinquishMagickMemory(argv); \
}
MagickStatusType
status;
- long
+ ssize_t
j,
k;
- register long
+ register ssize_t
i;
/*
(LocaleCompare("-version",option+1) == 0))
{
(void) fprintf(stdout,"Version: %s\n",
- GetMagickVersion((unsigned long *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n\n",GetMagickCopyright());
+ GetMagickVersion((size_t *) NULL));
+ (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
if (argc < 4)
- {
- (void) CompositeUsage();
- return(MagickTrue);
- }
+ return(CompositeUsage());
GetCompositeOptions(&composite_options);
filename=(char *) NULL;
format="%w,%h,%m";
if (status == MagickFalse)
ThrowCompositeException(ResourceLimitError,"MemoryAllocationFailed",
GetExceptionMessage(errno));
- for (i=1; i < (long) (argc-1); i++)
+ for (i=1; i < (ssize_t) (argc-1); i++)
{
option=argv[i];
if (LocaleCompare(option,"(") == 0)
*/
FireImageStack(MagickFalse,MagickFalse,pend);
filename=argv[i];
- if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+ if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
filename=argv[++i];
(void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
images=ReadImages(image_info,exception);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
}
if (LocaleCompare("alpha",option+1) == 0)
{
- long
+ ssize_t
type;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
type=ParseMagickOption(MagickAlphaOptions,MagickFalse,argv[i]);
if (type < 0)
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
}
if (LocaleCompare("channel",option+1) == 0)
{
- long
+ ssize_t
channel;
if (*option == '+')
break;
}
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
channel=ParseChannelOption(argv[i]);
if (channel < 0)
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
}
if (LocaleCompare("colorspace",option+1) == 0)
{
- long
+ ssize_t
colorspace;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
colorspace=ParseMagickOption(MagickColorspaceOptions,
MagickFalse,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (LocaleCompare("compose",option+1) == 0)
{
- long
+ ssize_t
compose;
composite_options.compose=UndefinedCompositeOp;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
compose=ParseMagickOption(MagickComposeOptions,MagickFalse,
argv[i]);
}
if (LocaleCompare("compress",option+1) == 0)
{
- long
+ ssize_t
compress;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
argv[i]);
"UnrecognizedImageCompression",argv[i]);
break;
}
+ if (LocaleCompare("concurrent",option+1) == 0)
+ break;
ThrowCompositeException(OptionError,"UnrecognizedOption",option)
}
case 'd':
{
if (LocaleCompare("debug",option+1) == 0)
{
- long
+ ssize_t
event;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
if (event < 0)
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (LocaleCompare("define",option+1) == 0)
{
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (*option == '+')
{
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (LocaleCompare("dispose",option+1) == 0)
{
- long
+ ssize_t
dispose;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,argv[i]);
if (dispose < 0)
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
composite_options.compose=DistortCompositeOp;
break;
}
- if (LocaleCompare("method",option+1) == 0)
+ if (LocaleCompare("dither",option+1) == 0)
{
- long
+ ssize_t
method;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
method=ParseMagickOption(MagickDitherOptions,MagickFalse,argv[i]);
if (method < 0)
argv[i]);
break;
}
+ if (LocaleCompare("duration",option+1) == 0)
+ {
+ if (*option == '+')
+ break;
+ i++;
+ if (i == (ssize_t) (argc-1))
+ ThrowCompositeException(OptionError,"MissingArgument",option);
+ if (IsGeometry(argv[i]) == MagickFalse)
+ ThrowCompositeInvalidArgumentException(option,argv[i]);
+ break;
+ }
ThrowCompositeException(OptionError,"UnrecognizedOption",option)
}
case 'e':
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (LocaleCompare("endian",option+1) == 0)
{
- long
+ ssize_t
endian;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
endian=ParseMagickOption(MagickEndianOptions,MagickFalse,
argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
{
if (LocaleCompare("filter",option+1) == 0)
{
- long
+ ssize_t
filter;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
filter=ParseMagickOption(MagickFilterOptions,MagickFalse,argv[i]);
if (filter < 0)
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
format=argv[i];
break;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
}
if (LocaleCompare("gravity",option+1) == 0)
{
- long
+ ssize_t
gravity;
composite_options.gravity=UndefinedGravity;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,
argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
break;
if (LocaleCompare("interlace",option+1) == 0)
{
- long
+ ssize_t
interlace;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
argv[i]);
}
if (LocaleCompare("interpolate",option+1) == 0)
{
- long
+ ssize_t
interpolate;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
double
value;
- long
+ ssize_t
resource;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
argv[i]);
ThrowCompositeException(OptionError,"UnrecognizedResourceType",
argv[i]);
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
value=strtod(argv[i],&p);
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
}
if (LocaleCompare("list",option+1) == 0)
{
- long
+ ssize_t
list;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
if (list < 0)
ThrowCompositeException(OptionError,"UnrecognizedListType",
argv[i]);
- (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+ status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
argv+j,exception);
DestroyComposite();
- return(MagickTrue);
+ return(status != 0 ? MagickFalse : MagickTrue);
}
if (LocaleCompare("log",option+1) == 0)
{
if (*option == '+')
break;
i++;
- if ((i == (long) argc) || (strchr(argv[i],'%') == (char *) NULL))
+ if ((i == (ssize_t) argc) || (strchr(argv[i],'%') == (char *) NULL))
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (LocaleCompare("profile",option+1) == 0)
{
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
}
if (LocaleCompare("quantize",option+1) == 0)
{
- long
+ ssize_t
colorspace;
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
colorspace=ParseMagickOption(MagickColorspaceOptions,
MagickFalse,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (LocaleCompare("rotate",option+1) == 0)
{
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (LocaleCompare("sharpen",option+1) == 0)
{
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
- composite_options.stegano=atol(argv[i])+1;
+ composite_options.stegano=(ssize_t) StringToLong(argv[i])+1;
break;
}
if (LocaleCompare("stereo",option+1) == 0)
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
break;
}
+ if (LocaleCompare("synchronize",option+1) == 0)
+ break;
ThrowCompositeException(OptionError,"UnrecognizedOption",option)
}
case 't':
{
+ if (LocaleCompare("taint",option+1) == 0)
+ break;
if (LocaleCompare("thumbnail",option+1) == 0)
{
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) (argc-1))
+ if (i == (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
}
if (LocaleCompare("type",option+1) == 0)
{
- long
+ ssize_t
type;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
type=ParseMagickOption(MagickTypeOptions,MagickFalse,argv[i]);
if (type < 0)
{
if (LocaleCompare("units",option+1) == 0)
{
- long
+ ssize_t
units;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
units=ParseMagickOption(MagickResolutionOptions,MagickFalse,
argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
(LocaleCompare("-version",option+1) == 0))
{
(void) fprintf(stdout,"Version: %s\n",
- GetMagickVersion((unsigned long *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n\n",GetMagickCopyright());
+ GetMagickVersion((size_t *) NULL));
+ (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
{
- long
+ ssize_t
method;
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (*option == '+')
break;
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowCompositeInvalidArgumentException(option,argv[i]);
if (LocaleCompare("write",option+1) == 0)
{
i++;
- if (i == (long) argc)
+ if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
break;
}
}
if (k != 0)
ThrowCompositeException(OptionError,"UnbalancedParenthesis",argv[i]);
- if (i-- != (long) (argc-1))
+ if (i-- != (ssize_t) (argc-1))
ThrowCompositeException(OptionError,"MissingAnImageFilename",argv[i]);
if ((image == (Image *) NULL) || (GetImageListLength(image) < 2))
ThrowCompositeException(OptionError,"MissingAnImageFilename",argv[argc-1]);
FinalizeImageSettings(image_info,image,MagickTrue);
+ if ((image == (Image *) NULL) || (GetImageListLength(image) < 2))
+ ThrowCompositeException(OptionError,"MissingAnImageFilename",argv[argc-1]);
/*
Composite images.
*/
projects / imagemagick / blobdiff