Package: imagemagick / 8:7.1.1.47+dfsg1-2

0018-Finalize-fixing-error-in-html.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
Date: Mon, 11 Jan 2021 22:42:36 +0000
Subject: Finalize fixing error in html

Forwarded: no
---
 www/advanced-unix-installation.html |   3 +-
 www/api.html                        |   2 +-
 www/architecture.html               | 125 ++++++++++++++----------------------
 www/binary-releases.html            |   2 +-
 www/command-line-options.html       |   6 +-
 www/defines.html                    |  24 ++++---
 www/download.html                   |   2 +-
 www/support.html                    |   2 +-
 www/webp.html                       |   1 +
 9 files changed, 66 insertions(+), 101 deletions(-)

diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
index f4120f9..96df375 100644
--- a/www/advanced-unix-installation.html
+++ b/www/advanced-unix-installation.html
@@ -656,8 +656,7 @@ no encode delegate for this image format
   </footer>
 
   <!-- Javascript assets -->
-  <script>window.jQuery || document.write('&lt;script src="assets/jquery.slim.min.js"&gt;&lt;\/script&gt;')</script><script src="assets/bootstrap.bundle.min.js" crossorigin="anonymous">
- </script>
+  <script>window.jQuery || document.write('&lt;script src="assets/jquery.slim.min.js"&gt;&lt;\/script&gt;')</script><script src="assets/bootstrap.bundle.min.js" crossorigin="anonymous" />
 </body>
 </html>
 <!-- Magick Cache 13th February 2021 11:28 -->
\ No newline at end of file
diff --git a/www/api.html b/www/api.html
index 6542f55..d00f767 100644
--- a/www/api.html
+++ b/www/api.html
@@ -218,7 +218,7 @@
   </footer>
 
   <!-- Javascript assets -->
-  <script src="assets/magick.js" crossorigin="anonymous"></script>
+  <script src="assets/magick.js" crossorigin="anonymous" />
   <script>window.jQuery || document.write('&lt;script src="assets/jquery.min.js">&lt;\/script>')</script>
 </body>
 </html>
diff --git a/www/architecture.html b/www/architecture.html
index b8b3184..8bc4b54 100644
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -1459,63 +1459,40 @@ display logo.mgk
 %    o exception: return any errors or warnings in this structure.
 %
 */
-
-typedef struct _StatisticsInfo
+ModuleExport size_t analyzeImage(Image **images,const int argc,const char **argv,
+  ExceptionInfo *exception)
 {
+  char
+    text[MaxTextExtent];
+
   double
     area,
     brightness,
-    mean,
-    standard_deviation,
-    sum[5],
-    kurtosis,
-    skewness;
-} StatisticsInfo;
-
-static inline int GetMagickNumberThreads(const Image *source,
-  const Image *destination,const size_t chunk,int multithreaded)
-{
-#define MagickMax(x,y)  (((x) > (y)) ? (x) : (y))
-#define MagickMin(x,y)  (((x) &lt; (y)) ? (x) : (y))
-
-  /*
-    Number of threads bounded by the amount of work and any thread resource
-    limit.  The limit is 2 if the pixel cache type is not memory or
-    memory-mapped.
-  */
-  if (multithreaded == 0)
-    return(1);
-  if (((GetImagePixelCacheType(source) != MemoryCache) &&
-       (GetImagePixelCacheType(source) != MapCache)) ||
-      ((GetImagePixelCacheType(destination) != MemoryCache) &&
-       (GetImagePixelCacheType(destination) != MapCache)))
-    return(MagickMax(MagickMin(GetMagickResourceLimit(ThreadResource),2),1));
-  return(MagickMax(MagickMin((ssize_t) GetMagickResourceLimit(ThreadResource),
-    (ssize_t) (chunk)/64),1));
-}
-
-ModuleExport size_t analyzeImage(Image **images,const int argc,
-  const char **argv,ExceptionInfo *exception)
-{
-#define AnalyzeImageFilterTag  "Filter/Analyze"
-#define magick_number_threads(source,destination,chunk,multithreaded) \
-  num_threads(GetMagickNumberThreads(source,destination,chunk,multithreaded))
-
-  char
-    text[MagickPathExtent];
+    brightness_mean,
+    brightness_standard_deviation,
+    brightness_kurtosis,
+    brightness_skewness,
+    brightness_sum_x,
+    brightness_sum_x2,
+    brightness_sum_x3,
+    brightness_sum_x4,
+    hue,
+    saturation,
+    saturation_mean,
+    saturation_standard_deviation,
+    saturation_kurtosis,
+    saturation_skewness,
+    saturation_sum_x,
+    saturation_sum_x2,
+    saturation_sum_x3,
+    saturation_sum_x4;
 
   Image
     *image;
 
-  MagickBooleanType
-    status;
-
-  MagickOffsetType
-    progress;
-
   assert(images != (Image **) NULL);
   assert(*images != (Image *) NULL);
-  assert((*images)->signature == MagickCoreSignature);
+  assert((*images)-&gt;signature == MagickSignature);
   (void) argc;
   (void) argv;
   status=MagickTrue;
@@ -1525,40 +1502,42 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
     CacheView
       *image_view;
 
-    double
-      area;
+    MagickBooleanType
+      status;
 
     ssize_t
       y;
 
-    StatisticsInfo
-      brightness,
-      saturation;
-
-    if (status == MagickFalse)
-      continue;
-    (void) memset(&brightness,0,sizeof(brightness));
-    (void) memset(&saturation,0,sizeof(saturation));
+    brightness_sum_x=0.0;
+    brightness_sum_x2=0.0;
+    brightness_sum_x3=0.0;
+    brightness_sum_x4=0.0;
+    brightness_mean=0.0;
+    brightness_standard_deviation=0.0;
+    brightness_kurtosis=0.0;
+    brightness_skewness=0.0;
+    saturation_sum_x=0.0;
+    saturation_sum_x2=0.0;
+    saturation_sum_x3=0.0;
+    saturation_sum_x4=0.0;
+    saturation_mean=0.0;
+    saturation_standard_deviation=0.0;
+    saturation_kurtosis=0.0;
+    saturation_skewness=0.0;
+    area=0.0;
     status=MagickTrue;
     image_view=AcquireVirtualCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static) \
