#include "magick/utility.h"
#include "magick/version.h"
#if defined(MAGICKCORE_LCMS_DELEGATE)
-#if defined(MAGICKCORE_HAVE_LCMS_LCMS_H)
+#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H)
+#include <lcms/lcms2.h>
+#elif defined(MAGICKCORE_HAVE_LCMS2_H)
+#include "lcms2.h"
+#elif defined(MAGICKCORE_HAVE_LCMS_LCMS_H)
#include <lcms/lcms.h>
#else
#include "lcms.h"
#endif
#endif
\f
+/*
+ Define declarations.
+*/
+#if defined(MAGICKCORE_LCMS_DELEGATE)
+#if defined(LCMS_VERSION) && (LCMS_VERSION < 2000)
+#define cmsUInt32Number DWORD
+#endif
+#endif
+\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
*/
static int PrintChannelFeatures(FILE *file,const ChannelType channel,
- const char *name,const double scale,const ChannelFeatures *channel_features)
+ const char *name,const ChannelFeatures *channel_features)
{
+#define PrintFeature(feature) \
+ GetMagickPrecision(),(feature)[0], \
+ GetMagickPrecision(),(feature)[1], \
+ GetMagickPrecision(),(feature)[2], \
+ GetMagickPrecision(),(feature)[3], \
+ GetMagickPrecision(),((feature)[0]+(feature)[1]+(feature)[2]+(feature)[3])/4.0 \
+
#define FeaturesFormat " %s:\n" \
" Angular Second Moment:\n" \
- " %g, %g, %g, %g\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
" Contrast:\n" \
- " %g, %g, %g, %g\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
" Correlation:\n" \
- " %g, %g, %g, %g\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Sum of Squares: Variance:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Inverse Difference Moment:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Sum Average:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Sum Variance:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Sum Entropy:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Entropy:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Difference Variance:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Difference Entropy:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Information Measure of Correlation 1:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Information Measure of Correlation 2:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n" \
+ " Maximum Correlation Coefficient:\n" \
+ " %.*g, %.*g, %.*g, %.*g, %.*g\n"
int
status;
status=fprintf(file,FeaturesFormat,name,
- channel_features[channel].angular_second_moment[0],
- channel_features[channel].angular_second_moment[1],
- channel_features[channel].angular_second_moment[2],
- channel_features[channel].angular_second_moment[3],
- channel_features[channel].contrast[0],
- channel_features[channel].contrast[1],
- channel_features[channel].contrast[2],
- channel_features[channel].contrast[3],
- channel_features[channel].correlation[0],
- channel_features[channel].correlation[1],
- channel_features[channel].correlation[2],
- channel_features[channel].correlation[3]);
+ PrintFeature(channel_features[channel].angular_second_moment),
+ PrintFeature(channel_features[channel].contrast),
+ PrintFeature(channel_features[channel].correlation),
+ PrintFeature(channel_features[channel].variance_sum_of_squares),
+ PrintFeature(channel_features[channel].inverse_difference_moment),
+ PrintFeature(channel_features[channel].sum_average),
+ PrintFeature(channel_features[channel].sum_variance),
+ PrintFeature(channel_features[channel].sum_entropy),
+ PrintFeature(channel_features[channel].entropy),
+ PrintFeature(channel_features[channel].difference_variance),
+ PrintFeature(channel_features[channel].difference_entropy),
+ PrintFeature(channel_features[channel].measure_of_correlation_1),
+ PrintFeature(channel_features[channel].measure_of_correlation_2),
+ PrintFeature(channel_features[channel].maximum_correlation_coefficient));
return(status);
}
" mean: %g (%g)\n standard deviation: %g (%g)\n" \
" kurtosis: %g\n skewness: %g\n"
- double
- maxima,
- mean,
- minima;
-
int
status;
- minima=channel_statistics[channel].minima;
- maxima=channel_statistics[channel].maxima;
- mean=channel_statistics[channel].mean;
if (channel == AlphaChannel)
{
- minima=QuantumRange-minima;
- maxima=QuantumRange-maxima;
- mean=QuantumRange-mean;
+ status=fprintf(file,StatisticsFormat,name,ClampToQuantum(scale*
+ (QuantumRange-channel_statistics[channel].maxima)),
+ (QuantumRange-channel_statistics[channel].maxima)/(double) QuantumRange,
+ ClampToQuantum(scale*(QuantumRange-channel_statistics[channel].minima)),
+ (QuantumRange-channel_statistics[channel].minima)/(double) QuantumRange,
+ scale*(QuantumRange-channel_statistics[channel].mean),(QuantumRange-
+ channel_statistics[channel].mean)/(double) QuantumRange,scale*
+ channel_statistics[channel].standard_deviation,
+ channel_statistics[channel].standard_deviation/(double) QuantumRange,
+ channel_statistics[channel].kurtosis,
+ channel_statistics[channel].skewness);
+ return(status);
}
- status=fprintf(file,StatisticsFormat,name,(Quantum) (scale*minima),minima/
- (double) QuantumRange,(Quantum) (maxima/scale),maxima/(double) QuantumRange,
- scale*mean,mean/(double) QuantumRange,
- scale*channel_statistics[channel].standard_deviation,
- channel_statistics[channel].standard_deviation/(double)
- QuantumRange,channel_statistics[channel].kurtosis,
- channel_statistics[channel].skewness);
+ status=fprintf(file,StatisticsFormat,name,ClampToQuantum(scale*
+ channel_statistics[channel].minima),channel_statistics[channel].minima/
+ (double) QuantumRange,ClampToQuantum(scale*
+ channel_statistics[channel].maxima),channel_statistics[channel].maxima/
+ (double) QuantumRange,scale*channel_statistics[channel].mean,
+ channel_statistics[channel].mean/(double) QuantumRange,scale*
+ channel_statistics[channel].standard_deviation,
+ channel_statistics[channel].standard_deviation/(double) QuantumRange,
+ channel_statistics[channel].kurtosis,channel_statistics[channel].skewness);
return(status);
}
ImageType
type;
- long
+ ssize_t
y;
MagickBooleanType
ping;
- register long
+ register ssize_t
i,
x;
- unsigned long
+ size_t
distance,
scale;
if (LocaleCompare(image->magick_filename,image->filename) != 0)
(void) fprintf(file,"%s=>",image->magick_filename);
if ((GetPreviousImageInList(image) == (Image *) NULL) &&
- (GetNextImageInList(image) == (Image *) NULL) && (image->scene == 0))
+ (GetNextImageInList(image) == (Image *) NULL) &&
+ (image->scene == 0))
(void) fprintf(file,"%s ",image->filename);
else
- (void) fprintf(file,"%s[%lu] ",image->filename,image->scene);
+ (void) fprintf(file,"%s[%.20g] ",image->filename,(double) image->scene);
(void) fprintf(file,"%s ",image->magick);
if ((image->magick_columns != 0) || (image->magick_rows != 0))
if ((image->magick_columns != image->columns) ||
(image->magick_rows != image->rows))
- (void) fprintf(file,"%lux%lu=>",image->magick_columns,
- image->magick_rows);
- (void) fprintf(file,"%lux%lu ",image->columns,image->rows);
+ (void) fprintf(file,"%.20gx%.20g=>",(double) image->magick_columns,
+ (double) image->magick_rows);
+ (void) fprintf(file,"%.20gx%.20g ",(double) image->columns,(double)
+ image->rows);
if ((image->page.width != 0) || (image->page.height != 0) ||
(image->page.x != 0) || (image->page.y != 0))
- (void) fprintf(file,"%lux%lu%+ld%+ld ",image->page.width,
- image->page.height,image->page.x,image->page.y);
- (void) fprintf(file,"%lu-bit ",image->depth);
+ (void) fprintf(file,"%.20gx%.20g%+.20g%+.20g ",(double)
+ image->page.width,(double) image->page.height,(double) image->page.x,
+ (double) image->page.y);
+ (void) fprintf(file,"%.20g-bit ",(double) image->depth);
if (image->type != UndefinedType)
(void) fprintf(file,"%s ",MagickOptionToMnemonic(MagickTypeOptions,
- (long) image->type));
+ (ssize_t) image->type));
if (image->storage_class == DirectClass)
{
(void) fprintf(file,"DirectClass ");
}
else
if (image->total_colors <= image->colors)
- (void) fprintf(file,"PseudoClass %luc ",image->colors);
+ (void) fprintf(file,"PseudoClass %.20gc ",(double) image->colors);
else
- (void) fprintf(file,"PseudoClass %lu=>%luc ",image->total_colors,
- image->colors);
+ (void) fprintf(file,"PseudoClass %.20g=>%.20gc ",(double)
+ image->total_colors,(double) image->colors);
if (image->error.mean_error_per_pixel != 0.0)
- (void) fprintf(file,"%ld/%f/%fdb ",(long)
+ (void) fprintf(file,"%.20g/%f/%fdb ",(double)
(image->error.mean_error_per_pixel+0.5),
image->error.normalized_mean_error,
image->error.normalized_maximum_error);
if (GetBlobSize(image) != 0)
{
(void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
- (void) fprintf(file,"%s ",format);
+ (void) fprintf(file,"%sB ",format);
}
- (void) fprintf(file,"%0.3fu %ld:%02ld.%03ld",user_time,(long)
- (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
- (long) (1000.0*(elapsed_time-floor(elapsed_time))));
+ (void) fprintf(file,"%0.3fu %lu:%02lu.%03lu",user_time,(unsigned long)
+ (elapsed_time/60.0),(unsigned long) floor(fmod(elapsed_time,60.0)),
+ (unsigned long) (1000.0*(elapsed_time-floor(elapsed_time))));
(void) fprintf(file,"\n");
(void) fflush(file);
return(ferror(file) != 0 ? MagickFalse : MagickTrue);
(void) fprintf(file," Format: %s (%s)\n",image->magick,
GetMagickDescription(magick_info));
(void) fprintf(file," Class: %s\n",MagickOptionToMnemonic(MagickClassOptions,
- (long) image->storage_class));
- (void) fprintf(file," Geometry: %lux%lu%+ld%+ld\n",image->columns,
- image->rows,image->tile_offset.x,image->tile_offset.y);
+ (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)
+ image->tile_offset.y);
if ((image->magick_columns != 0) || (image->magick_rows != 0))
if ((image->magick_columns != image->columns) ||
(image->magick_rows != image->rows))
- (void) fprintf(file," Base geometry: %lux%lu\n",image->magick_columns,
- image->magick_rows);
+ (void) fprintf(file," Base geometry: %.20gx%.20g\n",(double)
+ image->magick_columns,(double) image->magick_rows);
if ((image->x_resolution != 0.0) && (image->y_resolution != 0.0))
{
(void) fprintf(file," Resolution: %gx%g\n",image->x_resolution,
image->x_resolution,(double) image->rows/image->y_resolution);
}
(void) fprintf(file," Units: %s\n",MagickOptionToMnemonic(
- MagickResolutionOptions,(long) image->units));
+ MagickResolutionOptions,(ssize_t) image->units));
(void) fprintf(file," Type: %s\n",MagickOptionToMnemonic(MagickTypeOptions,
- (long) type));
+ (ssize_t) type));
if (image->type != UndefinedType)
(void) fprintf(file," Base type: %s\n",MagickOptionToMnemonic(
- MagickTypeOptions,(long) image->type));
+ MagickTypeOptions,(ssize_t) image->type));
(void) fprintf(file," Endianess: %s\n",MagickOptionToMnemonic(
- MagickEndianOptions,(long) image->endian));
+ MagickEndianOptions,(ssize_t) image->endian));
/*
Detail channel depth and extrema.
*/
(void) fprintf(file," Colorspace: %s\n",MagickOptionToMnemonic(
- MagickColorspaceOptions,(long) image->colorspace));
+ MagickColorspaceOptions,(ssize_t) image->colorspace));
channel_statistics=(ChannelStatistics *) NULL;
+ channel_features=(ChannelFeatures *) NULL;
+ colorspace=image->colorspace;
if (ping == MagickFalse)
- channel_statistics=GetImageChannelStatistics(image,&image->exception);
- if (channel_statistics != (ChannelStatistics *) NULL)
{
- unsigned long
+ size_t
depth;
+ channel_statistics=GetImageChannelStatistics(image,&image->exception);
+ artifact=GetImageArtifact(image,"identify:features");
+ if (artifact != (const char *) NULL)
+ {
+ distance=StringToUnsignedLong(artifact);
+ channel_features=GetImageChannelFeatures(image,distance,
+ &image->exception);
+ }
depth=GetImageDepth(image,&image->exception);
if (image->depth == depth)
- (void) fprintf(file," Depth: %lu-bit\n",image->depth);
+ (void) fprintf(file," Depth: %.20g-bit\n",(double) image->depth);
else
- (void) fprintf(file," Depth: %lu/%lu-bit\n",image->depth,depth);
+ (void) fprintf(file," Depth: %.20g/%.20g-bit\n",(double)
+ image->depth,(double) depth);
(void) fprintf(file," Channel depth:\n");
- colorspace=image->colorspace;
if (IsGrayImage(image,&image->exception) != MagickFalse)
colorspace=GRAYColorspace;
switch (colorspace)
case RGBColorspace:
default:
{
- (void) fprintf(file," red: %lu-bit\n",
+ (void) fprintf(file," red: %.20g-bit\n",(double)
channel_statistics[RedChannel].depth);
- (void) fprintf(file," green: %lu-bit\n",
+ (void) fprintf(file," green: %.20g-bit\n",(double)
channel_statistics[GreenChannel].depth);
- (void) fprintf(file," blue: %lu-bit\n",
+ (void) fprintf(file," blue: %.20g-bit\n",(double)
channel_statistics[BlueChannel].depth);
- if (image->matte != MagickFalse)
- (void) fprintf(file," alpha: %lu-bit\n",
- channel_statistics[OpacityChannel].depth);
break;
}
case CMYKColorspace:
{
- (void) fprintf(file," cyan: %lu-bit\n",
+ (void) fprintf(file," cyan: %.20g-bit\n",(double)
channel_statistics[CyanChannel].depth);
- (void) fprintf(file," magenta: %lu-bit\n",
+ (void) fprintf(file," magenta: %.20g-bit\n",(double)
channel_statistics[MagentaChannel].depth);
- (void) fprintf(file," yellow: %lu-bit\n",
+ (void) fprintf(file," yellow: %.20g-bit\n",(double)
channel_statistics[YellowChannel].depth);
- (void) fprintf(file," black: %lu-bit\n",
+ (void) fprintf(file," black: %.20g-bit\n",(double)
channel_statistics[BlackChannel].depth);
- if (image->matte != MagickFalse)
- (void) fprintf(file," alpha: %lu-bit\n",
- channel_statistics[OpacityChannel].depth);
break;
}
case GRAYColorspace:
{
- (void) fprintf(file," gray: %lu-bit\n",
+ (void) fprintf(file," gray: %.20g-bit\n",(double)
channel_statistics[GrayChannel].depth);
- if (image->matte != MagickFalse)
- (void) fprintf(file," alpha: %lu-bit\n",
- channel_statistics[OpacityChannel].depth);
break;
}
}
+ if (image->matte != MagickFalse)
+ (void) fprintf(file," alpha: %.20g-bit\n",(double)
+ channel_statistics[OpacityChannel].depth);
scale=1;
if (image->depth <= MAGICKCORE_QUANTUM_DEPTH)
- scale=QuantumRange/((unsigned long) QuantumRange >> ((unsigned long)
+ scale=QuantumRange/((size_t) QuantumRange >> ((size_t)
MAGICKCORE_QUANTUM_DEPTH-image->depth));
+ }
+ if (channel_statistics != (ChannelStatistics *) NULL)
+ {
(void) fprintf(file," Channel statistics:\n");
switch (colorspace)
{
channel_statistics=(ChannelStatistics *) RelinquishMagickMemory(
channel_statistics);
}
- channel_features=(ChannelFeatures *) NULL;
- artifact=GetImageArtifact(image,"identify:features");
- if ((ping == MagickFalse) && (artifact != (const char *) NULL))
- {
- distance=StringToUnsignedLong(artifact);
- channel_features=GetImageChannelFeatures(image,distance,
- &image->exception);
- }
if (channel_features != (ChannelFeatures *) NULL)
{
- (void) fprintf(file," Channel features (horizontal, vertical, left and right diagonals):\n");
+ (void) fprintf(file," Channel features (horizontal, vertical, left and right diagonals, average):\n");
switch (colorspace)
{
case RGBColorspace:
default:
{
- (void) PrintChannelFeatures(file,RedChannel,"Red",1.0/scale,
- channel_features);
- (void) PrintChannelFeatures(file,GreenChannel,"Green",1.0/scale,
- channel_features);
- (void) PrintChannelFeatures(file,BlueChannel,"Blue",1.0/scale,
+ (void) PrintChannelFeatures(file,RedChannel,"Red",channel_features);
+ (void) PrintChannelFeatures(file,GreenChannel,"Green",
channel_features);
+ (void) PrintChannelFeatures(file,BlueChannel,"Blue",channel_features);
break;
}
case CMYKColorspace:
{
- (void) PrintChannelFeatures(file,CyanChannel,"Cyan",1.0/scale,
+ (void) PrintChannelFeatures(file,CyanChannel,"Cyan",channel_features);
+ (void) PrintChannelFeatures(file,MagentaChannel,"Magenta",
channel_features);
- (void) PrintChannelFeatures(file,MagentaChannel,"Magenta",1.0/
- scale,channel_features);
- (void) PrintChannelFeatures(file,YellowChannel,"Yellow",1.0/scale,
+ (void) PrintChannelFeatures(file,YellowChannel,"Yellow",
channel_features);
- (void) PrintChannelFeatures(file,BlackChannel,"Black",1.0/scale,
+ (void) PrintChannelFeatures(file,BlackChannel,"Black",
channel_features);
break;
}
case GRAYColorspace:
{
- (void) PrintChannelFeatures(file,GrayChannel,"Gray",1.0/scale,
- channel_features);
+ (void) PrintChannelFeatures(file,GrayChannel,"Gray",channel_features);
break;
}
}
if (image->matte != MagickFalse)
- (void) PrintChannelFeatures(file,AlphaChannel,"Alpha",1.0/scale,
- channel_features);
- if (colorspace != GRAYColorspace)
- {
- (void) fprintf(file," Image features:\n");
- (void) PrintChannelFeatures(file,AllChannels,"Overall",1.0/scale,
- channel_features);
- }
+ (void) PrintChannelFeatures(file,AlphaChannel,"Alpha",channel_features);
channel_features=(ChannelFeatures *) RelinquishMagickMemory(
channel_features);
}
p=(PixelPacket *) NULL;
indexes=(IndexPacket *) NULL;
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
if (p == (const PixelPacket *) NULL)
break;
indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
if (p->opacity == (Quantum) TransparentOpacity)
break;
p++;
}
- if (x < (long) image->columns)
+ if (x < (ssize_t) image->columns)
break;
}
- if ((x < (long) image->columns) || (y < (long) image->rows))
+ if ((x < (ssize_t) image->columns) || (y < (ssize_t) image->rows))
{
char
tuple[MaxTextExtent];
(void) fprintf(file," %s\n",tuple);
}
}
- artifact=GetImageArtifact(image,"identify:unique");
+ artifact=GetImageArtifact(image,"identify:unique-colors");
if ((artifact != (const char *) NULL) &&
(IsMagickTrue(artifact) != MagickFalse))
- (void) fprintf(file," Colors: %lu\n",GetNumberColors(image,
- (FILE *) NULL,&image->exception));
+ (void) fprintf(file," Colors: %.20g\n",(double)
+ GetNumberColors(image,(FILE *) NULL,&image->exception));
if (IsHistogramImage(image,&image->exception) != MagickFalse)
{
(void) fprintf(file," Histogram:\n");
}
if (image->storage_class == PseudoClass)
{
- (void) fprintf(file," Colormap: %lu\n",image->colors);
+ (void) fprintf(file," Colormap: %.20g\n",(double) image->colors);
if (image->colors <= 1024)
{
char
GetMagickPixelPacket(image,&pixel);
p=image->colormap;
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < (ssize_t) image->colors; i++)
{
SetMagickPixelPacket(image,p,(IndexPacket *) NULL,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
if (pixel.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,OpacityChannel,X11Compliance,
+ ConcatenateColorComponent(&pixel,AlphaChannel,X11Compliance,
tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
(void) QueryMagickColorname(image,&pixel,SVGCompliance,color,
&image->exception);
GetColorTuple(&pixel,MagickTrue,hex);
- (void) fprintf(file," %8ld: %s %s %s\n",i,tuple,hex,color);
+ (void) fprintf(file," %8ld: %s %s %s\n",(long) i,tuple,hex,color);
p++;
}
}
(void) fprintf(file," Normalized maximum error: %g\n",
image->error.normalized_maximum_error);
(void) fprintf(file," Rendering intent: %s\n",MagickOptionToMnemonic(
- MagickIntentOptions,(long) image->rendering_intent));
+ MagickIntentOptions,(ssize_t) image->rendering_intent));
if (image->gamma != 0.0)
(void) fprintf(file," Gamma: %g\n",image->gamma);
if ((image->chromaticity.red_primary.x != 0.0) ||
image->chromaticity.white_point.x,image->chromaticity.white_point.y);
}
if ((image->extract_info.width*image->extract_info.height) != 0)
- (void) fprintf(file," Tile geometry: %lux%lu%+ld%+ld\n",
- image->extract_info.width,image->extract_info.height,
- image->extract_info.x,image->extract_info.y);
+ (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(
- MagickInterlaceOptions,(long) image->interlace));
+ MagickInterlaceOptions,(ssize_t) image->interlace));
(void) QueryColorname(image,&image->background_color,SVGCompliance,color,
&image->exception);
(void) fprintf(file," Background color: %s\n",color);
&image->exception);
(void) fprintf(file," Transparent color: %s\n",color);
(void) fprintf(file," Compose: %s\n",MagickOptionToMnemonic(
- MagickComposeOptions,(long) image->compose));
+ MagickComposeOptions,(ssize_t) image->compose));
if ((image->page.width != 0) || (image->page.height != 0) ||
(image->page.x != 0) || (image->page.y != 0))
- (void) fprintf(file," Page geometry: %lux%lu%+ld%+ld\n",image->page.width,
- image->page.height,image->page.x,image->page.y);
+ (void) fprintf(file," Page geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
+ 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: %+ld%+ld\n",image->page.x,
- image->page.y);
+ (void) fprintf(file," Origin geometry: %+.20g%+.20g\n",(double)
+ image->page.x,(double) image->page.y);
(void) fprintf(file," Dispose: %s\n",MagickOptionToMnemonic(
- MagickDisposeOptions,(long) image->dispose));
+ MagickDisposeOptions,(ssize_t) image->dispose));
if (image->delay != 0)
- (void) fprintf(file," Delay: %lux%ld\n",image->delay,
- image->ticks_per_second);
+ (void) fprintf(file," Delay: %.20gx%.20g\n",(double) image->delay,
+ (double) image->ticks_per_second);
if (image->iterations != 1)
- (void) fprintf(file," Iterations: %lu\n",image->iterations);
+ (void) fprintf(file," Iterations: %.20g\n",(double) image->iterations);
if ((image->next != (Image *) NULL) || (image->previous != (Image *) NULL))
- (void) fprintf(file," Scene: %lu of %lu\n",image->scene,
- GetImageListLength(image));
+ (void) fprintf(file," Scene: %.20g of %.20g\n",(double) image->scene,
+ (double) GetImageListLength(image));
else
if (image->scene != 0)
- (void) fprintf(file," Scene: %lu\n",image->scene);
+ (void) fprintf(file," Scene: %.20g\n",(double) image->scene);
(void) fprintf(file," Compression: %s\n",MagickOptionToMnemonic(
- MagickCompressOptions,(long) image->compression));
+ MagickCompressOptions,(ssize_t) image->compression));
if (image->quality != UndefinedCompressionQuality)
- (void) fprintf(file," Quality: %lu\n",image->quality);
+ (void) fprintf(file," Quality: %.20g\n",(double) image->quality);
(void) fprintf(file," Orientation: %s\n",MagickOptionToMnemonic(
- MagickOrientationOptions,(long) image->orientation));
+ MagickOrientationOptions,(ssize_t) image->orientation));
if (image->montage != (char *) NULL)
(void) fprintf(file," Montage: %s\n",image->montage);
if (image->directory != (char *) NULL)
(void) fprintf(file,"\n");
continue;
}
- (void) fprintf(file," %lux%lu %s\n",tile->magick_columns,
- tile->magick_rows,tile->magick);
+ (void) fprintf(file," %.20gx%.20g %s\n",(double) tile->magick_columns,
+ (double) tile->magick_rows,tile->magick);
(void) SignatureImage(tile);
ResetImagePropertyIterator(tile);
property=GetNextImageProperty(tile);
(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);
profile=GetImageProfile(image,name);
if (profile == (StringInfo *) NULL)
continue;
- (void) fprintf(file," Profile-%s: %lu bytes\n",name,(unsigned long)
+ (void) fprintf(file," Profile-%s: %.20g bytes\n",name,(double)
GetStringInfoLength(profile));
#if defined(MAGICKCORE_LCMS_DELEGATE)
if ((LocaleCompare(name,"icc") == 0) ||
icc_profile;
icc_profile=cmsOpenProfileFromMem(GetStringInfoDatum(profile),
- (DWORD) GetStringInfoLength(profile));
+ (cmsUInt32Number) GetStringInfoLength(profile));
if (icc_profile != (cmsHPROFILE *) NULL)
{
+#if defined(LCMS_VERSION) && (LCMS_VERSION < 2000)
const char
*name;
name=cmsTakeProductName(icc_profile);
if (name != (const char *) NULL)
(void) fprintf(file," %s\n",name);
+#else
+ char
+ info[MaxTextExtent];
+
+ (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,
+ "en","US",info,MaxTextExtent);
+ (void) fprintf(file," Description: %s\n",info);
+ (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoManufacturer,
+ "en","US",info,MaxTextExtent);
+ (void) fprintf(file," Manufacturer: %s\n",info);
+ (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoModel,"en",
+ "US",info,MaxTextExtent);
+ (void) fprintf(file," Model: %s\n",info);
+ (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoCopyright,
+ "en","US",info,MaxTextExtent);
+ (void) fprintf(file," Copyright: %s\n",info);
+#endif
(void) cmsCloseProfile(icc_profile);
}
}
record,
sentinel;
- register long
+ register ssize_t
j;
size_t
profile_length;
profile_length=GetStringInfoLength(profile);
- for (i=0; i < (long) profile_length; i+=(long) length)
+ for (i=0; i < (ssize_t) profile_length; i+=(ssize_t) length)
{
length=1;
sentinel=GetStringInfoDatum(profile)[i++];
case 219: tag="Custom Field 20"; break;
default: tag="unknown"; break;
}
- (void) fprintf(file," %s[%ld,%ld]: ",tag,dataset,record);
+ (void) fprintf(file," %s[%.20g,%.20g]: ",tag,(double)
+ dataset,(double) record);
length=(size_t) (GetStringInfoDatum(profile)[i++] << 8);
length|=GetStringInfoDatum(profile)[i++];
attribute=(char *) NULL;
(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)
}
}
(void) fprintf(file," Tainted: %s\n",MagickOptionToMnemonic(
- MagickBooleanOptions,(long) image->taint));
+ MagickBooleanOptions,(ssize_t) image->taint));
(void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
- (void) fprintf(file," Filesize: %s\n",format);
+ (void) fprintf(file," Filesize: %sB\n",format);
(void) FormatMagickSize((MagickSizeType) image->columns*image->rows,
MagickFalse,format);
(void) fprintf(file," Number pixels: %s\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: %ld:%02ld.%03ld\n",(long)
- (elapsed_time/60.0),(long) ceil(fmod(elapsed_time,60.0)),(long)
- (1000.0*(elapsed_time-floor(elapsed_time))));
- (void) fprintf(file," Version: %s\n",GetMagickVersion((unsigned long *)
+ (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));
(void) fflush(file);
return(ferror(file) != 0 ? MagickFalse : MagickTrue);
projects / imagemagick / blobdiff