Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > b0202108aaa53fc5834cfeb063e09c6d > files > 2

imagemagick-6.6.6.10-5.3.mga1.src.rpm

diff -p -up ImageMagick-6.4.8-9/magick/animate.c~ ImageMagick-6.4.8-9/magick/animate.c
--- ImageMagick-6.4.8-9/magick/animate.c~	2009-01-03 18:04:03.000000000 +0100
+++ ImageMagick-6.4.8-9/magick/animate.c	2009-01-28 16:33:30.000000000 +0100
@@ -2919,9 +2919,9 @@ static MagickBooleanType XSaveImage(Disp
       /*
         Request page geometry from user.
       */
-      (void) FormatMagickString(geometry,MaxTextExtent,PSPageGeometry);
+      (void) FormatMagickString(geometry,MaxTextExtent,"%s", PSPageGeometry);
       if (LocaleCompare(image_info->magick,"PDF") == 0)
-        (void) FormatMagickString(geometry,MaxTextExtent,PSPageGeometry);
+        (void) FormatMagickString(geometry,MaxTextExtent,"%s", PSPageGeometry);
       if (image_info->page != (char *) NULL)
         (void) CopyMagickString(geometry,image_info->page,MaxTextExtent);
       XListBrowserWidget(display,windows,&windows->widget,PageSizes,"Select",
diff -p -up ImageMagick-6.4.8-9/magick/deprecate.c~ ImageMagick-6.4.8-9/magick/deprecate.c
--- ImageMagick-6.4.8-9/magick/deprecate.c~	2009-01-10 14:41:38.000000000 +0100
+++ ImageMagick-6.4.8-9/magick/deprecate.c	2009-01-28 16:34:54.000000000 +0100
@@ -1874,7 +1874,7 @@ MagickExport void *GetConfigureBlob(cons
     *blob;
 
   assert(filename != (const char *) NULL);
-  (void) LogMagickEvent(TraceEvent,GetMagickModule(),filename);
+  (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", filename);
   (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
   assert(path != (char *) NULL);
   assert(length != (size_t *) NULL);
@@ -3608,7 +3608,7 @@ MagickExport MagickBooleanType MagickMon
     status;
 
   assert(text != (const char *) NULL);
-  (void) LogMagickEvent(TraceEvent,GetMagickModule(),text);
+  (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", text);
   ProcessPendingEvents(text);
   status=MagickTrue;
   exception=AcquireExceptionInfo();
diff -p -up ImageMagick-6.4.8-9/magick/display.c~ ImageMagick-6.4.8-9/magick/display.c
--- ImageMagick-6.4.8-9/magick/display.c~	2009-01-18 20:16:52.000000000 +0100
+++ ImageMagick-6.4.8-9/magick/display.c	2009-01-28 16:35:23.000000000 +0100
@@ -12387,9 +12387,9 @@ static MagickBooleanType XSaveImage(Disp
       /*
         Request page geometry from user.
       */
-      (void) FormatMagickString(geometry,MaxTextExtent,PSPageGeometry);
+      (void) FormatMagickString(geometry,MaxTextExtent,"%s", PSPageGeometry);
       if (LocaleCompare(image_info->magick,"PDF") == 0)
-        (void) FormatMagickString(geometry,MaxTextExtent,PSPageGeometry);
+        (void) FormatMagickString(geometry,MaxTextExtent,"%s", PSPageGeometry);
       if (image_info->page != (char *) NULL)
         (void) CopyMagickString(geometry,image_info->page,MaxTextExtent);
       XListBrowserWidget(display,windows,&windows->widget,PageSizes,"Select",
diff -p -up ImageMagick-6.4.8-9/magick/quantize.c~ ImageMagick-6.4.8-9/magick/quantize.c
--- ImageMagick-6.4.8-9/magick/quantize.c~	2009-01-22 15:42:07.000000000 +0100
+++ ImageMagick-6.4.8-9/magick/quantize.c	2009-01-28 16:37:09.000000000 +0100
@@ -887,7 +887,7 @@ static MagickBooleanType ClassifyImageCo
             node_info->child[id]=GetNodeInfo(cube_info,id,level,node_info);
             if (node_info->child[id] == (NodeInfo *) NULL)
               (void) ThrowMagickException(exception,GetMagickModule(),
-                ResourceLimitError,"MemoryAllocationFailed",image->filename);
+                ResourceLimitError,"MemoryAllocationFailed","%s", image->filename);
             if (level == cube_info->depth)
               cube_info->colors++;
           }
diff -p -up ImageMagick-6.4.8-9/magick/registry.c~ ImageMagick-6.4.8-9/magick/registry.c
--- ImageMagick-6.4.8-9/magick/registry.c~	2008-11-25 19:00:48.000000000 +0100
+++ ImageMagick-6.4.8-9/magick/registry.c	2009-01-28 16:38:06.000000000 +0100
@@ -450,7 +450,7 @@ MagickExport MagickBooleanType SetImageR
       if (image->signature != MagickSignature)
         {
           (void) ThrowMagickException(exception,GetMagickModule(),RegistryError,
-            "UnableToSetRegistry",key);
+            "UnableToSetRegistry","%s", key);
           return(MagickFalse);
         }
       clone_value=(void *) CloneImageList(image,exception);
@@ -465,7 +465,7 @@ MagickExport MagickBooleanType SetImageR
       if (image_info->signature != MagickSignature)
         {
           (void) ThrowMagickException(exception,GetMagickModule(),RegistryError,
-            "UnableToSetRegistry",key);
+            "UnableToSetRegistry","%s", key);
           return(MagickFalse);
         }
       clone_value=(void *) CloneImageInfo(image_info);
diff -p -up ImageMagick-6.4.8-9/magick/transform.c~ ImageMagick-6.4.8-9/magick/transform.c
--- ImageMagick-6.4.8-9/magick/transform.c~	2009-01-15 06:52:32.000000000 +0100
+++ ImageMagick-6.4.8-9/magick/transform.c	2009-01-28 16:38:56.000000000 +0100
@@ -1643,7 +1643,7 @@ MagickExport MagickBooleanType Transform
   assert(image != (Image **) NULL);
   assert((*image)->signature == MagickSignature);
   if ((*image)->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),(*image)->filename);
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (*image)->filename);
   transform_image=(*image);
   if (crop_geometry != (const char *) NULL)
     {
@@ -1793,7 +1793,7 @@ MagickExport MagickBooleanType Transform
   assert(images != (Image **) NULL);
   assert((*images)->signature == MagickSignature);
   if ((*images)->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),(*images)->filename);
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (*images)->filename);
   image_list=ImageListToArray(*images,&(*images)->exception);
   if (image_list == (Image **) NULL)
     return(MagickFalse);
diff -p -up ImageMagick-6.4.8-9/wand/drawing-wand.c~ ImageMagick-6.4.8-9/wand/drawing-wand.c
--- ImageMagick-6.4.8-9/wand/drawing-wand.c~	2008-12-16 02:25:28.000000000 +0100
+++ ImageMagick-6.4.8-9/wand/drawing-wand.c	2009-01-28 16:40:07.000000000 +0100
@@ -4286,7 +4286,7 @@ WandExport MagickBooleanType DrawSetClip
   const char *clip_mask)
 {
   if (wand->debug != MagickFalse)
-    (void) LogMagickEvent(WandEvent,GetMagickModule(),clip_mask);
+    (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s", clip_mask);
   assert(wand != (DrawingWand *) NULL);
   assert(wand->signature == WandSignature);
   assert(clip_mask != (const char *) NULL);
@@ -4543,7 +4543,7 @@ WandExport MagickBooleanType DrawSetFill
   assert(wand != (DrawingWand *) NULL);
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
-    (void) LogMagickEvent(WandEvent,GetMagickModule(),fill_url);
+    (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s", fill_url);
   if (wand->image == (Image *) NULL)
     ThrowDrawException(WandError,"ContainsNoImages",wand->name);
   assert(fill_url != (const char *) NULL);
diff -p -up ImageMagick-6.4.8-9/wand/magick-image.c~ ImageMagick-6.4.8-9/wand/magick-image.c
--- ImageMagick-6.4.8-9/wand/magick-image.c~	2009-01-16 20:27:20.000000000 +0100
+++ ImageMagick-6.4.8-9/wand/magick-image.c	2009-01-28 16:40:44.000000000 +0100
@@ -8574,7 +8574,7 @@ WandExport MagickBooleanType MagickSetIm
   assert(set_wand != (MagickWand *) NULL);
   assert(set_wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
-    (void) LogMagickEvent(WandEvent,GetMagickModule(),set_wand->name);
+    (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s", set_wand->name);
   if (set_wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   images=CloneImageList(set_wand->images,wand->exception);
@@ -8853,7 +8853,7 @@ WandExport MagickBooleanType MagickSetIm
   assert(clip_mask != (MagickWand *) NULL);
   assert(clip_mask->signature == WandSignature);
   if (wand->debug != MagickFalse)
-    (void) LogMagickEvent(WandEvent,GetMagickModule(),clip_mask->name);
+    (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s", clip_mask->name);
   if (clip_mask->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
   return(SetImageClipMask(wand->images,clip_mask->images));