1 This patch was developed in-house to get 'gmake test' to compile. We have |
|
2 not yet determined whether or not to pass it upstream. |
|
3 |
|
4 --- ImageMagick-6.8.3/Magick++/demo/button.cpp.orig 2010-01-05 06:04:01.000000000 -0800 |
|
5 +++ ImageMagick-6.8.3/Magick++/demo/button.cpp 2015-02-11 07:03:58.267285998 -0800 |
|
6 @@ -90,7 +90,7 @@ |
|
7 // button.display(); |
|
8 |
|
9 } |
|
10 - catch( exception &error_ ) |
|
11 + catch( Exception &error_ ) |
|
12 { |
|
13 cout << "Caught exception: " << error_.what() << endl; |
|
14 return 1; |
|
15 --- ImageMagick-6.8.3/Magick++/demo/demo.cpp.orig 2010-05-29 18:16:06.000000000 -0700 |
|
16 +++ ImageMagick-6.8.3/Magick++/demo/demo.cpp 2015-02-11 07:05:43.515927192 -0800 |
|
17 @@ -510,7 +510,7 @@ |
|
18 // montage_image.display(); |
|
19 |
|
20 } |
|
21 - catch( exception &error_ ) |
|
22 + catch( Exception &error_ ) |
|
23 { |
|
24 cout << "Caught exception: " << error_.what() << endl; |
|
25 return 1; |
|
26 --- ImageMagick-6.8.3/Magick++/demo/flip.cpp.orig 2009-09-05 14:47:34.000000000 -0700 |
|
27 +++ ImageMagick-6.8.3/Magick++/demo/flip.cpp 2015-02-11 07:06:56.484455695 -0800 |
|
28 @@ -50,7 +50,7 @@ |
|
29 writeImages( morphed.begin(), morphed.end(), "flip_out.miff" ); |
|
30 |
|
31 } |
|
32 - catch( exception &error_ ) |
|
33 + catch( Exception &error_ ) |
|
34 { |
|
35 cout << "Caught exception: " << error_.what() << endl; |
|
36 return 1; |
|
37 --- ImageMagick-6.8.3/Magick++/demo/gravity.cpp.orig 2010-05-27 13:51:26.000000000 -0700 |
|
38 +++ ImageMagick-6.8.3/Magick++/demo/gravity.cpp 2015-02-11 07:08:01.108746080 -0800 |
|
39 @@ -73,7 +73,7 @@ |
|
40 // system( "animate gravity_out.miff" ); |
|
41 |
|
42 } |
|
43 - catch( exception &error_ ) |
|
44 + catch( Exception &error_ ) |
|
45 { |
|
46 cout << "Caught exception: " << error_.what() << endl; |
|
47 return 1; |
|
48 --- ImageMagick-6.9.4/Magick++/demo/piddle.cpp.~1~ 2016-05-09 10:28:57.000000000 -0700 |
|
49 +++ ImageMagick-6.9.4/Magick++/demo/piddle.cpp 2016-05-10 09:08:10.587311299 -0700 |
|
50 @@ -170,7 +170,7 @@ |
|
51 // image.display( ); |
|
52 |
|
53 } |
|
54 - catch( exception &error_ ) |
|
55 + catch( Exception &error_ ) |
|
56 { |
|
57 cout << "Caught exception: " << error_.what() << endl; |
|
58 return 1; |
|
59 --- ImageMagick-6.8.3/Magick++/demo/shapes.cpp.orig 2011-02-02 18:08:56.000000000 -0800 |
|
60 +++ ImageMagick-6.8.3/Magick++/demo/shapes.cpp 2015-02-11 07:10:26.414505806 -0800 |
|
61 @@ -109,7 +109,7 @@ |
|
62 // image.display( ); |
|
63 |
|
64 } |
|
65 - catch( exception &error_ ) |
|
66 + catch( Exception &error_ ) |
|
67 { |
|
68 cout << "Caught exception: " << error_.what() << endl; |
|
69 return 1; |
|
70 --- ImageMagick-6.8.3/Magick++/demo/zoom.cpp.orig 2010-05-29 18:16:06.000000000 -0700 |
|
71 +++ ImageMagick-6.8.3/Magick++/demo/zoom.cpp 2015-02-11 07:12:38.302672267 -0800 |
|
72 @@ -63,7 +63,7 @@ |
|
73 try { |
|
74 density=Geometry(argv[argv_index]); |
|
75 } |
|
76 - catch( exception &/* error_ */) |
|
77 + catch( Exception &/* error_ */) |
|
78 { |
|
79 ParseError(argv_index,argv); |
|
80 } |
|
81 @@ -119,7 +119,7 @@ |
|
82 try { |
|
83 geometry=Geometry(argv[argv_index]); |
|
84 } |
|
85 - catch( exception &/* error_ */) |
|
86 + catch( Exception &/* error_ */) |
|
87 { |
|
88 ParseError(argv_index,argv); |
|
89 } |
|
90 @@ -132,7 +132,7 @@ |
|
91 try { |
|
92 resample=Geometry(argv[argv_index]); |
|
93 } |
|
94 - catch( exception &/* error_ */) |
|
95 + catch( Exception &/* error_ */) |
|
96 { |
|
97 ParseError(argv_index,argv); |
|
98 } |
|
99 @@ -180,7 +180,7 @@ |
|
100 } |
|
101 image.write(output_file); |
|
102 } |
|
103 - catch( exception &error_ ) |
|
104 + catch( Exception &error_ ) |
|
105 { |
|
106 cout << "Caught exception: " << error_.what() << endl; |
|
107 return 1; |
|
108 --- ImageMagick-6.8.3/Magick++/tests/appendImages.cpp.orig 2009-09-05 14:47:34.000000000 -0700 |
|
109 +++ ImageMagick-6.8.3/Magick++/tests/appendImages.cpp 2015-02-11 07:16:52.216679885 -0800 |
|
110 @@ -76,11 +76,6 @@ |
|
111 cout << "Caught exception: " << error_.what() << endl; |
|
112 return 1; |
|
113 } |
|
114 - catch( exception &error_ ) |
|
115 - { |
|
116 - cout << "Caught exception: " << error_.what() << endl; |
|
117 - return 1; |
|
118 - } |
|
119 |
|
120 if ( failures ) |
|
121 { |
|
122 --- ImageMagick-6.8.3/Magick++/tests/attributes.cpp.orig 2012-06-18 10:27:31.000000000 -0700 |
|
123 +++ ImageMagick-6.8.3/Magick++/tests/attributes.cpp 2015-02-11 07:19:39.714613173 -0800 |
|
124 @@ -1501,11 +1501,6 @@ |
|
125 cout << "Caught exception: " << error_.what() << endl; |
|
126 return 1; |
|
127 } |
|
128 - catch( exception &error_ ) |
|
129 - { |
|
130 - cout << "Caught exception: " << error_.what() << endl; |
|
131 - return 1; |
|
132 - } |
|
133 |
|
134 if ( failures ) |
|
135 { |
|
136 --- ImageMagick-6.8.3/Magick++/tests/averageImages.cpp.orig 2009-09-05 14:47:34.000000000 -0700 |
|
137 +++ ImageMagick-6.8.3/Magick++/tests/averageImages.cpp 2015-02-11 07:20:22.914703162 -0800 |
|
138 @@ -58,11 +58,6 @@ |
|
139 cout << "Caught exception: " << error_.what() << endl; |
|
140 return 1; |
|
141 } |
|
142 - catch( exception &error_ ) |
|
143 - { |
|
144 - cout << "Caught exception: " << error_.what() << endl; |
|
145 - return 1; |
|
146 - } |
|
147 |
|
148 if ( failures ) |
|
149 { |
|
150 --- ImageMagick-6.8.3/Magick++/tests/coalesceImages.cpp.orig 2009-09-05 14:47:34.000000000 -0700 |
|
151 +++ ImageMagick-6.8.3/Magick++/tests/coalesceImages.cpp 2015-02-11 07:21:36.319285353 -0800 |
|
152 @@ -45,11 +45,6 @@ |
|
153 cout << "Caught exception: " << error_.what() << endl; |
|
154 return 1; |
|
155 } |
|
156 - catch( exception &error_ ) |
|
157 - { |
|
158 - cout << "Caught exception: " << error_.what() << endl; |
|
159 - return 1; |
|
160 - } |
|
161 |
|
162 if ( failures ) |
|
163 { |
|
164 --- ImageMagick-6.8.3/Magick++/tests/coderInfo.cpp.orig 2009-09-05 14:47:34.000000000 -0700 |
|
165 +++ ImageMagick-6.8.3/Magick++/tests/coderInfo.cpp 2015-02-11 07:22:07.803975862 -0800 |
|
166 @@ -118,11 +118,6 @@ |
|
167 cout << "Caught exception: " << error_.what() << endl; |
|
168 return 1; |
|
169 } |
|
170 - catch( exception &error_ ) |
|
171 - { |
|
172 - cout << "Caught exception: " << error_.what() << endl; |
|
173 - return 1; |
|
174 - } |
|
175 |
|
176 if ( failures ) |
|
177 { |
|
178 --- ImageMagick-6.8.3/Magick++/tests/color.cpp.orig 2010-09-19 08:13:42.000000000 -0700 |
|
179 +++ ImageMagick-6.8.3/Magick++/tests/color.cpp 2015-02-11 07:25:37.141826377 -0800 |
|
180 @@ -138,11 +138,6 @@ |
|
181 cout << "Caught exception: " << error_.what() << endl; |
|
182 return 1; |
|
183 } |
|
184 - catch( exception &error_ ) |
|
185 - { |
|
186 - cout << "Caught exception: " << error_.what() << endl; |
|
187 - return 1; |
|
188 - } |
|
189 |
|
190 if ( failures ) |
|
191 { |
|
192 --- ImageMagick-6.8.3/Magick++/tests/colorHistogram.cpp.orig 2010-05-27 13:51:26.000000000 -0700 |
|
193 +++ ImageMagick-6.8.3/Magick++/tests/colorHistogram.cpp 2015-02-11 07:26:23.437002967 -0800 |
|
194 @@ -84,11 +84,6 @@ |
|
195 cout << "Caught exception: " << error_.what() << endl; |
|
196 return 1; |
|
197 } |
|
198 - catch( exception &error_ ) |
|
199 - { |
|
200 - cout << "Caught exception: " << error_.what() << endl; |
|
201 - return 1; |
|
202 - } |
|
203 |
|
204 if ( failures ) |
|
205 { |
|
206 --- ImageMagick-6.8.3/Magick++/tests/exceptions.cpp.orig 2011-12-31 09:22:05.000000000 -0800 |
|
207 +++ ImageMagick-6.8.3/Magick++/tests/exceptions.cpp 2015-02-11 07:26:55.141360186 -0800 |
|
208 @@ -82,12 +82,6 @@ |
|
209 cout.flush(); |
|
210 return 1; |
|
211 } |
|
212 - catch( exception &error_ ) |
|
213 - { |
|
214 - cout << "Bogus catch: Caught exception: " << error_.what() << endl; |
|
215 - cout.flush(); |
|
216 - return 1; |
|
217 - } |
|
218 |
|
219 if ( failures ) |
|
220 { |
|
221 --- ImageMagick-6.8.3/Magick++/tests/montageImages.cpp.orig 2011-02-02 17:31:01.000000000 -0800 |
|
222 +++ ImageMagick-6.8.3/Magick++/tests/montageImages.cpp 2015-02-11 07:29:32.433719660 -0800 |
|
223 @@ -123,11 +123,6 @@ |
|
224 cout << "Caught exception: " << error_.what() << endl; |
|
225 return 1; |
|
226 } |
|
227 - catch( exception &error_ ) |
|
228 - { |
|
229 - cout << "Caught exception: " << error_.what() << endl; |
|
230 - return 1; |
|
231 - } |
|
232 |
|
233 if ( failures ) |
|
234 { |
|
235 --- ImageMagick-6.8.3/Magick++/tests/morphImages.cpp.orig 2009-09-05 14:47:34.000000000 -0700 |
|
236 +++ ImageMagick-6.8.3/Magick++/tests/morphImages.cpp 2015-02-11 07:30:08.668795257 -0800 |
|
237 @@ -54,11 +54,6 @@ |
|
238 cout << "Caught exception: " << error_.what() << endl; |
|
239 return 1; |
|
240 } |
|
241 - catch( exception &error_ ) |
|
242 - { |
|
243 - cout << "Caught exception: " << error_.what() << endl; |
|
244 - return 1; |
|
245 - } |
|
246 |
|
247 if ( failures ) |
|
248 { |
|
249 --- ImageMagick-6.8.3/Magick++/tests/readWriteBlob.cpp.orig 2009-09-05 14:47:34.000000000 -0700 |
|
250 +++ ImageMagick-6.8.3/Magick++/tests/readWriteBlob.cpp 2015-02-11 07:33:35.032546179 -0800 |
|
251 @@ -237,11 +237,6 @@ |
|
252 cout << "Caught exception: " << error_.what() << endl; |
|
253 return 1; |
|
254 } |
|
255 - catch( exception &error_ ) |
|
256 - { |
|
257 - cout << "Caught exception: " << error_.what() << endl; |
|
258 - return 1; |
|
259 - } |
|
260 |
|
261 if ( failures ) |
|
262 { |
|
263 --- ImageMagick-6.9.4/Magick++/tests/readWriteImages.cpp.~1~ 2016-05-10 09:05:23.297878177 -0700 |
|
264 +++ ImageMagick-6.9.4/Magick++/tests/readWriteImages.cpp 2016-05-10 09:06:14.986053932 -0700 |
|
265 @@ -162,11 +162,6 @@ |
|
266 cout << "Caught exception: " << error_.what() << endl; |
|
267 return 1; |
|
268 } |
|
269 - catch(exception &error_) |
|
270 - { |
|
271 - cout << "Caught exception: " << error_.what() << endl; |
|
272 - return 1; |
|
273 - } |
|
274 |
|
275 if (failures) |
|
276 { |
|