Skip to content

Commit f77c508

Browse files
author
Cristy
committed
revert special case where target and reconstruction is the same dimensions
1 parent 0189379 commit f77c508

File tree

3 files changed

+27
-36
lines changed

3 files changed

+27
-36
lines changed

‎wand/compare.c

+2-11
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
266266
metric;
267267

268268
RectangleInfo
269-
page_offset,
270269
offset;
271270

272271
ssize_t
@@ -1156,7 +1155,6 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
11561155
reconstruct_image=GetImageFromList(image,1);
11571156
offset.x=0;
11581157
offset.y=0;
1159-
page_offset=offset;
11601158
if (subimage_search != MagickFalse)
11611159
{
11621160
char
@@ -1170,13 +1168,6 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
11701168
if (similarity_metric > dissimilarity_threshold)
11711169
(void) ThrowMagickException(exception,GetMagickModule(),ImageWarning,
11721170
"ImagesTooDissimilar","`%s'",image->filename);
1173-
page_offset=offset;
1174-
if ((image->columns == reconstruct_image->columns) &&
1175-
(image->rows == reconstruct_image->rows))
1176-
{
1177-
offset.x=0;
1178-
offset.y=0;
1179-
}
11801171
}
11811172
if (similarity_image == (Image *) NULL)
11821173
difference_image=CompareImageChannels(image,reconstruct_image,channels,
@@ -1287,8 +1278,8 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
12871278
}
12881279
if (subimage_search != MagickFalse)
12891280
(void) FormatLocaleFile(stderr," @ %.20g,%.20g [%.*g]",
1290-
(double) page_offset.x,(double) page_offset.y,
1291-
GetMagickPrecision(),similarity_metric);
1281+
(double) offset.x,(double) offset.y,GetMagickPrecision(),
1282+
similarity_metric);
12921283
}
12931284
else
12941285
{

‎www/download.html

+24-24
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ <h2><a class="anchor" id="linux"></a>Linux Binary Release</h2>
167167
<tbody>
168168

169169
<tr>
170-
<td><a href= "https://imagemagick.org/archive//linux/CentOS/x86_64/ImageMagick-6.9.13-23.x86_64.rpm">ImageMagick-6.9.13-23.x86_64.rpm</a></td>
170+
<td><a href= "https://imagemagick.org/archive//linux/CentOS/x86_64/ImageMagick-6.9.13-24.x86_64.rpm">ImageMagick-6.9.13-24.x86_64.rpm</a></td>
171171
<td>Redhat / Ricky 9.2 x86_64 RPM</td>
172172
</tr>
173173

174174
<tr>
175-
<td><a href= "https://imagemagick.org/archive//linux/CentOS/x86_64/ImageMagick-libs-6.9.13-23.x86_64.rpm">ImageMagick-libs-6.9.13-23.x86_64.rpm</a></td>
175+
<td><a href= "https://imagemagick.org/archive//linux/CentOS/x86_64/ImageMagick-libs-6.9.13-24.x86_64.rpm">ImageMagick-libs-6.9.13-24.x86_64.rpm</a></td>
176176
<td>Fedora x86_64 RPM</td>
177177
</tr>
178178

@@ -201,10 +201,10 @@ <h2><a class="anchor" id="linux"></a>Linux Binary Release</h2>
201201
<p>Verify its <a href="https://imagemagick.org/archive//binaries/digest.rdf">message digest</a>.</p>
202202

203203
<p>ImageMagick RPM's are self-installing. Simply type the following command and you're ready to start using ImageMagick:</p>
204-
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary"><samp>rpm -Uvh ImageMagick-6.9.13-23.x86_64.rpm</samp></pre>
204+
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary"><samp>rpm -Uvh ImageMagick-6.9.13-24.x86_64.rpm</samp></pre>
205205

206206
<p>You'll need the libraries as well:</p>
207-
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary"><samp>rpm -Uvh ImageMagick-libs-6.9.13-23.x86_64.rpm</samp></pre>
207+
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary"><samp>rpm -Uvh ImageMagick-libs-6.9.13-24.x86_64.rpm</samp></pre>
208208

209209
<p>Note, if there are missing dependencies, install them from the <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a> repo.</p>
210210

@@ -323,7 +323,7 @@ <h4>ImageMagick compiling script for iOS OS and iOS Simulator</h4>
323323

324324
<p>To run the script:</p>
325325
<pre class="bg-light text-dark mx-4"><code>./imagemagick_compile.sh <var>VERSION</var></code></pre>
326-
<p>where <var>VERSION</var> is the version of ImageMagick you want to compile (i.e.: 6.9.13-23, svn, ...)</p>
326+
<p>where <var>VERSION</var> is the version of ImageMagick you want to compile (i.e.: 6.9.13-24, svn, ...)</p>
327327

328328
<p>This script compiles ImageMagick as a static library to be included in iOS projects and adds support for</p>
329329
<ul>
@@ -372,7 +372,7 @@ <h2><a class="anchor" id="windows"></a>Windows Binary Release</h2>
372372
</thead>
373373
<tbody>
374374
<tr>
375-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q16-HDRI-x64-dll.exe">ImageMagick-6.9.13-23-Q16-HDRI-x64-dll.exe</a></td>
375+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q16-HDRI-x64-dll.exe">ImageMagick-6.9.13-24-Q16-HDRI-x64-dll.exe</a></td>
376376
<td>Win64 dynamic at 16 bits-per-pixel component with High-dynamic-range imaging enabled</td>
377377
</tr>
378378
</tbody>
@@ -391,92 +391,92 @@ <h2><a class="anchor" id="windows"></a>Windows Binary Release</h2>
391391
</thead>
392392
<tbody>
393393
<tr>
394-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q16-x64-static.exe">ImageMagick-6.9.13-23-Q16-x64-static.exe</a></td>
394+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q16-x64-static.exe">ImageMagick-6.9.13-24-Q16-x64-static.exe</a></td>
395395
<td>Win64 static at 16 bits-per-pixel component</td>
396396
</tr>
397397

398398
<tr>
399-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q8-x64-dll.exe">ImageMagick-6.9.13-23-Q8-x64-dll.exe</a></td>
399+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q8-x64-dll.exe">ImageMagick-6.9.13-24-Q8-x64-dll.exe</a></td>
400400
<td>Win64 dynamic at 8 bits-per-pixel component</td>
401401
</tr>
402402

403403
<tr>
404-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q8-x64-static.exe">ImageMagick-6.9.13-23-Q8-x64-static.exe</a></td>
404+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q8-x64-static.exe">ImageMagick-6.9.13-24-Q8-x64-static.exe</a></td>
405405
<td>Win64 static at 8 bits-per-pixel component</td>
406406
</tr>
407407

408408
<tr>
409-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q16-x64-dll.exe">ImageMagick-6.9.13-23-Q16-x64-dll.exe</a></td>
409+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q16-x64-dll.exe">ImageMagick-6.9.13-24-Q16-x64-dll.exe</a></td>
410410
<td>Win64 dynamic at 16 bits-per-pixel component</td>
411411
</tr>
412412

413413
<tr>
414-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q16-HDRI-x64-dll.exe">ImageMagick-6.9.13-23-Q16-HDRI-x64-dll.exe</a></td>
414+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q16-HDRI-x64-dll.exe">ImageMagick-6.9.13-24-Q16-HDRI-x64-dll.exe</a></td>
415415
<td>Win64 dynamic at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
416416
</tr>
417417

418418
<tr>
419-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q16-HDRI-x64-static.exe">ImageMagick-6.9.13-23-Q16-HDRI-x64-static.exe</a></td>
419+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q16-HDRI-x64-static.exe">ImageMagick-6.9.13-24-Q16-HDRI-x64-static.exe</a></td>
420420
<td>Win64 static at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
421421
</tr>
422422

423423
<tr>
424-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q16-x86-dll.exe">ImageMagick-6.9.13-23-Q16-x86-dll.exe</a></td>
424+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q16-x86-dll.exe">ImageMagick-6.9.13-24-Q16-x86-dll.exe</a></td>
425425
<td>Win32 dynamic at 16 bits-per-pixel component</td>
426426
</tr>
427427

428428
<tr>
429-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q16-x86-static.exe">ImageMagick-6.9.13-23-Q16-x86-static.exe</a></td>
429+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q16-x86-static.exe">ImageMagick-6.9.13-24-Q16-x86-static.exe</a></td>
430430
<td>Win32 static at 16 bits-per-pixel component</td>
431431
</tr>
432432

433433
<tr>
434-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q8-x86-dll.exe">ImageMagick-6.9.13-23-Q8-x86-dll.exe</a></td>
434+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q8-x86-dll.exe">ImageMagick-6.9.13-24-Q8-x86-dll.exe</a></td>
435435
<td>Win32 dynamic at 8 bits-per-pixel component</td>
436436
</tr>
437437

438438
<tr>
439-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q8-x86-static.exe">ImageMagick-6.9.13-23-Q8-x86-static.exe</a></td>
439+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q8-x86-static.exe">ImageMagick-6.9.13-24-Q8-x86-static.exe</a></td>
440440
<td>Win32 static at 8 bits-per-pixel component</td>
441441
</tr>
442442

443443
<tr>
444-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-Q16-HDRI-x86-dll.exe">ImageMagick-6.9.13-23-Q16-HDRI-x86-dll.exe</a></td>
444+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-Q16-HDRI-x86-dll.exe">ImageMagick-6.9.13-24-Q16-HDRI-x86-dll.exe</a></td>
445445
<td>Win32 dynamic at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
446446
</tr>
447447

448448
<tr>
449-
<td><a href= "https://imagemagick.org/archive/binaries/ImageMagick-6.9.13-23-Q16-HDRI-x86-static.exe">ImageMagick-6.9.13-23-Q16-HDRI-x86-static.exe</a></td>
449+
<td><a href= "https://imagemagick.org/archive/binaries/ImageMagick-6.9.13-24-Q16-HDRI-x86-static.exe">ImageMagick-6.9.13-24-Q16-HDRI-x86-static.exe</a></td>
450450
<td>Win32 static at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
451451
</tr>
452452

453453
<tr>
454-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-portable-Q16-x64.zip">ImageMagick-6.9.13-23-portable-Q16-x64.zip</a></td>
454+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-portable-Q16-x64.zip">ImageMagick-6.9.13-24-portable-Q16-x64.zip</a></td>
455455
<td>Portable Win64 static at 16 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries).</td>
456456
</tr>
457457

