diff --git a/www/compare.html b/www/compare.html
index 63055e8..f58f295 100644
--- a/www/compare.html
+++ b/www/compare.html
@@ -8,13 +8,13 @@
http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
- <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>
+ <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"/>
<title>ImageMagick: Command-line Tools: Compare</title>
<meta http-equiv="content-language" content="en-US"/>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="reply-to" content="magick-users@imagemagick.org"/>
<meta name="application-name" content="ImageMagick"/>
- <meta name="description" content="Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats. In addition resize, rotate, shear, distort and transform images automagically."/>
+ <meta name="description" content="Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats. In addition, resize, rotate, shear, distort or transform images automagically."/>
<meta name="application-url" content="http://www.imagemagick.org"/>
<meta name="generator" content="PHP"/>
<meta name="keywords" content="command-line, tools:, compare, ImageMagick, PerlMagick, image processing, OpenMP, software development library, image, photo, software, Magick++, MagickWand"/>
@@ -24,42 +24,55 @@
<meta name="author" content="ImageMagick Studio LLC"/>
<meta name="revisit-after" content="2 DAYS"/>
<meta name="resource-type" content="document"/>
- <meta name="copyright" content="Copyright (c) 1999-2013 ImageMagick Studio LLC"/>
+ <meta name="copyright" content="Copyright (c) 1999-2012 ImageMagick Studio LLC"/>
<meta name="distribution" content="Global"/>
<link rel="icon" href="../images/wand.png"/>
<link rel="shortcut icon" href="../images/wand.ico" type="images/x-icon"/>
<link rel="canonical" href="http://www.imagemagick.org" />
<link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
+
<!-- Add jQuery library -->
- <script type="text/javascript" src="http://localhost/ajax/libs/jquery/1.7/jquery.min.js"></script>
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
- <!-- Optionaly include easing and/or mousewheel plugins -->
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>
+ <!-- Add mousewheel plugin (this is optional) -->
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/lib/jquery.mousewheel-3.0.6.pack.js"></script>
<!-- Add fancyBox -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.4" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.4"></script>
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/jquery.fancybox.css?v=2.0.6" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.0.6"></script>
- <!-- Optionaly include button and/or thumbnail helpers -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.4" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.4"></script>
+ <!-- Optionally add helpers - button, thumbnail and/or media -->
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.css?v=1.0.2" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.js?v=1.0.2"></script>
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-media.js?v=1.0.0"></script>
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.4" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.4"></script>
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.css?v=2.0.6" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.js?v=2.0.6"></script>
+
<script type="text/javascript">
$(document).ready(function() {
$(".fancybox").fancybox();
});
</script>
+
<!-- ImageMagick style -->
- <link rel="stylesheet" href="http://www.localhost/cse/style/look/default.css" type="text/css" />
<style type="text/css" media="all">
@import url("../www/magick.css");
</style>
</head>
<body id="www-imagemagick-org">
+
+<script>
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'offline-script','//127.0.0.1/analytics.js','ga');
+
+ ga('create', 'UA-40133312-1', 'imagemagick.org');
+ ga('send', 'pageview');
+</script>
+
<div class="titlebar">
<div style="margin: 17px auto; float: left;">
<script type="text/javascript">
@@ -71,10 +84,10 @@
//-->
</script>
<script type="text/javascript"
- src="http://localhost/pagead/show_ads.js">
+ src="http://127.0.0.1/pagead/show_ads.js">
</script>
</div>
-<a href="../discourse-server">
+<a href="http://www.imagemagick.org/discourse-server/">
<img src="../images/logo.jpg"
alt="ImageMagick Logo"
style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
@@ -153,7 +166,7 @@
</div>
<div class="sep"></div>
<div class="menu">
- <a title="Search" href="http://www.imagemagick.org/script/search.php">Search</a>
+ <a title="Search" href="search.html">Search</a>
</div>
<div class="sep"></div>
<div class="menu">
@@ -164,75 +177,48 @@
</div>
<div class="sep"></div>
<div class="menu">
- <a rel="follow" title="Sponsors" href="support.html">Sponsors:</a>
-
- <a href="http://www.networkredux.com"> <img src="../images/networkredux.png" width="140" height="31" alt="[sponsor]" style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" /></a>
- <a href="http://www.dinodirect.com/ipads-tablets/"> <img src="../images/dino-direct.jpg" width="140" height="90" alt="[sponsor]" style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" /></a><!-- 201208010120 mickey@163... -->
-<div class="sponsbox">
-<div class="sponsor">
- <a rel="follow" title="Sponsor: The Fastest & Easiest Way to Find Images" href="http://www.graphicsfactory.com">The Fastest & Easiest Way to Find Images</a><!-- 201210010270 graphicsfac... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: VPS" href="http://www.interdominios.com/vps">VPS</a><!-- 201209010090 barsh@inter... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Werbebanner Werbeplane" href="http://www.allesbanner.de">Werbebanner Werbeplane</a><!-- 201212010450 info@druck... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Entertainment News & Photos" href="http://www.zimbio.com">Entertainment News & Photos</a><!-- 201211010540 bd@zimb... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: LED24" href="http://led24.de/">LED24</a><!-- 201207010270 info@led24... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Best Website Hosting" href="http://www.top-cheap-web-hosting.com">Best Website Hosting</a><!-- 201304010090 eunge.liu-->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Android Tablet" href="http://www.dinodirect.com/ipads-tablets/">Android Tablet</a><!-- 201208010120 mickey@163... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Web Site Hosting" href="http://webhostinggeeks.com">Web Site Hosting</a><!-- 201302010900 funds@enmob... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Premium Quality Stock Photos" href="http://www.f1online.pro/en/">Premium Quality Stock Photos</a><!-- 2012080100540 ... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 2012070100250 ... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Managed Server" href="http://www.robhost.de">Managed Server</a><!-- 201210010720 klikics... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Druckerei" href="http://www.allesdruck.de">Druckerei</a><!-- 201303011500 r.leo -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Names List" href="http://www.listofnames.info">Names List</a><!-- 2012110100180 grimshrat@busyb-->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Waschmaschinen Reparatur Berlin" href="http://www.waschmaschinen-reparaturen-berlin.de">Waschmaschinen Reparatur Berlin</a><!-- 2012070100030 Temurbas@autoteile-->
-</div>
-</div>
+ <a title="Support ImageMagick Development" href="support.html">Support ImageMagick Development</a>
</div>
</div>
<div class="eastbar">
- <div class="g-plusone" id="gplusone"></div>
<script type="text/javascript">
- window.___gcfg = {
- lang: 'en-US'
- };
-
+ /* <![CDATA[ */
(function() {
- var po = document.createElement('offline-script');
- po.type = 'text/javascript'; po.async = true;
- po.src = 'https://apis.localhost/js/plusone.js';
- var script = document.getElementsByTagName('offline-script')[0];
- script.parentNode.insertBefore(po, script);
+ var po = document.createElement('offline-script'), t = document.getElementsByTagName('offline-script')[0];
+ po.type = 'text/javascript';
+ po.async = true;
+ po.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+ var script = document.getElementsByTagName('offline-script')[0];
+ script.parentNode.insertBefore(po, script);
})();
- var gplusone = document.getElementById("gplusone");
- gplusone.setAttribute("data-size","medium");
- gplusone.setAttribute("data-count","false");
+ /* ]]> */
</script>
+ <div> <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://www.imagemagick.org/"></a></div>
+ <noscript>
+ <a href="http://flattr.com/thing/947300/Convert-Edit-And-Compose-Images" target="_blank">
+ <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" width="93" height="20" border="0" /></a>
+ </noscript>
+ <div class="g-plusone" id="gplusone"></div>
+ <script type="text/javascript">
+ /* <![CDATA[ */
+ window.___gcfg = {
+ lang: 'en-US'
+ };
+
+ (function() {
+ var po = document.createElement('offline-script');
+ po.type = 'text/javascript';
+ po.async = true;
+ po.src = 'https://127.0.0.1/js/plusone.js';
+ var script = document.getElementsByTagName('offline-script')[0];
+ script.parentNode.insertBefore(po, script);
+ })();
+ var gplusone = document.getElementById("gplusone");
+ gplusone.setAttribute("data-size","medium");
+ gplusone.setAttribute("data-count","true");
+ /* ]]> */
+ </script>
</div>
<div class="main">
@@ -241,13 +227,13 @@
<p class="navigation-index">[<a href="compare.html#usage">Example Usage</a> • <a href="compare.html#options">Option Summary</a>]</p>
<div class="doc-section">
-<p>Use the <kbd>compare</kbd> program to mathematically and visually annotate the difference between an image and its reconstruction. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <kbd>compare</kbd> command or see below for example usages of the command.</p>
+<p>Use the <code>compare</code> program to mathematically and visually annotate the difference between an image and its reconstruction. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <code>compare</code> command or see below for example usages of the command.</p>
</div>
<h2><a id="usage"></a>Example Usage</h2>
<div class="doc-section">
-<p>We list a few examples of the <kbd>compare</kbd> command here to illustrate its usefulness and ease of use. To get started, lets compare an image to one thats been sharpened:</p>
+<p>We list a few examples of the <code>compare</code> command here to illustrate its usefulness and ease of use. To get started, lets compare an image to one thats been sharpened:</p>
<p class='crt'><span class="crtprompt"> $ </span><span class='crtin'>convert rose.jpg -sharpen 0x1 reconstruct.jpg</span><span class='crtout'></span><span class="crtprompt"> $ </span><span class='crtin'>compare rose.jpg reconstruct.jpg difference.png</span><span class='crtout'></span><span class="crtprompt"> $ </span><span class='crtin'>compare -compose src rose.jpg reconstruct.jpg difference.png</span></p>
<div class="image">
@@ -277,13 +263,13 @@
<p>If the reconstructed image is a subimage of the image, the compare program returns the best match offset. In addition, it returns a similarity image such that an exact match location is completely white and if none of the pixels match, black, otherwise some gray level in-between:</p>
<p class='crt'><span class="crtprompt"> $ </span><span class='crtin'>compare -metric RMSE -subimage-search logo.png wizard.jpg similarity.gif</span><span class='crtout'>85.05 (0.00129778) @ 353,157</span></p>
-<p>You can find additional examples of using <kbd>compare</kbd> in <a href="http://www-106.ibm.com/developerworks/library/l-graf/?ca=dnt-428">Graphics from the Command Line</a>. Further discussion is available in <a href="http://www-106.ibm.com/developerworks/library/l-graf2/?ca=dgr-lnxw15GraphicsLine">More Graphics from the Command Line</a> and <a href="http://www.imagemagick.org/Usage/">Examples of ImageMagick Usage</a>.</p>
+<p>You can find additional examples of using <code>compare</code> in <a href="http://www-106.ibm.com/developerworks/library/l-graf/?ca=dnt-428">Graphics from the Command Line</a>. Further discussion is available in <a href="http://www-106.ibm.com/developerworks/library/l-graf2/?ca=dgr-lnxw15GraphicsLine">More Graphics from the Command Line</a> and <a href="http://www.imagemagick.org/Usage/">Examples of ImageMagick Usage</a>.</p>
</div>
<h2><a id="options"></a>Option Summary</h2>
<div class="doc-section">
-<p>The <kbd>compare</kbd> command recognizes these options. Click on an option to get more details about how that option works.</p>
+<p>The <code>compare</code> command recognizes these options. Click on an option to get more details about how that option works.</p>
<table class="doc">
<tbody>
@@ -344,7 +330,7 @@
</tr>
<tr>
- <td valign="top"><a href="command-line-options.html#disimilarity-threshold">-disimilarity-threshold <em class="option">value</em></a></td>
+ <td valign="top"><a href="command-line-options.html#dissimilarity-threshold">-dissimilarity-threshold <em class="option">value</em></a></td>
<td valign="top">maximum distortion for (sub)image match (default 0.2)</td>
</tr>
@@ -449,6 +435,11 @@
</tr>
<tr>
+ <td valign="top"><a href="command-line-options.html#similarity-threshold">-similarity-threshold <em class="option">value</em></a></td>
+ <td valign="top">minimum distortion for (sub)image match (default 0.0)</td>
+ </tr>
+
+ <tr>
<td valign="top"><a href="command-line-options.html#size">-size <em class="option">geometry</em></a></td>
<td valign="top">width and height of image</td>
</tr>
@@ -496,9 +487,11 @@
<div id="linkbar">
<span id="linkbar-west"> </span>
+
<span id="linkbar-center">
- <a href="../discourse-server">Discourse Server</a> •
- <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>
+ <a href="http://www.imagemagick.org/discourse-server/">Discourse Server</a> •
+ <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a> •
+ <a href="http://jqmagick.imagemagick.org/">JqMagick</a>
</span>
<span id="linkbar-east"> </span>
</div>
@@ -507,16 +500,5 @@
<span id="footer-east"> <a href="contact.html">Contact the Wizards</a></span>
</div>
<div style="clear: both; margin: 0; width: 100%; "></div>
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-17690367-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('offline-script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.localhost/ga.js';
- var s = document.getElementsByTagName('offline-script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
</body>
</html>