-    shared(progress,status,brightness,saturation) \
-    magick_number_threads(image,image,image->rows,1)
+    #pragma omp parallel for schedule(static,4) shared(status)
 #endif
-    for (y=0; y &lt; (ssize_t) image->rows; y++)
+    for (y=0; y &lt; (ssize_t) image-&gt;rows; y++)
     {
       const Quantum
         *p;
 
-      ssize_t
-        i,
+      register ssize_t
         x;
 
-      StatisticsInfo
-        local_brightness,
-        local_saturation;
-
       if (status == MagickFalse)
         continue;
       p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
@@ -1567,9 +1546,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
           status=MagickFalse;
           continue;
         }
-      (void) memset(&local_brightness,0,sizeof(local_brightness));
-      (void) memset(&local_saturation,0,sizeof(local_saturation));
-      for (x=0; x &lt; (ssize_t) image->columns; x++)
+      for (x=0; x &lt; (ssize_t) image-&gt;columns; x++)
       {
         double
           b,
@@ -1586,14 +1563,6 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
           local_saturation.sum[i]+=pow(s,(double) i);
         p+=GetPixelChannels(image);
       }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp critical (analyzeImage)
-#endif
-      for (i=1; i &lt;= 4; i++)
-      {
-        brightness.sum[i]+=local_brightness.sum[i];
-        saturation.sum[i]+=local_saturation.sum[i];
-      }
     }
     image_view=DestroyCacheView(image_view);
     area=(double) image->columns*image->rows;
diff --git a/www/binary-releases.html b/www/binary-releases.html
index 49a8f2a..83401af 100644
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -488,7 +488,7 @@ objShell.Exec("convert ""e:/myimages/image.png"" ""e:/myimages/image.jpg""")
   </footer>
 
   <!-- Javascript assets -->
-  <script src="assets/magick.js" crossorigin="anonymous"></script>
+  <script src="assets/magick.js" crossorigin="anonymous" />
   <script>window.jQuery || document.write('&lt;script src="assets/jquery.min.js">&lt;\/script>')</script>
 </body>
 </html>
diff --git a/www/command-line-options.html b/www/command-line-options.html
index 90c3f40..36eec6d 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -915,7 +915,7 @@ href="#auto-orient" >-auto-orient</a> operator will do nothing. </p>
 </dl>
 </div>
 
-<p>The computed threshold is returned as the <kbd>auto-threshold:verbose</kbd> image property. To instead print to your device, use <kbd>-define auto-threshold:verbose=true</kbd>.</p>
+<p>The computed threshold is returned as the <kbd>auto-threshold:threshold</kbd> image property. To instead print to your device, use <kbd>-define auto-threshold:threshold=true</kbd>.</p>
 
 <div style="margin: auto;">
   <h2><a class="anchor" id="average"></a>-average</h2>
@@ -4022,8 +4022,6 @@ image sequence.</p>
 <p>For more information, see the webpage, <a href="cipher.html">ImageMagick: Encipher or
 Decipher an Image</a>.</p>
 
-
-
 <div style="margin: auto;">
   <h2><a class="anchor" id="encoding"></a>-encoding <var>type</var></h2>
 </div>
@@ -8681,7 +8679,7 @@ href="#stretch">-stretch</a>, and <a href="#style">-style</a>. </p>
   <h2><a class="anchor" id="white-balance"></a>-white-balance</h2>
 </div>
 <p>Applies white balancing to an image according to a grayworld assumption in the LAB colorspace.</p>