458458
<tr>
459-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-portable-Q16-x86.zip">ImageMagick-6.9.13-23-portable-Q16-x86.zip</a></td>
459+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-portable-Q16-x86.zip">ImageMagick-6.9.13-24-portable-Q16-x86.zip</a></td>
460460
<td>Portable Win32 static at 16 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries).</td>
461461
</tr>
462462
I
463463
<tr>
464-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-portable-Q8-x64.zip">ImageMagick-6.9.13-23-portable-Q8-x64.zip</a></td>
464+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-portable-Q8-x64.zip">ImageMagick-6.9.13-24-portable-Q8-x64.zip</a></td>
465465
<td>Portable Win64 static at 8 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries).</td>
466466
</tr>
467467

468468
<tr>
469-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-portable-Q8-x86.zip">ImageMagick-6.9.13-23-portable-Q8-x86.zip</a></td>
469+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-portable-Q8-x86.zip">ImageMagick-6.9.13-24-portable-Q8-x86.zip</a></td>
470470
<td>Portable Win32 static at 8 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries).</td>
471471
</tr>
472472

473473
<tr>
474-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-portable-Q16-HDRI-x64.zip">ImageMagick-6.9.13-23-portable-Q16-HDRI-x64.zip</a></td>
474+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-portable-Q16-HDRI-x64.zip">ImageMagick-6.9.13-24-portable-Q16-HDRI-x64.zip</a></td>
475475
<td>Portable Win64 static at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled. Just copy to your host and run (no installer, no Windows registry entries).</td>
476476
</tr>
477477

