diff --git a/www/compare.html b/www/compare.html
index b4df012..6d404fa 100644
--- a/www/compare.html
+++ b/www/compare.html
@@ -1,47 +1,54 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="-//W3C//DTD XHTML 1.1//EN" xml:lang="en" xsi:schemaLocation="http://www.w3.org/1999/xhtml http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html version="-//W3C//DTD XHTML 1.1//EN"
+ xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.w3.org/1999/xhtml
+ http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"></meta>
- <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"></meta>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+ <meta name=viewport content="width=device-width, initial-scale=0.3333334">
+ <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"/>
<title>ImageMagick: Command-line Tools: Compare</title>
- <meta http-equiv="content-language" content="en-US"></meta>
- <meta http-equiv="content-type" content="text/html; charset=utf-8"></meta>
- <meta http-equiv="reply-to" content="magick-users@imagemagick.org"></meta>
- <meta name="application-name" content="ImageMagick"></meta>
- <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>
- <meta name="application-url" content="http://www.imagemagick.org"></meta>
- <meta name="generator" content="PHP"></meta>
- <meta name="keywords" content="command-line, tools:, compare, ImageMagick, PerlMagick, image processing, OpenMP, software development library, image, photo, software, Magick++, MagickWand"></meta>
- <meta name="rating" content="GENERAL"></meta>
- <meta name="robots" content="INDEX, FOLLOW"></meta>
- <meta name="generator" content="ImageMagick Studio LLC"></meta>
- <meta name="author" content="ImageMagick Studio LLC"></meta>
- <meta name="revisit-after" content="2 DAYS"></meta>
- <meta name="resource-type" content="document"></meta>
- <meta name="copyright" content="Copyright (c) 1999-2012 ImageMagick Studio LLC"></meta>
- <meta name="distribution" content="Global"></meta>
- <link rel="icon" href="../images/wand.png"></link>
- <link rel="shortcut icon" href="../images/wand.ico" type="images/x-icon"></link>
- <link rel="canonical" href="http://www.imagemagick.org"></link>
- <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"></link>
+ <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="A collection of tools and libraries to read, write, and manipulate an image in any of the more popular image formats."/>
+ <meta name="application-url" content="http://www.imagemagick.org"/>
+ <meta name="generator" content="PHP"/>
+ <meta name="keywords" content="command-line, tools:, compare, convert, edit, compose, image, pixel"/>
+ <meta name="rating" content="GENERAL"/>
+ <meta name="robots" content="INDEX, FOLLOW"/>
+ <meta name="generator" content="ImageMagick Studio LLC"/>
+ <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-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://localhost/ajax/libs/jquery/2.1.0/jquery.min.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/source/jquery.fancybox.css?v=2.0.6" type="text/css" media="screen"></link>
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.0.6"></script>
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/jquery.fancybox.css?v=2.1.5" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.1.5"></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"></link>
- <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/source/helpers/jquery.fancybox-buttons.css?v=1.0.5" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.js?v=1.0.5"></script>
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-media.js?v=1.0.6"></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"></link>
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.js?v=2.0.6"></script>
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.css?v=1.0.7" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.js?v=1.0.7"></script>
<script type="text/javascript">
$(document).ready(function() {
@@ -57,7 +64,15 @@
<body id="www-imagemagick-org">
+<script type="text/javascript">
+ (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','//www.google-analytics.com/analytics.js','ga');
+ ga('create', 'UA-40133312-1', 'imagemagick.org');
+ ga('send', 'pageview');
+</script>
<div class="titlebar">
<div style="margin: 17px auto; float: left;">
@@ -69,12 +84,18 @@
google_ad_height = 90;
//-->
</script>
-
+ <script type="text/javascript"
+ src="http://localhost/pagead/show_ads.js">
+ </script>
</div>
<a href="../discourse-server">
- <img src="../images/logo.jpg" alt="ImageMagick Logo" style="width: 123px; height: 118px; border: 0px; float: right;"></img></a>
+ <img src="../images/logo.jpg"
+ alt="ImageMagick Logo" width="123" height="118"
+ style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
<a href="http://www.imagemagick.org/ImageMagick-7.0.0/index.html">
- <img src="../images/sprite.jpg" alt="ImageMagick Sprite" style="width: 114px; height: 118px; border: 0px; float: right;"></img></a>
+ <img src="../images/sprite.jpg"
+ alt="ImageMagick Sprite" width="114" height="118"
+ style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
</div>
<div class="westbar">
@@ -126,7 +147,7 @@
<a title="Program Interface: Magick++" href="magick++.html">Magick++</a>
</div>
<div class="sep"></div>
-<div class="menu">
+<div class="menu">
<a title="Install from Source" href="install-source.html">Install from Source</a>
</div>
<div class="sub">
@@ -152,21 +173,50 @@
<div class="menu">
<a title="Site Map" href="sitemap.html">Site Map</a>
</div>
-<div class="sub">
+<div class="sub">
<a title="Site Map: Links" href="links.html">Links</a>
</div>
<div class="sep"></div>
</div>
<div class="eastbar">
-
+ <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://apis.google.com/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>
+ <script type="text/javascript">
+ /* <![CDATA[ */
+ (function() {
+ 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);
+ })();
+ /* ]]> */
+ </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"></img></a>
+ <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" data-size="standard" data-count="true"></div>
</div>
<div class="main">
@@ -183,13 +233,13 @@
<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"> $magick> </span><span class="crtin">convert rose.jpg -sharpen 0x1 reconstruct.jpg</span><span class="crtout"></span><span class="crtprompt"> $magick> </span><span class="crtin">compare rose.jpg reconstruct.jpg difference.png</span><span class="crtout"></span><span class="crtprompt"> $magick> </span><span class="crtin">compare -compose src rose.jpg reconstruct.jpg difference.png</span></p>
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>convert rose.jpg -sharpen 0x1 reconstruct.jpg</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>compare rose.jpg reconstruct.jpg difference.png</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>compare -compose src rose.jpg reconstruct.jpg difference.png</span></p>
<div class="image">
<p>
- <a href="../images/rose.jpg"><img src="../images/rose.jpg" width="70" height="46" alt="rose"></img></a>
- <a href="../images/reconstruct.jpg"><img src="../images/reconstruct.jpg" width="70" height="46" alt="rose"></img></a>
- <img style="margin:13px 0;" src="../images/right.gif" width="20" height="20" alt="==>"></img>
- <a href="../images/difference.png"><img src="../images/difference.png" width="70" height="46" alt="rose"></img></a>
+ <a href="../images/rose.jpg"><img src="../images/rose.jpg" width="70" height="46" alt="rose" /></a>
+ <a href="../images/reconstruct.jpg"><img src="../images/reconstruct.jpg" width="70" height="46" alt="rose" /></a>
+ <img style="margin:13px 0;" src="../images/right.gif" width="20" height="20" alt="==>" />
+ <a href="../images/difference.png"><img src="../images/difference.png" width="70" height="46" alt="rose" /></a>
</p>
</div>
@@ -197,21 +247,21 @@
<p>In addition to the visual interpretation of the difference in an image and its reconstruction, we report a mathematical measure of the difference:</p>
-<p class="crt"><span class="crtprompt"> $magick> </span><span class="crtin">compare -verbose -metric mae rose.jpg reconstruct.jpg difference.png</span><span class="crtout">Image: rose.jpg <br></br>
- Channel distortion: MAE <br></br>
- red: 2282.91 (0.034835) <br></br>
- green: 1853.99 (0.0282901) <br></br>
- blue: 2008.67 (0.0306503) <br></br>
- all: 1536.39 (0.0234439) <br></br></span></p><p>Or, if you just want the red channel distortion, use this command:</p>
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>compare -verbose -metric mae rose.jpg reconstruct.jpg difference.png</span><span class='crtout'>Image: rose.jpg <br/>
+ Channel distortion: MAE <br/>
+ red: 2282.91 (0.034835) <br/>
+ green: 1853.99 (0.0282901) <br/>
+ blue: 2008.67 (0.0306503) <br/>
+ all: 1536.39 (0.0234439) <br/></span></p><p>Or, if you just want the red channel distortion, use this command:</p>
-<p class="crt"><span class="crtprompt"> $magick> </span><span class="crtin">compare -channel red -metric PSNR rose.jpg reconstruct.jpg difference.png</span><span class="crtout">19.63</span></p>
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>compare -channel red -metric PSNR rose.jpg reconstruct.jpg difference.png</span><span class='crtout'>19.63</span></p>
<p>Or, if you just want the overall image distortion, use this command:</p>
-<p class="crt"><span class="crtprompt"> $magick> </span><span class="crtin">compare -metric PSNR rose.jpg reconstruct.jpg difference.png</span><span class="crtout">28.31</span></p>
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>compare -metric PSNR rose.jpg reconstruct.jpg difference.png</span><span class='crtout'>28.31</span></p>
<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"> $magick> </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 <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>
+<p class='crt'><span class="crtprompt"> $magick> </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 <code>compare</code> in <a href="http://www.ibm.com/developerworks/library/l-graf/?ca=dnt-428">Graphics from the Command Line</a>. Further discussion is available in <a href="http://www.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>The compare program returns 2 on error otherwise 0 if the images are similar or 1 if they are dissimilar.</p>
</div>
@@ -439,15 +489,15 @@
<span id="linkbar-west"> </span>
<span id="linkbar-center">
- <a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../discourse-server">Discourse Server</a> •
+ <a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</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>
<div class="footer">
- <span id="footer-west">© 1999-2013 ImageMagick Studio LLC</span>
+ <span id="footer-west">© 1999-2014 ImageMagick Studio LLC</span>
<span id="footer-east"> <a href="contact.html">Contact the Wizards</a></span>
</div>
<div style="clear: both; margin: 0; width: 100%; "></div>