ImageType
type;
- ssize_t
- y;
-
MagickBooleanType
ping;
distance,
scale;
+ ssize_t
+ y;
+
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(double) image->page.y);
(void) fprintf(file,"%.20g-bit ",(double) image->depth);
if (image->type != UndefinedType)
- (void) fprintf(file,"%s ",MagickOptionToMnemonic(MagickTypeOptions,
+ (void) fprintf(file,"%s ",CommandOptionToMnemonic(MagickTypeOptions,
(ssize_t) image->type));
if (image->storage_class == DirectClass)
{
if (GetBlobSize(image) != 0)
{
(void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
- (void) fprintf(file,"%sB ",format);
+ (void) fprintf(file,"%s ",format);
}
(void) fprintf(file,"%0.3fu %lu:%02lu.%03lu",user_time,(unsigned long)
(elapsed_time/60.0),(unsigned long) floor(fmod(elapsed_time,60.0)),
else
(void) fprintf(file," Format: %s (%s)\n",image->magick,
GetMagickDescription(magick_info));
- (void) fprintf(file," Class: %s\n",MagickOptionToMnemonic(MagickClassOptions,
+ (void) fprintf(file," Class: %s\n",CommandOptionToMnemonic(MagickClassOptions,
(ssize_t) image->storage_class));
(void) fprintf(file," Geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
image->columns,(double) image->rows,(double) image->tile_offset.x,(double)
(void) fprintf(file," Print size: %gx%g\n",(double) image->columns/
image->x_resolution,(double) image->rows/image->y_resolution);
}
- (void) fprintf(file," Units: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Units: %s\n",CommandOptionToMnemonic(
MagickResolutionOptions,(ssize_t) image->units));
- (void) fprintf(file," Type: %s\n",MagickOptionToMnemonic(MagickTypeOptions,
+ (void) fprintf(file," Type: %s\n",CommandOptionToMnemonic(MagickTypeOptions,
(ssize_t) type));
if (image->type != UndefinedType)
- (void) fprintf(file," Base type: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Base type: %s\n",CommandOptionToMnemonic(
MagickTypeOptions,(ssize_t) image->type));
- (void) fprintf(file," Endianess: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Endianess: %s\n",CommandOptionToMnemonic(
MagickEndianOptions,(ssize_t) image->endian));
/*
Detail channel depth and extrema.
*/
- (void) fprintf(file," Colorspace: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Colorspace: %s\n",CommandOptionToMnemonic(
MagickColorspaceOptions,(ssize_t) image->colorspace));
channel_statistics=(ChannelStatistics *) NULL;
channel_features=(ChannelFeatures *) NULL;
if (colorspace != GRAYColorspace)
{
(void) fprintf(file," Image statistics:\n");
- (void) PrintChannelStatistics(file,AllChannels,"Overall",1.0/scale,
+ (void) PrintChannelStatistics(file,CompositeChannels,"Overall",1.0/scale,
channel_statistics);
}
channel_statistics=(ChannelStatistics *) RelinquishMagickMemory(
indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (p->opacity == (Quantum) TransparentOpacity)
+ if (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity)
break;
p++;
}
if (image->error.normalized_maximum_error != 0.0)
(void) fprintf(file," Normalized maximum error: %g\n",
image->error.normalized_maximum_error);
- (void) fprintf(file," Rendering intent: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Rendering intent: %s\n",CommandOptionToMnemonic(
MagickIntentOptions,(ssize_t) image->rendering_intent));
if (image->gamma != 0.0)
(void) fprintf(file," Gamma: %g\n",image->gamma);
(void) fprintf(file," Tile geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
image->extract_info.width,(double) image->extract_info.height,(double)
image->extract_info.x,(double) image->extract_info.y);
- (void) fprintf(file," Interlace: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Interlace: %s\n",CommandOptionToMnemonic(
MagickInterlaceOptions,(ssize_t) image->interlace));
(void) QueryColorname(image,&image->background_color,SVGCompliance,color,
&image->exception);
(void) QueryColorname(image,&image->transparent_color,SVGCompliance,color,
&image->exception);
(void) fprintf(file," Transparent color: %s\n",color);
- (void) fprintf(file," Compose: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Compose: %s\n",CommandOptionToMnemonic(
MagickComposeOptions,(ssize_t) image->compose));
if ((image->page.width != 0) || (image->page.height != 0) ||
(image->page.x != 0) || (image->page.y != 0))
image->page.width,(double) image->page.height,(double)
image->page.x,(double) image->page.y);
if ((image->page.x != 0) || (image->page.y != 0))
- (void) fprintf(file," Origin geometry: %+.20gx%+.20g\n",(double)
+ (void) fprintf(file," Origin geometry: %+.20g%+.20g\n",(double)
image->page.x,(double) image->page.y);
- (void) fprintf(file," Dispose: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Dispose: %s\n",CommandOptionToMnemonic(
MagickDisposeOptions,(ssize_t) image->dispose));
if (image->delay != 0)
(void) fprintf(file," Delay: %.20gx%.20g\n",(double) image->delay,
else
if (image->scene != 0)
(void) fprintf(file," Scene: %.20g\n",(double) image->scene);
- (void) fprintf(file," Compression: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Compression: %s\n",CommandOptionToMnemonic(
MagickCompressOptions,(ssize_t) image->compression));
if (image->quality != UndefinedCompressionQuality)
(void) fprintf(file," Quality: %.20g\n",(double) image->quality);
- (void) fprintf(file," Orientation: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Orientation: %s\n",CommandOptionToMnemonic(
MagickOrientationOptions,(ssize_t) image->orientation));
if (image->montage != (char *) NULL)
(void) fprintf(file," Montage: %s\n",image->montage);
(void) fprintf(file," Properties:\n");
while (property != (const char *) NULL)
{
- (void) fprintf(file," %c",*property);
- if (strlen(property) > 1)
- (void) fprintf(file,"%s: ",property+1);
- if (strlen(property) > 80)
- (void) fputc('\n',file);
+ (void) fprintf(file," %s: ",property);
value=GetImageProperty(image,property);
if (value != (const char *) NULL)
(void) fprintf(file,"%s\n",value);
(void) fprintf(file," Artifacts:\n");
while (artifact != (const char *) NULL)
{
- (void) fprintf(file," %c",*artifact);
- if (strlen(artifact) > 1)
- (void) fprintf(file,"%s: ",artifact+1);
- if (strlen(artifact) > 80)
- (void) fputc('\n',file);
+ (void) fprintf(file," %s: ",artifact);
value=GetImageArtifact(image,artifact);
if (value != (const char *) NULL)
(void) fprintf(file,"%s\n",value);
(void) fprintf(file," Registry:\n");
while (registry != (const char *) NULL)
{
- (void) fprintf(file," %c",*registry);
- if (strlen(registry) > 1)
- (void) fprintf(file,"%s: ",registry+1);
- if (strlen(registry) > 80)
- (void) fputc('\n',file);
+ (void) fprintf(file," %s: ",registry);
value=(const char *) GetImageRegistry(StringRegistryType,registry,
&image->exception);
if (value != (const char *) NULL)
registry=GetNextImageRegistry();
}
}
- (void) fprintf(file," Tainted: %s\n",MagickOptionToMnemonic(
+ (void) fprintf(file," Tainted: %s\n",CommandOptionToMnemonic(
MagickBooleanOptions,(ssize_t) image->taint));
(void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
(void) fprintf(file," Filesize: %sB\n",format);
elapsed_time+0.5),MagickFalse,format);
(void) fprintf(file," Pixels per second: %s\n",format);
(void) fprintf(file," User time: %0.3fu\n",user_time);
- (void) fprintf(file," Elapsed time: %lu:%02lu.%03lu\n",(unsigned long)
- ceil(elapsed_time/60.0),(unsigned long) ceil(fmod(elapsed_time,60.0)),
+ (void) fprintf(file," Elapsed time: %lu:%02lu.%03lu\n",(unsigned long)
+ (elapsed_time/60.0),(unsigned long) ceil(fmod(elapsed_time,60.0)),
(unsigned long) (1000.0*(elapsed_time-floor(elapsed_time))));
(void) fprintf(file," Version: %s\n",GetMagickVersion((size_t *)
NULL));