478478
<tr>
479-
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-23-portable-Q16-HDRI-x86.zip">ImageMagick-6.9.13-23-portable-Q16-HDRI-x86.zip</a></td>
479+
<td><a href= "https://imagemagick.org/archive//binaries/ImageMagick-6.9.13-24-portable-Q16-HDRI-x86.zip">ImageMagick-6.9.13-24-portable-Q16-HDRI-x86.zip</a></td>
480480
<td>Portable Win32 static at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled. Just copy to your host and run (no installer, no Windows registry entries).</td>
481481
</tr>
482482

‎www/mirror.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ <h1 class="mt-5 fs-4">Mirror</h1>
144144
<div>
145145
<h1 class="text-center">Mirrors</h1>
146146
<p class="lead">ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below. ImageMagick stable and development source releases are also available from <a href="https://github.com/ImageMagick/ImageMagick6">Git</a>. Before you download, you may want to review recent <a href="https://github.com/ImageMagick/Website6/blob/main/ChangeLog.md">changes</a> to the ImageMagick distribution. The authoritative source code repository is <a href="https://github.com/ImageMagick/ImageMagick6" rel="noopener" target="_blank">https://github.com/ImageMagick/ImageMagick6</a>.</p>
147-
<p>The latest release of ImageMagick is version 6.9.13-23.</p>
147+
<p>The latest release of ImageMagick is version 6.9.13-24.</p>
148148
<dl>
149149
<dt>Austrailia</dt>
150150
<dd><a href="https://mirror.endianness.com/imagemagick" rel="noopener" target="_blank">https://mirror.endianness.com/imagemagick</a></dd>

0 commit comments

Comments
 (0)