-<p>Use <kbd>-define white-balance:vibrance=<em>value{%}</em></kdb> to change the color vibrance of the a &amp; b channels.</p>
+<p>Use <kbd>-define white-balance:vibrance=<em>value{%}</em></kbd> to change the color vibrance of the a &amp; b channels.</p>
 
 <div style="margin: auto;">
   <h2><a class="anchor" id="white-point"></a>-white-point <var>x,y</var></h2>
diff --git a/www/defines.html b/www/defines.html
index 26684d1..470fa37 100644
--- a/www/defines.html
+++ b/www/defines.html
@@ -174,7 +174,7 @@ use:</p>
   </tr>
 
   <tr>
-   <td colspan=2><p></p></td>
+   <td colspan="2"><p></p></td>
   </tr>
 
   <tr>
@@ -802,11 +802,11 @@ use:</p>
   </tr>
 
   <tr>
-    <td colspan=2><p></p></td>
+    <td colspan="2"><p></p></td>
   </tr>
 
   <tr>
-    <td colspan=2><p></p></td>
+    <td colspan="2"><p></p></td>
   </tr>
 
   <tr>
@@ -814,7 +814,7 @@ use:</p>
   </tr>
 
   <tr>
-    <td colspan=2><p></p></td>
+    <td colspan="2"><p></p></td>
   </tr>
 
   <tr>
@@ -1312,7 +1312,6 @@ use:</p>
     <td>png:exclude-chunk=<var>value</var></td>
     <td> </td>
   </tr>
-
   <tr>
     <td>png:include-chunk=<var>value</var></td>
     <td>ancillary chunks to be excluded from or included in PNG output.
@@ -1656,15 +1655,15 @@ use:</p>
   </tr>
 
   <tr>
-    <td colspan=2><p></p></td>
+    <td colspan="2"><p></p></td>
   </tr>
 
   <tr>
-    <td colspan=2><p></p></td>
+    <td colspan="2"><p></p></td>
   </tr>
 
   <tr>
-    <th align="center" colspan=2>PSEUDO-IMAGE FORMATS</th>
+    <th align="center" colspan="2">PSEUDO-IMAGE FORMATS</th>
   </tr>
 
   <tr>
@@ -1686,7 +1685,6 @@ use:</p>
     clockwise positive manner from its normal X-Y orientation.
     Supported in Imagemagick 6.9.2-5.</td>
    </tr>
-
   <tr>
     <td>gradient:bounding-box=<var>WxH+X+Y</var></td>
     <td>Limit the gradient to a larger or smaller region than
@@ -1849,19 +1847,19 @@ use:</p>
   </tr>
 
   <tr>
-    <td colspan=2><p></p></td>
+    <td colspan="2"><p></p></td>
   </tr>
 
   <tr>
-    <td colspan=2><p></p></td>
+    <td colspan="2"><p></p></td>
   </tr>
 
   <tr>
-    <th align="center" colspan=2>Identify Defines</th>
+    <th align="center" colspan="2">Identify Defines</th>
   </tr>
 
   <tr>
-    <td colspan=2><p></p></td>
+    <td colspan="2"><p></p></td>
   </tr>
 
   <tr>
diff --git a/www/download.html b/www/download.html
index b4c8e07..49d193d 100644
--- a/www/download.html
+++ b/www/download.html
@@ -263,7 +263,7 @@ display logo.gif</samp></pre>
     <td><a href="../archive/binaries/ImageMagick-x86_64-apple-darwin20.1.0.tar.gz">ImageMagick-x86_64-apple-darwin20.1.0.tar.gz</a></td>
     <td>macOS High Sierra</td>
   </tr>
-  <tbody>
+  </tbody>
 </table></div>
 
 <p>Verify its <a href="../archive/binaries/digest.rdf">message digest</a>.</p>
diff --git a/www/support.html b/www/support.html
index 7463305..330d0a6 100644
--- a/www/support.html
+++ b/www/support.html
@@ -181,7 +181,7 @@
 <p>For direct monetary contributions, click on the donate button to contribute thru Paypal or with a credit card:</p>
 
 <ul>
-<a href="https://www.paypal.com/biz/fund?id=9XPKRUWDXRR8J"><img "image" src="../images/donate.png" border="0" name="submit" alt="Sponsor ImageMagick" width="92" height="26"</img /></a>
+<a href="https://www.paypal.com/biz/fund?id=9XPKRUWDXRR8J"><img src="../images/donate.png" border="0" name="submit" alt="Sponsor ImageMagick" width="92" height="26" /></a>
 </ul>
 
 <h2>Bitcoin</h2>
diff --git a/www/webp.html b/www/webp.html
index 1788dff..2f82005 100644
--- a/www/webp.html
+++ b/www/webp.html
@@ -251,6 +251,7 @@
     <td>use-sharp-yuv=<var>value</var></td>
     <td>if needed, use sharp (and slow) RGB->YUV conversion.</td>
   </tr>
+</tbody>
 </table></div>
 </div>
   </div>