1 |
diff -p -up ImageMagick-6.4.8-9/magick/animate.c~ ImageMagick-6.4.8-9/magick/animate.c |
2 |
--- ImageMagick-6.4.8-9/magick/animate.c~ 2009-01-03 18:04:03.000000000 +0100 |
3 |
+++ ImageMagick-6.4.8-9/magick/animate.c 2009-01-28 16:33:30.000000000 +0100 |
4 |
@@ -2919,9 +2919,9 @@ static MagickBooleanType XSaveImage(Disp |
5 |
/* |
6 |
Request page geometry from user. |
7 |
*/ |
8 |
- (void) FormatMagickString(geometry,MaxTextExtent,PSPageGeometry); |
9 |
+ (void) FormatMagickString(geometry,MaxTextExtent,"%s", PSPageGeometry); |
10 |
if (LocaleCompare(image_info->magick,"PDF") == 0) |
11 |
- (void) FormatMagickString(geometry,MaxTextExtent,PSPageGeometry); |
12 |
+ (void) FormatMagickString(geometry,MaxTextExtent,"%s", PSPageGeometry); |
13 |
if (image_info->page != (char *) NULL) |
14 |
(void) CopyMagickString(geometry,image_info->page,MaxTextExtent); |
15 |
XListBrowserWidget(display,windows,&windows->widget,PageSizes,"Select", |
16 |
diff -p -up ImageMagick-6.4.8-9/magick/deprecate.c~ ImageMagick-6.4.8-9/magick/deprecate.c |
17 |
--- ImageMagick-6.4.8-9/magick/deprecate.c~ 2009-01-10 14:41:38.000000000 +0100 |
18 |
+++ ImageMagick-6.4.8-9/magick/deprecate.c 2009-01-28 16:34:54.000000000 +0100 |
19 |
@@ -1874,7 +1874,7 @@ MagickExport void *GetConfigureBlob(cons |
20 |
*blob; |
21 |
|
22 |
assert(filename != (const char *) NULL); |
23 |
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),filename); |
24 |
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", filename); |
25 |
(void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7"); |
26 |
assert(path != (char *) NULL); |
27 |
assert(length != (size_t *) NULL); |
28 |
@@ -3608,7 +3608,7 @@ MagickExport MagickBooleanType MagickMon |
29 |
status; |
30 |
|
31 |
assert(text != (const char *) NULL); |
32 |
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),text); |
33 |
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", text); |
34 |
ProcessPendingEvents(text); |
35 |
status=MagickTrue; |
36 |
exception=AcquireExceptionInfo(); |
37 |
diff -p -up ImageMagick-6.4.8-9/magick/display.c~ ImageMagick-6.4.8-9/magick/display.c |
38 |
--- ImageMagick-6.4.8-9/magick/display.c~ 2009-01-18 20:16:52.000000000 +0100 |
39 |
+++ ImageMagick-6.4.8-9/magick/display.c 2009-01-28 16:35:23.000000000 +0100 |
40 |
@@ -12387,9 +12387,9 @@ static MagickBooleanType XSaveImage(Disp |
41 |
/* |
42 |
Request page geometry from user. |
43 |
*/ |
44 |
- (void) FormatMagickString(geometry,MaxTextExtent,PSPageGeometry); |
45 |
+ (void) FormatMagickString(geometry,MaxTextExtent,"%s", PSPageGeometry); |
46 |
if (LocaleCompare(image_info->magick,"PDF") == 0) |
47 |
- (void) FormatMagickString(geometry,MaxTextExtent,PSPageGeometry); |
48 |
+ (void) FormatMagickString(geometry,MaxTextExtent,"%s", PSPageGeometry); |
49 |
if (image_info->page != (char *) NULL) |
50 |
(void) CopyMagickString(geometry,image_info->page,MaxTextExtent); |
51 |
XListBrowserWidget(display,windows,&windows->widget,PageSizes,"Select", |
52 |
diff -p -up ImageMagick-6.4.8-9/magick/quantize.c~ ImageMagick-6.4.8-9/magick/quantize.c |
53 |
--- ImageMagick-6.4.8-9/magick/quantize.c~ 2009-01-22 15:42:07.000000000 +0100 |
54 |
+++ ImageMagick-6.4.8-9/magick/quantize.c 2009-01-28 16:37:09.000000000 +0100 |
55 |
@@ -887,7 +887,7 @@ static MagickBooleanType ClassifyImageCo |
56 |
node_info->child[id]=GetNodeInfo(cube_info,id,level,node_info); |
57 |
if (node_info->child[id] == (NodeInfo *) NULL) |
58 |
(void) ThrowMagickException(exception,GetMagickModule(), |
59 |
- ResourceLimitError,"MemoryAllocationFailed",image->filename); |
60 |
+ ResourceLimitError,"MemoryAllocationFailed","%s", image->filename); |
61 |
if (level == cube_info->depth) |
62 |
cube_info->colors++; |
63 |
} |
64 |
diff -p -up ImageMagick-6.4.8-9/magick/registry.c~ ImageMagick-6.4.8-9/magick/registry.c |
65 |
--- ImageMagick-6.4.8-9/magick/registry.c~ 2008-11-25 19:00:48.000000000 +0100 |
66 |
+++ ImageMagick-6.4.8-9/magick/registry.c 2009-01-28 16:38:06.000000000 +0100 |
67 |
@@ -450,7 +450,7 @@ MagickExport MagickBooleanType SetImageR |
68 |
if (image->signature != MagickSignature) |
69 |
{ |
70 |
(void) ThrowMagickException(exception,GetMagickModule(),RegistryError, |
71 |
- "UnableToSetRegistry",key); |
72 |
+ "UnableToSetRegistry","%s", key); |
73 |
return(MagickFalse); |
74 |
} |
75 |
clone_value=(void *) CloneImageList(image,exception); |
76 |
@@ -465,7 +465,7 @@ MagickExport MagickBooleanType SetImageR |
77 |
if (image_info->signature != MagickSignature) |
78 |
{ |
79 |
(void) ThrowMagickException(exception,GetMagickModule(),RegistryError, |
80 |
- "UnableToSetRegistry",key); |
81 |
+ "UnableToSetRegistry","%s", key); |
82 |
return(MagickFalse); |
83 |
} |
84 |
clone_value=(void *) CloneImageInfo(image_info); |
85 |
diff -p -up ImageMagick-6.4.8-9/magick/transform.c~ ImageMagick-6.4.8-9/magick/transform.c |
86 |
--- ImageMagick-6.4.8-9/magick/transform.c~ 2009-01-15 06:52:32.000000000 +0100 |
87 |
+++ ImageMagick-6.4.8-9/magick/transform.c 2009-01-28 16:38:56.000000000 +0100 |
88 |
@@ -1643,7 +1643,7 @@ MagickExport MagickBooleanType Transform |
89 |
assert(image != (Image **) NULL); |
90 |
assert((*image)->signature == MagickSignature); |
91 |
if ((*image)->debug != MagickFalse) |
92 |
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),(*image)->filename); |
93 |
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (*image)->filename); |
94 |
transform_image=(*image); |
95 |
if (crop_geometry != (const char *) NULL) |
96 |
{ |
97 |
@@ -1793,7 +1793,7 @@ MagickExport MagickBooleanType Transform |
98 |
assert(images != (Image **) NULL); |
99 |
assert((*images)->signature == MagickSignature); |
100 |
if ((*images)->debug != MagickFalse) |
101 |
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),(*images)->filename); |
102 |
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (*images)->filename); |
103 |
image_list=ImageListToArray(*images,&(*images)->exception); |
104 |
if (image_list == (Image **) NULL) |
105 |
return(MagickFalse); |
106 |
diff -p -up ImageMagick-6.4.8-9/wand/drawing-wand.c~ ImageMagick-6.4.8-9/wand/drawing-wand.c |
107 |
--- ImageMagick-6.4.8-9/wand/drawing-wand.c~ 2008-12-16 02:25:28.000000000 +0100 |
108 |
+++ ImageMagick-6.4.8-9/wand/drawing-wand.c 2009-01-28 16:40:07.000000000 +0100 |
109 |
@@ -4286,7 +4286,7 @@ WandExport MagickBooleanType DrawSetClip |
110 |
const char *clip_mask) |
111 |
{ |
112 |
if (wand->debug != MagickFalse) |
113 |
- (void) LogMagickEvent(WandEvent,GetMagickModule(),clip_mask); |
114 |
+ (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s", clip_mask); |
115 |
assert(wand != (DrawingWand *) NULL); |
116 |
assert(wand->signature == WandSignature); |
117 |
assert(clip_mask != (const char *) NULL); |
118 |
@@ -4543,7 +4543,7 @@ WandExport MagickBooleanType DrawSetFill |
119 |
assert(wand != (DrawingWand *) NULL); |
120 |
assert(wand->signature == WandSignature); |
121 |
if (wand->debug != MagickFalse) |
122 |
- (void) LogMagickEvent(WandEvent,GetMagickModule(),fill_url); |
123 |
+ (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s", fill_url); |
124 |
if (wand->image == (Image *) NULL) |
125 |
ThrowDrawException(WandError,"ContainsNoImages",wand->name); |
126 |
assert(fill_url != (const char *) NULL); |
127 |
diff -p -up ImageMagick-6.4.8-9/wand/magick-image.c~ ImageMagick-6.4.8-9/wand/magick-image.c |
128 |
--- ImageMagick-6.4.8-9/wand/magick-image.c~ 2009-01-16 20:27:20.000000000 +0100 |
129 |
+++ ImageMagick-6.4.8-9/wand/magick-image.c 2009-01-28 16:40:44.000000000 +0100 |
130 |
@@ -8574,7 +8574,7 @@ WandExport MagickBooleanType MagickSetIm |
131 |
assert(set_wand != (MagickWand *) NULL); |
132 |
assert(set_wand->signature == WandSignature); |
133 |
if (wand->debug != MagickFalse) |
134 |
- (void) LogMagickEvent(WandEvent,GetMagickModule(),set_wand->name); |
135 |
+ (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s", set_wand->name); |
136 |
if (set_wand->images == (Image *) NULL) |
137 |
ThrowWandException(WandError,"ContainsNoImages",wand->name); |
138 |
images=CloneImageList(set_wand->images,wand->exception); |
139 |
@@ -8853,7 +8853,7 @@ WandExport MagickBooleanType MagickSetIm |
140 |
assert(clip_mask != (MagickWand *) NULL); |
141 |
assert(clip_mask->signature == WandSignature); |
142 |
if (wand->debug != MagickFalse) |
143 |
- (void) LogMagickEvent(WandEvent,GetMagickModule(),clip_mask->name); |
144 |
+ (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s", clip_mask->name); |
145 |
if (clip_mask->images == (Image *) NULL) |
146 |
ThrowWandException(WandError,"ContainsNoImages",wand->name); |
147 |
return(SetImageClipMask(wand->images,clip_mask->images)); |