PointInfo
extent[4],
min,
- max,
- point;
+ max;
register ssize_t
i;
extent[3].y=(double) source->rows-1.0;
for (i=0; i < 4; i++)
{
+ PointInfo
+ point;
+
point=extent[i];
extent[i].x=point.x*affine->sx+point.y*affine->ry+affine->tx;
extent[i].y=point.x*affine->rx+point.y*affine->sy+affine->ty;
current;
char
- key[2*MagickPathExtent],
keyword[MagickPathExtent],
geometry[MagickPathExtent],
- name[MagickPathExtent],
pattern[MagickPathExtent],
*primitive,
*token;
}
if (LocaleCompare("pattern",token) == 0)
{
+ char
+ key[2*MagickPathExtent],
+ name[MagickPathExtent];
+
RectangleInfo
- bounds;
+ pattern_bounds;
GetMagickToken(q,&q,token);
(void) CopyMagickString(name,token,MagickPathExtent);
GetMagickToken(q,&q,token);
- bounds.x=(ssize_t) ceil(StringToDouble(token,(char **) NULL)-
- 0.5);
+ pattern_bounds.x=(ssize_t) ceil(StringToDouble(token,
+ (char **) NULL)-0.5);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- bounds.y=(ssize_t) ceil(StringToDouble(token,(char **) NULL)-
- 0.5);
+ pattern_bounds.y=(ssize_t) ceil(StringToDouble(token,
+ (char **) NULL)-0.5);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- bounds.width=(size_t) floor(StringToDouble(token,
+ pattern_bounds.width=(size_t) floor(StringToDouble(token,
(char **) NULL)+0.5);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- bounds.height=(size_t) floor(StringToDouble(token,
+ pattern_bounds.height=(size_t) floor(StringToDouble(token,
(char **) NULL)+0.5);
for (p=q; *q != '\0'; )
{
(void) CopyMagickString(token,p,(size_t) (q-p-4+1));
(void) FormatLocaleString(key,MagickPathExtent,"%s",name);
(void) SetImageArtifact(image,key,token);
- (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry",name);
+ (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry",
+ name);
(void) FormatLocaleString(geometry,MagickPathExtent,
- "%.20gx%.20g%+.20g%+.20g",(double) bounds.width,(double)
- bounds.height,(double) bounds.x,(double) bounds.y);
+ "%.20gx%.20g%+.20g%+.20g",(double)pattern_bounds.width,
+ (double)pattern_bounds.height,(double)pattern_bounds.x,
+ (double)pattern_bounds.y);
(void) SetImageArtifact(image,key,geometry);
GetMagickToken(q,&q,token);
break;
if (IsPoint(q) != MagickFalse)
{
const char
- *p;
+ *r;
- p=q;
- GetMagickToken(p,&p,token);
+ r=q;
+ GetMagickToken(r,&r,token);
if (*token == ',')
- GetMagickToken(p,&p,token);
+ GetMagickToken(r,&r,token);
for (x=0; IsPoint(token) != MagickFalse; x++)
{
- GetMagickToken(p,&p,token);
+ GetMagickToken(r,&r,token);
if (*token == ',')
- GetMagickToken(p,&p,token);
+ GetMagickToken(r,&r,token);
}
graphic_context[n]->dash_pattern=(double *)
AcquireQuantumMemory((size_t) (2UL*x+1UL),
register Quantum
*restrict q;
- register ssize_t
- x;
-
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
if (q == (Quantum *) NULL)
register Quantum
*restrict q;
- register ssize_t
- x;
-
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
if (q == (Quantum *) NULL)
register Quantum
*restrict q;
- register ssize_t
- x;
-
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
if (q == (Quantum *) NULL)
if (((x1 != 0L) && (x1 != (ssize_t) composite_image->columns)) ||
((y1 != 0L) && (y1 != (ssize_t) composite_image->rows)))
{
- char
- geometry[MagickPathExtent];
-
/*
Resize image.
*/
- (void) FormatLocaleString(geometry,MagickPathExtent,"%gx%g!",
- primitive_info[1].point.x,primitive_info[1].point.y);
+ (void) FormatLocaleString(composite_geometry,MagickPathExtent,
+ "%gx%g!",primitive_info[1].point.x,primitive_info[1].point.y);
composite_image->filter=image->filter;
- (void) TransformImage(&composite_image,(char *) NULL,geometry,
- exception);
+ (void) TransformImage(&composite_image,(char *) NULL,
+ composite_geometry,exception);
}
if (composite_image->alpha_trait == UndefinedPixelTrait)
(void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel,
}
case AlphaPixelChannel:
{
- double
- alpha;
-
if (pixel.alpha_trait == UndefinedPixelTrait)
return(1.0);
alpha=(double) (QuantumScale*pixel.alpha);
case 'z':
{
if (LocaleCompare(symbol,"z") == 0)
- {
- double
- depth;
-
- depth=(double) GetImageDepth(image,fx_info->exception);
- return(depth);
- }
+ return((double)GetImageDepth(image, fx_info->exception));
break;
}
default:
}
case '?':
{
- double
- gamma;
-
(void) CopyMagickString(subexpression,++p,MagickPathExtent);
q=subexpression;
p=StringToken(":",&q);
{
if (LocaleNCompare(expression,"rand",4) == 0)
{
- double
- alpha;
-
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_FxEvaluateSubexpression)
#endif
*next;
register ssize_t
- i;
+ n;
ssize_t
y;
/*
Morph single image.
*/
- for (i=1; i < (ssize_t) number_frames; i++)
+ for (n=1; n < (ssize_t) number_frames; n++)
{
morph_image=CloneImage(image,0,0,MagickTrue,exception);
if (morph_image == (Image *) NULL)
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,MorphImageTag,(MagickOffsetType) i,
+ proceed=SetImageProgress(image,MorphImageTag,(MagickOffsetType) n,
number_frames);
if (proceed == MagickFalse)
status=MagickFalse;
next=image;
for ( ; GetNextImageInList(next) != (Image *) NULL; next=GetNextImageInList(next))
{
- for (i=0; i < (ssize_t) number_frames; i++)
+ for (n=0; n < (ssize_t) number_frames; n++)
{
CacheView
*image_view,
*morph_view;
- beta=(double) (i+1.0)/(double) (number_frames+1.0);
+ beta=(double) (n+1.0)/(double) (number_frames+1.0);
alpha=1.0-beta;
morph_image=ResizeImage(next,(size_t) (alpha*next->columns+beta*
GetNextImageInList(next)->columns+0.5),(size_t) (alpha*next->rows+beta*
image_view=DestroyCacheView(image_view);
morph_image=DestroyImage(morph_image);
}
- if (i < (ssize_t) number_frames)
+ if (n < (ssize_t) number_frames)
break;
/*
Clone last frame in sequence.
mime=GetXMLTreeChild(mime_map,"mime");
while (mime != (XMLTreeInfo *) NULL)
{
- const char
- *attribute;
-
/*
Process mime element.
*/
offset;
register ssize_t
- i;
+ j;
ssize_t
y;
sizeof(*changes));
if (changes == (size_t *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
- for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++)
- changes[i]=0;
+ for (j=0; j < (ssize_t) GetOpenMPMaximumThreads(); j++)
+ changes[j]=0;
if ((method == ConvolveMorphology) && (kernel->width == 1))
{
morphology_image->type=image->type;
morphology_view=DestroyCacheView(morphology_view);
image_view=DestroyCacheView(image_view);
- for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++)
- changed+=changes[i];
+ for (j=0; j < (ssize_t) GetOpenMPMaximumThreads(); j++)
+ changed+=changes[j];
changes=(size_t *) RelinquishMagickMemory(changes);
return(status ? (ssize_t) changed : 0);
}
}
morphology_view=DestroyCacheView(morphology_view);
image_view=DestroyCacheView(image_view);
- for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++)
- changed+=changes[i];
+ for (j=0; j < (ssize_t) GetOpenMPMaximumThreads(); j++)
+ changed+=changes[j];
changes=(size_t *) RelinquishMagickMemory(changes);
return(status ? (ssize_t) changed : -1);
}
* users can see the results of the 'option:convolve:scale' option.
*/
if ( method == ConvolveMorphology || method == CorrelateMorphology ) {
- const char
- *artifact;
-
/* Get the bias value as it will be needed */
artifact = GetImageArtifact(image,"convolve:bias");
if ( artifact != (const char *) NULL) {
if (previous_profile != (const StringInfo *) NULL)
{
size_t
- length;
+ profile_length;
- length=GetStringInfoLength(profile);
+ profile_length=GetStringInfoLength(profile);
SetStringInfoLength(profile,GetStringInfoLength(profile)+
GetStringInfoLength(previous_profile));
(void) memmove(GetStringInfoDatum(profile)+
GetStringInfoLength(previous_profile),GetStringInfoDatum(profile),
- length);
+ profile_length);
(void) memcpy(GetStringInfoDatum(profile),
GetStringInfoDatum(previous_profile),
GetStringInfoLength(previous_profile));
ResetImageProfileIterator(image);
for (name=GetNextImageProfile(image); name != (const char *) NULL; )
{
- register unsigned char
- *p;
-
profile=GetImageProfile(image,name);
- p=GetStringInfoDatum(custom_profile);
if (LocaleCompare(name,"EXIF") == 0)
for (i=0; i < (ssize_t) GetStringInfoLength(profile); i+=65533L)
{
if (((LocaleCompare(name,"IPTC") == 0) ||
(LocaleCompare(name,"8BIM") == 0)) && (iptc == MagickFalse))
{
+ register unsigned char
+ *p;
+
size_t
roundup;
iptc=MagickTrue;
+ p=GetStringInfoDatum(custom_profile);
for (i=0; i < (ssize_t) GetStringInfoLength(profile); i+=65500L)
{
length=MagickMin(GetStringInfoLength(profile)-i,65500L);
*jpeg_image;
ImageInfo
- *jpeg_info;
+ *extent_info;
- jpeg_info=CloneImageInfo(image_info);
- jpeg_info->blob=NULL;
+ extent_info=CloneImageInfo(image_info);
+ extent_info->blob=NULL;
jpeg_image=CloneImage(image,0,0,MagickTrue,exception);
if (jpeg_image != (Image *) NULL)
{
/*
Search for compression quality that does not exceed image extent.
*/
- jpeg_info->quality=0;
+ extent_info->quality=0;
extent=(MagickSizeType) SiPrefixToDoubleInterval(option,100.0);
- (void) DeleteImageOption(jpeg_info,"jpeg:extent");
+ (void) DeleteImageOption(extent_info,"jpeg:extent");
(void) DeleteImageArtifact(jpeg_image,"jpeg:extent");
maximum=image->quality;
if (maximum < 2)
{
(void) AcquireUniqueFilename(jpeg_image->filename);
jpeg_image->quality=minimum+(maximum-minimum+1)/2;
- status=WriteJPEGImage(jpeg_info,jpeg_image,exception);
+ status=WriteJPEGImage(extent_info,jpeg_image,exception);
if (GetBlobSize(jpeg_image) <= extent)
minimum=jpeg_image->quality+1;
else
quality=(int) minimum-1;
jpeg_image=DestroyImage(jpeg_image);
}
- jpeg_info=DestroyImageInfo(jpeg_info);
+ extent_info=DestroyImageInfo(extent_info);
}
jpeg_set_quality(&jpeg_info,quality,TRUE);
#if (JPEG_LIB_VERSION >= 70)
if ((has_merged_image == MagickFalse) && (GetImageListLength(image) == 1) &&
(length != 0))
{
- MagickStatusType
- status;
-
SeekBlob(image,offset,SEEK_SET);
status=ReadPSDLayers(image,image_info,&psd_info,MagickFalse,exception);
if (status != MagickTrue)
else
{
size_t
- length;
+ layer_length;
- length=strlen(property);
- layer_info_size+=8+length+(4-(length % 4));
+ layer_length=strlen(property);
+ layer_info_size+=8+layer_length+(4-(layer_length % 4));
}
layer_count++;
next_image=GetNextImageInList(next_image);
else
{
size_t
- length;
+ label_length;
- length=strlen(property);
- (void) WriteBlobMSBLong(image,(unsigned int) (length+(4-
- (length % 4))+8));
+ label_length=strlen(property);
+ (void) WriteBlobMSBLong(image,(unsigned int) (label_length+(4-
+ (label_length % 4))+8));
(void) WriteBlobMSBLong(image,0);
(void) WriteBlobMSBLong(image,0);
WritePascalString(image,property,4);
projects / imagemagick / commitdiff