diff --git a/www/magick++.html b/www/magick++.html
index ddbe81f..e38fae3 100644
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -7,25 +7,25 @@
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 http-equiv="content-type" content="text/html; charset=UTF-8"/>
<meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>
<title>ImageMagick: Magick++, C++ API for ImageMagick</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="Application-url" content="http://www.imagemagick.org"/>
- <meta name="Generator" content="PHP"/>
- <meta name="Keywords" content="magick++, c++, api, for, imagemagick, ImageMagick, PerlMagick, image processing, OpenMP, software development library, image, photo, software, Magick++, MagickWand"/>
- <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"/>
+ <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="application-url" content="http://www.imagemagick.org"/>
+ <meta name="generator" content="PHP"/>
+ <meta name="keywords" content="magick++, c++, api, for, imagemagick, ImageMagick, PerlMagick, image processing, OpenMP, software development library, image, photo, software, Magick++, MagickWand"/>
+ <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" />
@@ -38,15 +38,15 @@
<script type="text/javascript" src="http://www.imagemagick.org/fancybox/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.3" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.3"></script>
+ <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>
<!-- Optionaly include button and/or thumbnail helpers -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.3" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.3"></script>
+ <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>
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.3" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.3"></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>
<script type="text/javascript">
$(document).ready(function() {
$(".fancybox").fancybox();
@@ -74,7 +74,7 @@
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
-<a href="http://www.imagemagick.org/discourse-server/">
+<a href="../discourse-server">
<img src="../images/logo.jpg"
alt="ImageMagick Logo"
style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
@@ -90,163 +90,159 @@
<a title="About ImageMagick" href="../index.html">About ImageMagick</a>
</div>
<div class="menu">
- <a title="Binary Releases" href="../www/binary-releases.html">Binary Releases</a>
+ <a title="Binary Releases" href="binary-releases.html">Binary Releases</a>
</div>
<div class="sub">
- <a title="Binary Release: Unix" href="../www/binary-releases.html#unix">Unix</a>
+ <a title="Binary Release: Unix" href="binary-releases.html#unix">Unix</a>
</div>
<div class="sub">
- <a title="Binary Release: MacOS X" href="../www/binary-releases.html#macosx">Mac OS X</a>
+ <a title="Binary Release: MacOS X" href="binary-releases.html#macosx">Mac OS X</a>
</div>
<div class="sub">
- <a title="Binary Release: iOS" href="../www/binary-releases.html#iOS">iOS</a>
+ <a title="Binary Release: iOS" href="binary-releases.html#iOS">iOS</a>
</div>
<div class="sub">
- <a title="Binary Release: Windows" href="../www/binary-releases.html#windows">Windows</a>
+ <a title="Binary Release: Windows" href="binary-releases.html#windows">Windows</a>
</div>
<div class="sep"></div>
<div class="menu">
- <a title="Command-line Tools" href="../www/command-line-tools.html">Command-line Tools</a>
+ <a title="Command-line Tools" href="command-line-tools.html">Command-line Tools</a>
</div>
<div class="sub">
- <a title="Command-line Tools: Processing" href="../www/command-line-processing.html">Processing</a>
+ <a title="Command-line Tools: Processing" href="command-line-processing.html">Processing</a>
</div>
<div class="sub">
- <a title="Command-line Tools: Options" href="../www/command-line-options.html">Options</a>
+ <a title="Command-line Tools: Options" href="command-line-options.html">Options</a>
</div>
<div class="sub">
<a title="Command-line Tools: Usage" href="http://www.imagemagick.org/Usage/">Usage</a>
</div>
<div class="menu">
- <a title="Program Interfaces" href="../www/api.html">Program Interfaces</a>
+ <a title="Program Interfaces" href="api.html">Program Interfaces</a>
</div>
<div class="sub">
- <a title="Program Interface: MagickWand" href="../www/magick-wand.html">MagickWand</a>
+ <a title="Program Interface: MagickWand" href="magick-wand.html">MagickWand</a>
</div>
<div class="sub">
- <a title="Program Interface: MagickCore" href="../www/magick-core.html">MagickCore</a>
+ <a title="Program Interface: MagickCore" href="magick-core.html">MagickCore</a>
</div>
<div class="sub">
- <a title="Program Interface: PerlMagick" href="../www/perl-magick.html">PerlMagick</a>
+ <a title="Program Interface: PerlMagick" href="perl-magick.html">PerlMagick</a>
</div>
<div class="sub">
- <a title="Program Interface: Magick++" href="../www/magick++.html">Magick++</a>
+ <a title="Program Interface: Magick++" href="magick++.html">Magick++</a>
</div>
<div class="sep"></div>
<div class="menu">
- <a title="Install from Source" href="../www/install-source.html">Install from Source</a>
+ <a title="Install from Source" href="install-source.html">Install from Source</a>
</div>
<div class="sub">
- <a title="Install from Source: Unix" href="../www/install-source.html#unix">Unix</a>
+ <a title="Install from Source: Unix" href="install-source.html#unix">Unix</a>
</div>
<div class="sub">
- <a title="Install from Source: Windows" href="../www/install-source.html#windows">Windows</a>
+ <a title="Install from Source: Windows" href="install-source.html#windows">Windows</a>
</div>
<div class="menu">
- <a title="Resources" href="../www/resources.html">Resources</a>
+ <a title="Resources" href="resources.html">Resources</a>
</div>
<div class="menu">
- <a title="Architecture" href="../www/architecture.html">Architecture</a>
+ <a title="Architecture" href="architecture.html">Architecture</a>
</div>
<div class="menu">
- <a title="Download" href="../www/download.html">Download</a>
+ <a title="Download" href="download.html">Download</a>
</div>
<div class="sep"></div>
<div class="menu">
- <a title="Search" href="../www/search.html">Search</a>
+ <a title="Search" href="search.html">Search</a>
</div>
<div class="sep"></div>
<div class="menu">
- <a title="Site Map" href="../www/sitemap.html">Site Map</a>
+ <a title="Site Map" href="sitemap.html">Site Map</a>
</div>
<div class="sub">
- <a title="Site Map: Links" href="../www/links.html">Links</a>
+ <a title="Site Map: Links" href="links.html">Links</a>
</div>
<div class="sep"></div>
<div class="menu">
- <a rel="follow" title="Sponsors" href="../www/sponsors.html">Sponsors:</a>
+ <a rel="follow" title="Sponsors" href="sponsors.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><!-- 201204010120 mickey@163... -->
+ <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="Android Tablet" href="http://www.dinodirect.com/ipads-tablets/">Android Tablet</a><!-- 201204010120 mickey@163... -->
+ <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: Web Hosting" href="http://www.micfo.com">Web Hosting</a><!-- 209901010090s golestan -->
+ <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="Sponsor: Autos Part" href="http://www.pkwteile.de/autoteile">Autos Part</a><!-- 201203010270 info@pkwte... -->
+ <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: Tenant Check" href="http://www.rentmethod.com/">Tenant Check</a><!-- 201203010090 chris@rentm... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: VPS" href="http://www.interdominios.com/vps">VPS</a><!-- 201204010090 barsh@inter... -->
-</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: Search engine optimisation" href="http://www.seomoves.com.au">Search engine optimisation</a><!-- 201301010090s jen@seo lowprofilelinks -->
-</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: Stock Photography" href="http://www.fotosearch.com/">Stock Photography</a><!-- 2012040100250 ... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Autoteile" href="http://www.q11-shop.de">Autoteile</a><!-- 201205010540 suvalj -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Royalty Free Stock Images" href="http://www.canstockphoto.com/">Royalty Free Stock Images</a><!-- 2012050100360 support@can -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Web Hosting Reviews" href="http://www.webhostingsecretrevealed.com">Web Hosting Secret Revealed</a><!-- 201204010540 iamchee jerry -->
-</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: Turbolader Online kaufen" href="http://www.autoteile-carparts.de">Turbolader Online kaufen</a><!-- 2012050100150 t.temurbas...-->
+ <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: Web Hosting" href="http://www.hostucan.com">Web Hosting</a><!-- 2012030100300 accounting@webhostingclue -->
+ <a rel="follow" title="Sponsor: Web Hosting" href="http://www.hostucan.com">Web Hosting</a><!-- 2012120100150 racent marketing@webhosting...-->
</div>
</div>
</div>
</div>
<div class="eastbar">
- <div class="g-plusone" data-size="standard" data-count="false"></div>
+ <div class="g-plusone" id="gplusone"></div>
<script type="text/javascript">
window.___gcfg = {
lang: 'en-US'
};
(function() {
- var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+ var po = document.createElement('script');
+ po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+ var script = document.getElementsByTagName('script')[0];
+ script.parentNode.insertBefore(po, script);
})();
+ var gplusone = document.getElementById("gplusone");
+ gplusone.setAttribute("data-size","medium");
+ gplusone.setAttribute("data-count","false");
</script>
</div>
<div class="main">
<h1>Magick++ C++ API</h1>
-<p class="navigation-index">[<a href="#intro">Introduction to Magick++</a> • <a href="#documentation">Documentation</a> • <a href="#get">Obtaining Magick++</a> • <a href="#install">Installation</a> • <a href="#bugs">Reporting Bugs</a>]</p>
+<p class="navigation-index">[<a href="magick++.html#intro">Introduction to Magick++</a> • <a href="magick++.html#documentation">Documentation</a> • <a href="magick++.html#get">Obtaining Magick++</a> • <a href="magick++.html#install">Installation</a> • <a href="magick++.html#bugs">Reporting Bugs</a>]</p>
<div class="doc-section">
<a id="intro"></a>
<p>Magick++ is the object-oriented C++ API to the <a href="http://www.imagemagick.org/">ImageMagick</a> image-processing library.</p>
-<p>Magick++ supports an object model which is inspired by <a href="http://www.imagemagick.org/www/perl-magick.html">PerlMagick</a>.
+<p>Magick++ supports an object model which is inspired by <a href="perl-magick.html">PerlMagick</a>.
Images support implicit reference counting so that copy constructors
and assignment incur almost no cost. The cost of actually copying an
image (if necessary) is done just before modification and this copy
@@ -277,8 +273,8 @@
<a id="get"></a>
<div class="doc-section">
<p>Magick++ is included as part of <a href="../index.html">ImageMagick</a>
-source releases and may be retrieved via <a href="http://www.imagemagick.org/www/download.html">ftp</a>
-or <a href="http://www.imagemagick.org/www/subversion.html">Subversion</a>.
+source releases and may be retrieved via <a href="download.html">ftp</a>
+or <a href="subversion.html">Subversion</a>.
</p>
</div>
<h2>Installation</h2>
@@ -288,6 +284,9 @@
<a href="../www/Magick++/Install.html">installation instructions</a> for UNIX and
Windows.
</p>
+</div>
+<h2>Usage</h2>
+<div class="doc-section">
<p>A helper script named <kbd>Magick++-config</kbd> is installed
under Unix which assists with recalling compilation options required
to compile and link programs which use Magick++. For example, the
@@ -326,14 +325,14 @@
<div id="linkbar">
<span id="linkbar-west"> </span>
<span id="linkbar-center">
- <a href="http://www.imagemagick.org/discourse-server/">Discourse Server</a> •
+ <a href="../discourse-server">Discourse Server</a> •
<a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>
</span>
<span id="linkbar-east"> </span>
</div>
<div class="footer">
- <span id="footer-west">© 1999-2011 ImageMagick Studio LLC</span>
- <span id="footer-east"> <a href="http://www.imagemagick.org/script/contact.php">Contact the Wizards</a></span>
+ <span id="footer-west">© 1999-2012 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>
<script type="text/javascript">