From 51816569c8796e1dd7ab1690bebd542faae51204 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 12 Apr 2015 13:18:38 +0000 Subject: [PATCH] --- coders/pcl.c | 16 +++++++++------- coders/pdf.c | 9 ++++++--- coders/ps.c | 9 ++++++--- coders/svg.c | 4 +++- coders/xps.c | 13 ++++++++----- 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/coders/pcl.c b/coders/pcl.c index d978a4bd8..81163c145 100644 --- a/coders/pcl.c +++ b/coders/pcl.c @@ -152,10 +152,10 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) char command[MaxTextExtent], - density[MaxTextExtent], + *density, filename[MaxTextExtent], geometry[MaxTextExtent], - options[MaxTextExtent], + *options, input_filename[MaxTextExtent]; const char @@ -323,16 +323,16 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) delegate_info=GetDelegateInfo("pcl:color",(char *) NULL,exception); if (delegate_info == (const DelegateInfo *) NULL) return((Image *) NULL); - *options='\0'; if ((page.width == 0) || (page.height == 0)) (void) ParseAbsoluteGeometry(PSPageGeometry,&page); if (image_info->page != (char *) NULL) (void) ParseAbsoluteGeometry(image_info->page,&page); - (void) FormatLocaleString(density,MaxTextExtent,"%gx%g", - image->resolution.x,image->resolution.y); + density=AcquireString(""); + options=AcquireString(""); + (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",image->resolution.x, + image->resolution.y); page.width=(size_t) floor(page.width*image->resolution.x/delta.x+0.5); - page.height=(size_t) floor(page.height*image->resolution.y/delta.y+ - 0.5); + page.height=(size_t) floor(page.height*image->resolution.y/delta.y+0.5); (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double) page.width,(double) page.height); image=DestroyImage(image); @@ -362,6 +362,8 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) read_info->antialias != MagickFalse ? 4 : 1, read_info->antialias != MagickFalse ? 4 : 1,density,options, read_info->filename,input_filename); + options=DestroyString(options); + density=DestroyString(density); status=ExternalDelegateCommand(MagickFalse,read_info->verbose,command, (char *) NULL,exception) != 0 ? MagickTrue : MagickFalse; image=ReadImage(read_info,exception); diff --git a/coders/pdf.c b/coders/pdf.c index e94bc3273..7376bdaf0 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -381,12 +381,12 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) char command[MaxTextExtent], - density[MaxTextExtent], + *density, filename[MaxTextExtent], geometry[MaxTextExtent], input_filename[MaxTextExtent], message[MaxTextExtent], - options[MaxTextExtent], + *options, postscript_filename[MaxTextExtent]; const char @@ -705,7 +705,8 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) image=DestroyImage(image); return((Image *) NULL); } - *options='\0'; + density=AcquireString(""); + options=AcquireString(""); (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",image->resolution.x, image->resolution.y); if ((image_info->page != (char *) NULL) || (fitPage != MagickFalse)) @@ -749,6 +750,8 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) read_info->antialias != MagickFalse ? 4 : 1, read_info->antialias != MagickFalse ? 4 : 1,density,options,filename, postscript_filename,input_filename); + options=DestroyString(options); + density=DestroyString(density); *message='\0'; status=InvokePDFDelegate(read_info->verbose,command,message,exception); (void) RelinquishUniqueFileResource(postscript_filename); diff --git a/coders/ps.c b/coders/ps.c index 0fb50bf23..738569446 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -414,12 +414,12 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) char command[MaxTextExtent], - density[MaxTextExtent], + *density, filename[MaxTextExtent], geometry[MaxTextExtent], input_filename[MaxTextExtent], message[MaxTextExtent], - options[MaxTextExtent], + *options, postscript_filename[MaxTextExtent]; const char @@ -864,7 +864,8 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) image=DestroyImageList(image); return((Image *) NULL); } - *options='\0'; + density=AcquireString(""); + options=AcquireString(""); (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",resolution.x, resolution.y); (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double) @@ -902,6 +903,8 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) read_info->antialias != MagickFalse ? 4 : 1, read_info->antialias != MagickFalse ? 4 : 1,density,options,filename, postscript_filename,input_filename); + options=DestroyString(options); + density=DestroyString(density); *message='\0'; status=InvokePostscriptDelegate(read_info->verbose,command,message,exception); (void) InterpretImageFilename(image_info,image,filename,1, diff --git a/coders/svg.c b/coders/svg.c index 7db99cbe6..e9cb5aa3d 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -2819,7 +2819,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) char background[MaxTextExtent], command[MaxTextExtent], - density[MaxTextExtent], + *density, input_filename[MaxTextExtent], opacity[MaxTextExtent], output_filename[MaxTextExtent], @@ -2837,6 +2837,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) status=AcquireUniqueSymbolicLink(image->filename,input_filename); (void) AcquireUniqueFilename(output_filename); (void) AcquireUniqueFilename(unique); + density=AcquireString(""); (void) FormatLocaleString(density,MaxTextExtent,"%.20g,%.20g", image->resolution.x,image->resolution.y); (void) FormatLocaleString(background,MaxTextExtent, @@ -2849,6 +2850,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) FormatLocaleString(command,MaxTextExtent,GetDelegateCommands( delegate_info),input_filename,output_filename,density,background, opacity,unique); + density=DestroyString(density); status=ExternalDelegateCommand(MagickFalse,image_info->verbose, command,(char *) NULL,exception); (void) RelinquishUniqueFileResource(unique); diff --git a/coders/xps.c b/coders/xps.c index af6e89329..41ce5416f 100644 --- a/coders/xps.c +++ b/coders/xps.c @@ -106,10 +106,10 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) char command[MaxTextExtent], - density[MaxTextExtent], + *density, filename[MaxTextExtent], geometry[MaxTextExtent], - options[MaxTextExtent], + *options, input_filename[MaxTextExtent]; const char @@ -196,8 +196,6 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) if ((flags & SigmaValue) == 0) image->resolution.y=image->resolution.x; } - (void) FormatLocaleString(density,MaxTextExtent,"%gx%g", - image->resolution.x,image->resolution.y); /* Determine page geometry from the XPS media box. */ @@ -279,7 +277,10 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) delegate_info=GetDelegateInfo("xps:color",(char *) NULL,exception); if (delegate_info == (const DelegateInfo *) NULL) return((Image *) NULL); - *options='\0'; + density=AcquireString(""); + options=AcquireString(""); + (void) FormatLocaleString(density,MaxTextExtent,"%gx%g", + image->resolution.x,image->resolution.y); if ((page.width == 0) || (page.height == 0)) (void) ParseAbsoluteGeometry(PSPageGeometry,&page); if (image_info->page != (char *) NULL) @@ -315,6 +316,8 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) read_info->antialias != MagickFalse ? 4 : 1, read_info->antialias != MagickFalse ? 4 : 1,density,options, read_info->filename,input_filename); + options=DestroyString(options); + density=DestroyString(density); status=ExternalDelegateCommand(MagickFalse,read_info->verbose,command, (char *) NULL,exception) != 0 ? MagickTrue : MagickFalse; image=ReadImage(read_info,exception); -- 2.40.0