% July 1992 %
% %
% %
-% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2012 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 "MagickWand/MagickWand.h"
#include "MagickWand/mogrify-private.h"
#include "MagickCore/display-private.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/string-private.h"
#include "MagickCore/xwindow-private.h"
\f
"-borderwidth, -font, -foreground, -iconGeometry, -iconic, -mattecolor,\n");
(void) printf("-name, -shared-memory, -usePixmap, or -title.\n");
(void) printf(
- "\nBy default, the image format of `file' is determined by its magic\n");
+ "\nBy default, the image format of 'file' is determined by its magic\n");
(void) printf(
"number. To specify a particular image format, precede the filename\n");
(void) printf(
}
#define ThrowDisplayException(asperity,tag,option) \
{ \
- (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \
+ (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \
option); \
DestroyDisplay(); \
return(MagickFalse); \
#define ThrowDisplayInvalidArgumentException(option,argument) \
{ \
(void) ThrowMagickException(exception,GetMagickModule(),OptionError, \
- "InvalidArgument","`%s': %s",option,argument); \
+ "InvalidArgument","'%s': %s",option,argument); \
DestroyDisplay(); \
return(MagickFalse); \
}
image_info->quality=StringToUnsignedLong(resource_value);
resource_value=XGetResourceInstance(resource_database,GetClientName(),
"verbose","False");
- image_info->verbose=IsMagickTrue(resource_value);
+ image_info->verbose=IsStringTrue(resource_value);
resource_value=XGetResourceInstance(resource_database,GetClientName(),
"dither","True");
- quantize_info->dither=IsMagickTrue(resource_value);
+ quantize_info->dither=IsStringTrue(resource_value);
/*
Parse command line.
*/
Image
*display_image,
+ *image_list,
*images;
/*
iterations=0;
if (i == (ssize_t) (argc-1))
iterations=image->iterations;
- display_image=CloneImageList(image,exception);
- if (display_image == (Image *) NULL)
+ image_list=CloneImageList(image,exception);
+ if (image_list == (Image *) NULL)
ThrowDisplayException(ResourceLimitError,"MemoryAllocationFailed",
GetExceptionMessage(errno));
+ display_image=image_list;
do
{
/*
*/
(void) CopyMagickString(display_image->filename,
resource_info.write_filename,MaxTextExtent);
- (void) SetImageInfo(image_info,1,&display_image->exception);
- status&=WriteImage(image_info,display_image,
- &display_image->exception);
- GetImageException(display_image,exception);
+ (void) SetImageInfo(image_info,1,exception);
+ status&=WriteImage(image_info,display_image,exception);
}
/*
Proceed to next/previous image.
/*
Free image resources.
*/
+ display_image=GetFirstImageInList(display_image);
+ if (image_list != display_image)
+ image_list=DestroyImageList(image_list);
display_image=DestroyImageList(display_image);
if ((state & FormerImageState) == 0)
{
i++;
if (i == (ssize_t) argc)
ThrowDisplayException(OptionError,"MissingArgument",option);
- value=InterpretLocaleValue(argv[i],&p);
+ value=StringToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowDisplayInvalidArgumentException(option,argv[i]);
i++;
if (i == (ssize_t) argc)
ThrowDisplayException(OptionError,"MissingArgument",option);
- if (InterpretLocaleValue(argv[i],(char **) NULL) != 0)
+ if (StringToDouble(argv[i],(char **) NULL) != 0)
resource_info.window_group=argv[i];
break;
}
(void) argc;
(void) argv;
(void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError,
- "DelegateLibrarySupportNotBuiltIn","`%s' (X11)",image_info->filename);
+ "DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image_info->filename);
return(DisplayUsage());
#endif
}