(no commit message)

diff --git a/Magick++/INSTALL b/Magick++/INSTALL
index 97fc16ca21470126752300917d63433c46ee1e10..7a36be0898697dc1d721c8f5e9d7f5feed538027 100644 (file)
--- a/Magick++/INSTALL
+++ b/Magick++/INSTALL
@@ -136,14 +136,9 @@ shows the available options.
 
 Installing Linux RPMs
 
-Dr. Alexander Zimmermann maintains Linux RPMs of ImageMagick and Magick++.
-These may be downloaded from
-ftp://ftp.forwiss.uni-passau.de/pub/linux/local/ImageMagick/. This site is
-mirrored periodically to the ImageMagick linux directory and from there to
-the many ImageMagick and Linux mirror sites. Please note that the default
-version of the C++ compiler delivered with the system may not be sufficient
-to support Magick++. Use of GCC 2.95 or later is strongly recommended under
-Linux.
+Please note that the default version of the C++ compiler delivered with the
+system may not be sufficient to support Magick++. Use of GCC 2.95 or later is
+strongly recommended under Linux.
   ------------------------------------------------------------------------
 
                        Windows '9X, NT, 2000, ME, & XP

diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html
index 2b403073f2f32b016e62ebb167a8496ce0fed4bc..aa506554fcbcda912f9ad67749faa3fdccd8dfda 100644 (file)
--- a/www/ImageMagickObject.html
+++ b/www/ImageMagickObject.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index 1721c35f2aca5bfcb20887aa549f62422bc166a4..ded72cb274c0d51b3354017aa4862be45c13e191 100644 (file)
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>
@@ -418,7 +418,7 @@
 <h3>Prerequisites</h3>
 
        <ol>
-       <li>Download and install <a href="http://www.jrsoftware.org/isinfo.html">Inno Setup 5</a>.</li>
+       <li>Download and install <a href="http://www.jrsoftware.org/isdl.html">Inno Setup 5</a>.</li>
        <li>Download and install <a href="http://www.activestate.com/activeperl/downloads">ActiveState ActivePerl</a>.</li>
        </ol>
 

diff --git a/www/animate.html b/www/animate.html
index 28552dc1025051a2c4493714709c5782bf1b00c4..6b69304312af8dfe3abbfa041dfcb751c6834e63 100644 (file)
--- a/www/animate.html
+++ b/www/animate.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api.html b/www/api.html
index c366934e1e971c660c96ff36b3002ec20dc2a990..e7b02da212829520e8b95bc181a8d4e40382aa60 100644 (file)
--- a/www/api.html
+++ b/www/api.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>
@@ -244,7 +244,7 @@
 
   <dt><a id="pascal"></a>Pascal</dt>
 
-<dd><a href="http://wiki.lazarus.freepascal.org/PascalMagick">PascalMagick</a> a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.</dd>
+<dd><a href="http://wiki.freepascal.org/PascalMagick">PascalMagick</a> a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.</dd>
 
   <dt><a id="perl"></a>Perl</dt>
 

diff --git a/www/api/animate.html b/www/api/animate.html
index 994acd77649fe4fc5fda1f054161d20e5bc0fcaa..a952c1ea65317cdf38656988d97e529b3a060c08 100644 (file)
--- a/www/api/animate.html
+++ b/www/api/animate.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/annotate.html b/www/api/annotate.html
index 23a7f333e258ca618861687c77ce2bc7d679ba55..3f3cbbe603ca7d668f737a62d948f23f913f4e55 100644 (file)
--- a/www/api/annotate.html
+++ b/www/api/annotate.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/attribute.html b/www/api/attribute.html
index ce92b63a5bae9e2b4e45cb85646e7f8516500322..23a820ebb979087a28c252b34aa84c3f6484e783 100644 (file)
--- a/www/api/attribute.html
+++ b/www/api/attribute.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
 </div>
 </div>
 </div>

diff --git a/www/api/cache-view.html b/www/api/cache-view.html
index 1ddc8bb753ebc1659864d15fb94c8b23e4c50c8f..b1252e485b76e2cec0986eea5b765680517d5b18 100644 (file)
--- a/www/api/cache-view.html
+++ b/www/api/cache-view.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/cache.html b/www/api/cache.html
index 1580cd91dbe285fef0baa1cb00473d4eaa8b4f07..78257bbfdaf8f33051146a0d215dad9f1b617645 100644 (file)
--- a/www/api/cache.html
+++ b/www/api/cache.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/cipher.html b/www/api/cipher.html
index 6316d63378e2a1ca5f29651af0998a5aafa95712..eea227ac09264fffcc7793d83793bd22a0ece465 100644 (file)
--- a/www/api/cipher.html
+++ b/www/api/cipher.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/color.html b/www/api/color.html
index 1f7319eddbc1ccc3455b72f09168c84ae69927ab..1a117f9f153c8d5a97df5f23b6e8e11d24daf9df 100644 (file)
--- a/www/api/color.html
+++ b/www/api/color.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/api/colormap.html b/www/api/colormap.html
index 29798ee3353b6ea20f721a9fa4823a2d944a6e98..c87a796c1d6c4f4489a66b6956ff125cc358fe1d 100644 (file)
--- a/www/api/colormap.html
+++ b/www/api/colormap.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/colorspace.html b/www/api/colorspace.html
index 8b6cdc22fe867c93e59c767058b53c4aa505f2e4..069d7669f3c3a61ff9162a031077c379d02fae37 100644 (file)
--- a/www/api/colorspace.html
+++ b/www/api/colorspace.html
@@ -56,7 +56,7 @@
       <a href="../../www/magick-wand.html" class="sub">MagickWand</a>
       <a href="../../www/magick-core.html" class="sub">MagickCore</a>
       <a href="../../www/perl-magick.css" class="sub">PerlMagick</a>
-      <a href="../../Magick++/" target="663201872" class="sub">Magick++</a>
+      <a href="../../www/Magick++/" target="663201872" class="sub">Magick++</a>
       <a href="../../www/architecture.html">Architecture</a>
   <span>]</span><br /><span>[</span>
       <a href="../../www/install-source.html">Install from Source</a>

diff --git a/www/api/compare.html b/www/api/compare.html
index 9d90537d4d270b8ae3415f5f783e62ce998ea0cb..79a61687378ab02a3a0f4edd13a4c3e19bd077be 100644 (file)
--- a/www/api/compare.html
+++ b/www/api/compare.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/composite.html b/www/api/composite.html
index 8f5446beb1bfc7953a31585313ae6a00de2efdac..f1d54e1b1ce70bca1898ce8a4f9e5cc4ce8509c0 100644 (file)
--- a/www/api/composite.html
+++ b/www/api/composite.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
 </div>
 </div>
 </div>

diff --git a/www/api/constitute.html b/www/api/constitute.html
index 362b333fec3e5f3a207cad1feb6d45d7620c867d..d5bf929f395495a0c19618c7551a503af39d16db 100644 (file)
--- a/www/api/constitute.html
+++ b/www/api/constitute.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/decorate.html b/www/api/decorate.html
index bc308a196d892a08e6f69a19399449574492a463..9f05731b7bd74ec5c1e61c7547a656d4948f45a0 100644 (file)
--- a/www/api/decorate.html
+++ b/www/api/decorate.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/api/deprecate.html b/www/api/deprecate.html
index b5a8a0bce15f30de6cbe405e5fd651bbb1b34232..88b7c7a661d95a035317e20777a3f58c25cced3b 100644 (file)
--- a/www/api/deprecate.html
+++ b/www/api/deprecate.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/display.html b/www/api/display.html
index 9761f6118669ca589522a5ff78bb7c933059fc3a..698230b5058e5c5618dc25e9d93978e858ee00df 100644 (file)
--- a/www/api/display.html
+++ b/www/api/display.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/distort.html b/www/api/distort.html
index 5309d851772dc56403f20cd766efb6e08f22633e..d809209401d5d0f9b47e86de74b1962728196075 100644 (file)
--- a/www/api/distort.html
+++ b/www/api/distort.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html
index 4af0255b7b4dd6bbe3ac4167461bff418b7b07d2..d7e658d0928864bed40ac1c346e2b79f87ff92de 100644 (file)
--- a/www/api/drawing-wand.html
+++ b/www/api/drawing-wand.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
 </div>
 </div>
 </div>

diff --git a/www/api/enhance.html b/www/api/enhance.html
index 248abfff1d83796181b934c687b0d033544ad13f..2b4f785cc5333b037e21b6dbdbcb356e5059072d 100644 (file)
--- a/www/api/enhance.html
+++ b/www/api/enhance.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/api/exception.html b/www/api/exception.html
index 0a21518067cf4e5185db86ce90dd9c06c97ba648..ab8a448d39e5428f082b7d1cf16c5ed9eddd26ab 100644 (file)
--- a/www/api/exception.html
+++ b/www/api/exception.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/feature.html b/www/api/feature.html
index b53f77cb01d63497aa95d238283d542872cdc401..0e875ff87180ad2cf666a1a98c66e9b1b1e1091c 100644 (file)
--- a/www/api/feature.html
+++ b/www/api/feature.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/fourier.html b/www/api/fourier.html
index 8e6a3dcbad8587f226a198d27fdbef9b70ee102c..66004ff47aba589bf31812c7c5686a877861fbdb 100644 (file)
--- a/www/api/fourier.html
+++ b/www/api/fourier.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/fx.html b/www/api/fx.html
index 724844b5f0667e7616eb2512f167afbfb2085e99..e0f7d91e7a928052f69fba5359368bcc6a2071a4 100644 (file)
--- a/www/api/fx.html
+++ b/www/api/fx.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/api/histogram.html b/www/api/histogram.html
index ac1d2d5ef10f7c82f8b328d52ebdc71c1037e0fa..80b421ea807a323ecccb65913968c061bce31619 100644 (file)
--- a/www/api/histogram.html
+++ b/www/api/histogram.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/image-view.html b/www/api/image-view.html
index 9f643d827b6bb52d241a7fd8f2f6ee474863ceae..c93b903e9a46b5f1ccb853cd3d08ce9a52513b51 100644 (file)
--- a/www/api/image-view.html
+++ b/www/api/image-view.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/api/layer.html b/www/api/layer.html
index 206be277e30297786261aad5b41a5e2dd5de12af..c6df7da858fae572e7219571d64d6eb6d4b8adf1 100644 (file)
--- a/www/api/layer.html
+++ b/www/api/layer.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/api/list.html b/www/api/list.html
index e4b474983cc627d043df70c56c0cea0809bae538..c7e31d7887f60cd64a8f1c93c298f258acc3dc30 100644 (file)
--- a/www/api/list.html
+++ b/www/api/list.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html
index 926ebc55a68b9e3639c78612f640c626d507d6c2..89735d58d4c5d37dee5912ee691dacf783206277 100644 (file)
--- a/www/api/magick-deprecate.html
+++ b/www/api/magick-deprecate.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/magick-image.html b/www/api/magick-image.html
index add004fc8bf34503007dcbdfbf286bb96ef9a4e8..29ca181c6712a293aab226fdcf6475e5d342ee95 100644 (file)
--- a/www/api/magick-image.html
+++ b/www/api/magick-image.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/magick-property.html b/www/api/magick-property.html
index 5de22c22ef8775f12e3624a39159bf96204f7a4c..9b0b978f16afbbb0773a804f224f89cd2e0d1bcb 100644 (file)
--- a/www/api/magick-property.html
+++ b/www/api/magick-property.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html
index 9806d90123121cf1145572d4cfbe62067d88e829..3df4be94d7661460b67a0d62283b0ba1d1f8d272 100644 (file)
--- a/www/api/magick-wand.html
+++ b/www/api/magick-wand.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/memory.html b/www/api/memory.html
index 1051f592410763f05dd1c8c41a90b1c7dd26948b..11d8b52a5d901700511174d07f7cf8f6b49b386d 100644 (file)
--- a/www/api/memory.html
+++ b/www/api/memory.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/module.html b/www/api/module.html
index a386f426cae3b2ebea6d1a5dd774002b6725ac09..0cacee947d8d777e9a87e4a89363bae9b2755852 100644 (file)
--- a/www/api/module.html
+++ b/www/api/module.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/monitor.html b/www/api/monitor.html
index 08ca65746712687376c45783cf4c7933e3b70d20..e3a72a9215043d284bf5ce80667e3fe6e5b34e9e 100644 (file)
--- a/www/api/monitor.html
+++ b/www/api/monitor.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/api/paint.html b/www/api/paint.html
index 369b8ec7663c10f7fbe079e39d019bc848e3f53a..24c81139c364284965f69924328c30d027759db2 100644 (file)
--- a/www/api/paint.html
+++ b/www/api/paint.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html
index 20a1fa6a62201110d28e4c6a5add2f3f64bbdc04..540046e3e851815303e0164f2d5da1259f9d0a2a 100644 (file)
--- a/www/api/pixel-iterator.html
+++ b/www/api/pixel-iterator.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
 </div>
 </div>
 </div>

diff --git a/www/api/pixel-view.html b/www/api/pixel-view.html
index 63857479fe7d46883fc4321bcc93dd7bbd1f1599..cfc556c22bdb7f40e8fada6cbcdf7d4ed4aa82b7 100644 (file)
--- a/www/api/pixel-view.html
+++ b/www/api/pixel-view.html
@@ -86,7 +86,7 @@
     <a title="Program Interface: PerlMagick" href="../../www/perl-magick.html">PerlMagick</a>
 </div>
 <div class="sub">
-    <a title="Program Interface: Magick++" href="../../Magick++/">Magick++</a>
+    <a title="Program Interface: Magick++" href="../../www/Magick++/">Magick++</a>
 </div>
 <div class="sep"></div>\r
 <div  class="menu">

diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html
index 7b8194ce4fa9b2f6433be0831e638c315c1b3502..c88e9c1b756adafac3d08eccf6f9b757497a1086 100644 (file)
--- a/www/api/pixel-wand.html
+++ b/www/api/pixel-wand.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/profile.html b/www/api/profile.html
index 01ec750daaa9275c11c264e67da1b58ff1f5d763..3f7213c5a81e0355858a244967c2c87d1cffbf5e 100644 (file)
--- a/www/api/profile.html
+++ b/www/api/profile.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/property.html b/www/api/property.html
index 58f1262df96d1e995f7c227337685ece525f72d4..b326b2a18b09bc698fa3f4934064e3ecf7a56140 100644 (file)
--- a/www/api/property.html
+++ b/www/api/property.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/quantize.html b/www/api/quantize.html
index f81ab453ab86700375f104ca841285d2f419c654..54ac7c4f85bb0d5a96b617d77d5e4948e1d68362 100644 (file)
--- a/www/api/quantize.html
+++ b/www/api/quantize.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
 </div>
 </div>
 </div>

diff --git a/www/api/resize.html b/www/api/resize.html
index 54a89d644f6ff60febbb8da720d8c6d16cf1cc05..9cd1cb814bb7176bbc58551cabc3b966583a745e 100644 (file)
--- a/www/api/resize.html
+++ b/www/api/resize.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/api/resource.html b/www/api/resource.html
index ce3f62651e9517c7f3a27eb242b182aa8a22042a..87c0f62c9582df05b561e53ae22b4e21f383c703 100644 (file)
--- a/www/api/resource.html
+++ b/www/api/resource.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
 </div>
 </div>
 </div>

diff --git a/www/api/segment.html b/www/api/segment.html
index 9eed1837ee85cbb0df380dd93e71647acb256db0..c90d8834edf4bf1baa61c2a54422a8441a3a4a7d 100644 (file)
--- a/www/api/segment.html
+++ b/www/api/segment.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
 </div>
 </div>
 </div>

diff --git a/www/api/shear.html b/www/api/shear.html
index 313f511d4655fdd61cc9083b147e54198cbf2360..1e0757fcbe6deb2a9e5a8e1193acf43dc26ccba3 100644 (file)
--- a/www/api/shear.html
+++ b/www/api/shear.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/signature.html b/www/api/signature.html
index 8832bfbb8cef6959da98aae8c243ff130791cbb6..9749006c33126ef9f7c4598cd805341cf8ae87ca 100644 (file)
--- a/www/api/signature.html
+++ b/www/api/signature.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
 </div>
 </div>
 </div>

diff --git a/www/api/statistic.html b/www/api/statistic.html
index 66f9ac61cd5f8cc46c8924508e1d32ba1cece98e..fa8810ba56ffc4e145dc64a162c9ca1d926a1354 100644 (file)
--- a/www/api/statistic.html
+++ b/www/api/statistic.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/api/stream.html b/www/api/stream.html
index 914d3cf000dbed8cb85ca8a2cbf1ae780b5c1cc6..71eed5ce9e909c862ec6094463dca9ecad4c37ea 100644 (file)
--- a/www/api/stream.html
+++ b/www/api/stream.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/transform.html b/www/api/transform.html
index 2828c0c32a2aa303ba0617a2e930477b6858e84e..1213934433c7819eba922a9d7d14fe399112e0bc 100644 (file)
--- a/www/api/transform.html
+++ b/www/api/transform.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/api/version.html b/www/api/version.html
index 54af009570b0a93a46a4b778fb992984fed075c7..b2df46d12192e55858af18ff2a6f1c270e9e3e3d 100644 (file)
--- a/www/api/version.html
+++ b/www/api/version.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/api/wand-view.html b/www/api/wand-view.html
index a31b0b4b602b24735d8164a9dd6953830fc30437..2e05dffc95ab9c3454fdd6fa00242e5d04d95339 100644 (file)
--- a/www/api/wand-view.html
+++ b/www/api/wand-view.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/binary-releases.html b/www/binary-releases.html
index 14906b053db37665470f533fbf1cf92136c233a0..1a6807da0ad52c965dfa972c97a532f655af858e 100644 (file)
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/changelog.html b/www/changelog.html
index 90333f0392ab2c3c3ebeee54aa588953c024ff6c..2bc07c516fed680ce1dcd73a825a80927e2e4ffc 100644 (file)
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/color.html b/www/color.html
index a89bae34c5d3ce488373959be3890c8033dc0598..410959f0e8a8895c18167a4b9177615b1b6b2fcd 100644 (file)
--- a/www/color.html
+++ b/www/color.html
@@ -202,7 +202,7 @@
 <div class="doc-section">
 
 <p>Use the 
-<a href="../contrib/color-converter.html">Color Converter</a>
+<a href="../www/contrib/color-converter.html">Color Converter</a>
 to supply any valid ImageMagick color specification as described below to see a
 color swatch of that color and to convert to all the other color models.
 </p>

diff --git a/www/command-line-options.html b/www/command-line-options.html
index c0d979c6d6273d215cbdaaee93541877344f082e..a79d21aad0dca7202c2bbbe65741d541e3cd320c 100644 (file)
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -172,7 +172,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>
@@ -2197,7 +2197,7 @@ class="arg">method</em> being used. </p>
     <td valign="top"><kbd>Barrel</kbd></td>
     <td valign="top">
        Given the four coefficients (A,B,C,D) as defined by <a
-       href="http://www.all-in-one.ee/~dersch/barrel/barrel.html" >Helmut
+       href="http://wiki.panotools.org/Lens_correction_model" >Helmut
        Dersch</a>, perform a barrell or pin-cushion distortion appropriate to
        correct radial lens distortions.  That is in photographs, make straight
        lines straight again. <br/>

diff --git a/www/compare.html b/www/compare.html
index 3b22f44adc6a6147bae1c6aa8b5f9c974745a278..ad0446a10bf8d08a00869829a969b6d8ab0030bb 100644 (file)
--- a/www/compare.html
+++ b/www/compare.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/composite.html b/www/composite.html
index 5d23726155278546d515ada085d3f4f730ada88c..c1bf6b9d7ff6b8bfc8ba1ad58d6adc4bee2ad277 100644 (file)
--- a/www/composite.html
+++ b/www/composite.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/conjure.html b/www/conjure.html
index 885ce77fdcbc94c59b88bf57ed73ace2e45fec81..4b7a6b47ba0e83f9f9e147bcb10e3f22f280df7e 100644 (file)
--- a/www/conjure.html
+++ b/www/conjure.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
 </div>
 </div>
 </div>

diff --git a/www/contrib/color-converter.html b/www/contrib/color-converter.html
new file mode 100644 (file)
index 0000000..6c06215
--- /dev/null
+++ b/www/contrib/color-converter.html
@@ -0,0 +1,503 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>Color Converter</title>
+<meta name="author" content="Fred Weinhaus and Anthony Barnett: 10/24/2009">
+<meta name="description" content="PHP/ImageMagick script to convert colors from one color system to another">
+<meta name="keywords" content="PHP, ImageMagick, color, converter, rgb, hex, hsl, hsb, cmyk, gray">
+<style type="text/css" title="text/css">
+<!--
+body {font:12pt Arial, Helvetica, sans-serif; background-color: white;}
+p {font:12pt Arial, Helvetica, sans-serif;}
+td {font:12pt Arial, Helvetica, sans-serif;}
+h3 {font:14pt Arial, Helvetica, sans-serif; font-weight: bold;}
+.red {color: red;}
+-->
+</style>
+</head>
+<body>
+
+<?php
+# get color
+$color = $_POST['color'];
+$color = strtolower($color);
+
+# get bgcolor
+$bgcolor = $_POST['bgcolor'];
+?>
+
+<h3 align="center">COLOR CONVERTER</H3>
+
+<p align="center">Please Specify Any Valid Single IM 6.5.6-6+ Color</p>
+<p align="center">e.g., name, hex, rgb(...), hsl(...), hsb(...), cmyk(...), gray(...)
+<br />or rgba(...), hsla(...), hsba(...), cmyka(...), graya(...)</p>
+<p align="center">see <a href="http://www.imagemagick.org/www/color.html">
+http://www.imagemagick.org/www/color.html</a></p>
+
+<form align="center" method="post" action="<?php echo $PHP_SELF; ?>" >
+Color: <input name="color" value="" />
+<input type="Submit" name="Submit" value="Submit" /><br />
+Background For Transparent Colors: <br />
+<input type="radio" name="bgcolor" value="white" <?php if ($bgcolor == "white") echo "checked"; ?> /> White 
+<input type="radio" name="bgcolor" value="gray" <?php if ($bgcolor == "gray") echo "checked"; ?> /> Gray 
+<input type="radio" name="bgcolor" value="black" <?php if ($bgcolor == "black") echo "checked"; ?> /> Black 
+<input type="radio" name="bgcolor" value="checker" <?php if ($bgcolor == "checker" || $bgcolor == "") echo "checked"; ?> /> Checker 
+</form>
+
+</body>
+</html>
+<?php
+
+if ( isset($color) && $color != "" )
+       {
+
+       # set path to convert
+       $path2convert = "/usr/local/bin/convert";
+
+       # set printout precision
+       $prec = 2;
+       
+       # set error message for invalid colors
+       $errMsg = "$color Is Not A Valid IM Color Specification";
+       
+       # set debug
+       $debug = false;
+       
+       # set debug numbers for errMsg
+       $numArray = Array();
+       if ( $debug )
+               {
+               for ($i=1; $i<=19; $i++)
+                       {
+                       $numArray[$i] = "($i)";
+                       }
+               }
+       else
+               {
+               for ($i=1; $i<=19; $i++)
+                       {
+                       $numArray[$i] = "";
+                       }
+               }
+               
+       # function to extract color values from txt: data
+       function getColorVals($text)
+               {
+               global $color1, $color2, $color3, $color4, $color5;
+               # remove white space
+               $text = preg_replace('/\s*/', '', $text);
+               
+               # convert parens to commas
+               $text = preg_replace('/\(|\)/', ',', $text);
+               
+               # split into array at commas
+               $textArray = explode(',', $text);
+               
+               $color1 = $textArray[2];
+               $color2 = $textArray[3];
+               $color3 = $textArray[4];
+               $color4 = $textArray[5];
+               $color5 = $textArray[6];
+               }
+
+       # function to convert color values to range 0-255 (or 0-360) or percent
+       function convertColorVals($color1,$color2,$color3,$color4,$color5,$qr,$prec,$colormode)
+               {
+               # convert colorvalues to range 0-255 (360 for hue) or percent
+               global $C1V,$C1P,$C2V,$C2P,$C3V,$C3P,$C4V,$C4P,$C5V,$C5P;
+               $val=255;
+               if ( $colormode == "hsl" || $colormode == "hsb" ) { $val=360; }
+               $C1V = round($val*$color1/$qr, $prec);
+               $C2V = round(255*$color2/$qr, $prec);
+               $C3V = round(255*$color3/$qr, $prec);
+               $C1P = round(100*$color1/$qr, $prec);
+               $C2P = round(100*$color2/$qr, $prec);
+               $C3P = round(100*$color3/$qr, $prec);
+               if ( $colormode == "cmyk" )
+                       {
+                       $C4V = round(255*$color4/$qr, $prec);
+                       $C4P = round(100*$color4/$qr, $prec);
+                       if ( is_numeric($color5) ) {$C5V = round($color5/$qr, $prec);}
+                       }
+               else
+                       {
+                       if ( is_numeric($color4) ) {$C4V = round($color4/$qr, $prec);}
+                       }
+               # display textual output
+               echo "<br />";
+               echo strtoupper($colormode) . ": <br />";
+               if ( $colormode != "cmyk" )
+                       {
+                       if ( is_numeric($color4) )
+                               {
+                               echo $colormode . "a($C1V,$C2V,$C3V,$C4V) <br />";
+                               echo $colormode . "a($C1P%,$C2P%,$C3P%,$C4V) <br />";
+                               }
+                       else
+                               {
+                               echo $colormode . "($C1V,$C2V,$C3V) <br />";
+                               echo $colormode . "($C1P%,$C2P%,$C3P%) <br />";
+                               }
+                       }
+               else
+                       {
+                       if ( is_numeric($color5) )
+                               {
+                               echo "cmyka($C1V,$C2V,$C3V,$C4V,$C5V) <br />";
+                               echo "cmyka($C1P%,$C2P%,$C3P%,$C4P%,$C5V) <br />";
+                               }
+                       else
+                               {
+                               echo "cmyk($C1V,$C2V,$C3V,$C4V) <br />";
+                               echo "cmyk($C1P%,$C2P%,$C3P%,$C4P%) <br />";
+                               }
+                       }
+               }
+       
+       
+       # begin sequence of tests for valid colors
+       
+       # remove any spaces in color
+       $color = preg_replace('/\s*/', '', $color);
+       
+       # test for comma count < 5 
+       # and 1 set of parens 
+       # and then allow only specific first 4, 5 or 6 characters 
+       # also test if exactly rgb, rgba, hsl, hsla, hsb, hsba, cmyk, cymka
+       # also test if begins with rgb, rgba, hsl, hsla, hsb, hsba, cmyk, cymka
+       # and does not contain 1 set of parens
+       $commacount = substr_count($color, ',');
+       $lparenct = substr_count($color, '(');
+       $rparenct = substr_count($color, ')');
+       $periodct = substr_count($color, '.');
+       $chars3 = substr($color, 0, 3);
+       $chars4 = substr($color, 0, 4);
+       $chars5 = substr($color, 0, 5);
+       $chars6 = substr($color, 0, 6);
+       if ( $commacount > 4 )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[1]</p>";
+               exit;
+               }
+       elseif ( $commacount >= 1 && $commacount <= 4 && $lparenct != 1 )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[2]</p>";
+               exit;
+               }
+       elseif ( $commacount >= 1 && $commacount <= 4 && $rparenct != 1 )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[3]</p>";
+               exit;
+               }
+       elseif ( $commacount == 0 && $lparenct == 1 && $rparenct == 1 && $chars5 != "gray(" )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[4]</p>";
+               exit;
+               }
+       elseif ( $commacount == 1 && $chars6 != "graya(" )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[5]</p>";
+               exit;
+               }
+       elseif ( $commacount == 2 && $chars4 != "rgb(" &&  $chars4 != "hsl(" && $chars4 != "hsb(" )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[6]</p>";
+               exit;
+               }
+       elseif ( $commacount == 3 && $chars5 != "rgba(" &&  $chars5 != "hsla(" && $chars5 != "hsba(" && $chars5 != "cmyk(" )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[7]</p>";
+               exit;
+               }
+       elseif ( $commacount == 4 && $chars6 != "cmyka(" )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[8]</p>";
+               exit;
+               }
+       elseif ( $color == "rgb" || $color == "hsl" || $color == "hsb" || $color == "rgba" || $color == "hsla" || $color == "hsba" || $color == "cmyk" || $color == "cmyka" )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[9]</p>";
+               exit;
+               }
+       elseif ( $lparenct != 1 && $rparenct !=1 && ( $chars3 == "rgb" || $chars3 == "hsl" || $chars3 == "hsb" || $chars4 == "rgba" || $chars4 == "hsla" || $chars4 == "hsba" || $chars4 == "cmyk" || $chars5 == "cmyka" ) )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[10]</p>";
+               exit;
+               }
+       
+       # test if color contains ,, or (, or ,)
+       if ( substr_count($color, ',,') > 0 )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[11]</p>";
+               exit;
+               }
+       elseif ( substr_count($color, '(,') > 0 )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[12]</p>";
+               exit;
+               }
+       elseif ( substr_count($color, ',)') > 0 )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[13]</p>";
+               exit;
+               }
+       
+       # test for only 1 hex char only at beginning
+       # and 3, 4, 6, 8, 12 or 16 following numberic chars
+       # and non-hex with 1 set of parens and with numeric chars not at end
+       $hashcount = substr_count($color, '#');
+       $hashloc = strpos($color, '#');
+       $hexcount = strlen($color);
+       $alphnumArray = preg_split('/[0-9]/', $color);
+       if ( $hashcount > 1 )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[14]</p>";
+               exit;
+               }
+       elseif ( $hashcount == 1 && $hashloc != 0 )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[15]</p>";
+               exit;
+               }
+       elseif ( $hashcount == 1 && $hashloc == 0 && $hexcount != 4 && $hexcount != 5 && $hexcount != 7 && $hexcount != 9 && $hexcount != 13 && $hexcount != 17 )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[16]</p>";
+               exit;
+               }
+       elseif ( $hashcount == 0 && $lparenct != 1 && $rparencount != 1 )
+               {
+               for( $i = 1; $i < sizeof($alphnumArray); $i++ )
+                       {
+                       if ( $alphnumArray[$i] != "" )
+                               {
+                               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[17]</p>";
+                               exit;
+                               }
+                       }
+               }
+
+       # test for invalid characters in color input
+       if ( preg_match_all('/[^#%(),.0-9a-zA-Z]/', $color, $matches) != "" )
+               {
+               echo "<p align=\"center\" class=\"red\">$errMsg $numArray[18]</p>";
+               exit;
+               }
+               
+       # test for numerical values > 100 if contains %
+       # test for numerical values > 255 if starts with rgb, cmyk or gray
+       # test for 1st, numerical values > 360 if starts with hsl or hsb
+       # and rest of values > 255
+       # also test if rgba, hsla, hsba, cmyka and graya and last component > 1
+       $pctcount = substr_count($color, '%');
+       $tmpcolor = preg_replace('/\(|\)/', ',', $color);
+       $colorArray = explode(',', $tmpcolor);
+       for( $i = 0; $i < sizeof($colorArray); $i++ )                   {
+               if ( is_numeric(str_replace('%', '', $colorArray[$i])) && $colorArray[$i] > 100 && $pctcount > 0 )
+                       {
+                       echo "<p align=\"center\" class=\"red\">$color Contains A Numerical Color Component That Is Greater Than 100%</p>";
+                       exit;
+                       }
+               elseif ( is_numeric($colorArray[$i]) && $colorArray[$i] > 255 && ( $chars3 == "rgb" || $chars4 == "cmyk" || $chars4 == "gray" ) )
+                       {
+                       echo "<p align=\"center\" class=\"red\">$color Contains A Numerical Color Component That Is Greater Than 255</p>";
+                       exit;
+                       }
+               elseif ( is_numeric($colorArray[1]) && $colorArray[1] > 360 && ( $chars3 == "hsl" || $chars3 == "hsb" ) )
+                       {
+                       echo "<p align=\"center\" class=\"red\">$color Contains A Numerical Hue Component That Is Greater Than 360</p>";
+                       exit;
+                       }
+               elseif ( is_numeric($colorArray[$i]) && $i != 1 && $colorArray[$i] > 255 && ( $chars3 == "hsl" || $chars3 == "hsb" ) )
+                       {
+                       echo "<p align=\"center\" class=\"red\">$color Contains A Numerical Non-Hue Component That Is Greater Than 255</p>";
+                       exit;
+                       }
+               elseif ( is_numeric($colorArray[4]) && $colorArray[4] > 1 && ( $chars4 == "rgba" || $chars4 == "hsla" || $chars4 == "hsba" ) )
+                       {
+                       echo "<p align=\"center\" class=\"red\">$color Contains A Numerical Alpha Component That Is Greater Than 1</p>";
+                       exit;
+                       }
+               elseif ( is_numeric($colorArray[5]) && $colorArray[5] > 1 && $chars5 == "cmyka" )
+                       {
+                       echo "<p align=\"center\" class=\"red\">$color Contains A Numerical Alpha Component That Is Greater Than 1</p>";
+                       exit;
+                       }
+               elseif ( is_numeric($colorArray[2]) && $colorArray[2] > 1 && $chars5 == "graya" )
+                       {
+                       echo "<p align=\"center\" class=\"red\">$color Contains A Numerical Alpha Component That Is Greater Than 1</p>";
+                       exit;
+                       }
+               }
+
+       # test if begins with gray and 1 numeric entry
+       # test if begins with rgb, hsl, hsb and 3 numeric entries
+       # test if begins with rgba, hsla, hsba, cmyk and 4 numeric entries
+       # test if begins with cmyka and 5 numeric entries
+       $colorArray1 = str_replace('%', '', $colorArray[1]);
+       $colorArray2 = str_replace('%', '', $colorArray[2]);
+       $colorArray3 = str_replace('%', '', $colorArray[3]);
+       $colorArray4 = str_replace('%', '', $colorArray[4]);
+       $colorArray5 = str_replace('%', '', $colorArray[5]);
+       if ( $chars5 == "gray(" && !is_numeric($colorArray1) )
+               {
+               echo "<p align=\"center\" class=\"red\">$color Contains A Non-Numerical Color Component</p>";
+               exit;
+               }
+       elseif ( ( $chars4 == "rgb(" || $chars4 == "hsl(" || $chars4 == "hsb(" ) && ( !is_numeric($colorArray1) || !is_numeric($colorArray2) || !is_numeric($colorArray3) ) )
+               {
+               echo "<p align=\"center\" class=\"red\">$color Contains A Non-Numerical Color Component</p>";
+               exit;
+               }
+       elseif ( ( $chars5 == "rgba(" || $chars5 == "hsla(" || $chars5 == "hsba(" || $chars5 =="cmyk" ) && ( !is_numeric($colorArray1) || !is_numeric($colorArray2) || !is_numeric($colorArray3) || !is_numeric($colorArray4) ) )
+               {
+               echo "<p align=\"center\" class=\"red\">$color Contains A Non-Numerical Color Component</p>";
+               exit;
+               }
+       elseif ( $chars6 =="cmyka(" && ( !is_numeric($colorArray1) || !is_numeric($colorArray2) || !is_numeric($colorArray3) || !is_numeric($colorArray4) || !is_numeric($colorArray5) ) )
+               {
+               echo "<p align=\"center\" class=\"red\">$color Contains A Non-Numerical Color Component</p>";
+               exit;
+               }       
+
+       # test if color in IM list of colors
+       if ( $chars3 != "rgb" && $chars3 != "hsl" && $chars3 != "hsb" && $chars4 != "cmyk" && ( $hashcount != 1 || $hashloc != 0 ) )
+               {
+               # get list of colors from IM
+               $array = array();
+               exec("$path2convert -list color", $array, $returnval);
+               
+               # drop off the first 5 rows of the array 
+               # as they are texual info and not colors
+               array_shift($array);
+               array_shift($array);
+               array_shift($array);
+               array_shift($array);
+               array_shift($array);
+                       
+               # filter the rows using a callback function 
+               # to get first field in each row as color name
+               function colorName($var)
+                       {       
+                       $tmpArray = split(' ', $var);
+                       return(strtolower($tmpArray[0]));
+                       }
+               $array = array_map('colorName',$array);
+       
+               # test if color is not in list
+               if ( !in_array($color, $array) )
+                       {
+                       echo "<p align=\"center\" class=\"red\">$errMsg $numArray[19]</p>";
+                       exit;
+                       }
+               }
+
+
+       # create display of colorswatch and textual color values
+
+       # make one cell table and fill with PNG image from colorswatch.html
+       echo "<table cellspacing=\"20\" align=\"center\"><tr><td valign=\"top\">";
+       echo "<p align=\"center\">$color<br />";
+       echo "<table cellpadding=\"0\" cellspacing=\"0\" border=\"10\" bordercolor=\"gray\">";
+       if ( $bgcolor == "checker" )
+               {
+               echo "<tr><td>";
+               }
+       else
+               {
+               echo "<tr><td bgcolor=\"$bgcolor\">";
+               }
+       echo "<img src=\"color-swatch.html?color=" . urlencode($color) . "&bgcolor=" . urlencode($bgcolor) . " \">";
+       echo "</td></tr></table>";
+       echo "</p>";
+
+       echo "</td><td valign=\"top\">";
+       
+       # get quantumrange
+       $array = array();
+       exec("$path2convert xc: -format \"%[fx:quantumrange]\" info:-", $array, $returnval);
+       $qr=$array[0];
+       if ( $qr == "" )
+               {               
+               $array = array();
+               exec("$path2convert xc: -format \"%q\" info:-", $array, $returnval);
+               $q = $array[0];
+               if ( $q == 8 )
+                       {
+                       $qr = 255;
+                       }
+               elseif ( $q == 16 )
+                       {
+                       $qr = 65535;
+                       }
+               else
+                       {
+                       $qr = pow(2, 32) - 1;
+                       }
+               }
+
+       
+       # get txt: info for RGB
+       $array = array();
+       exec("$path2convert -size 1x1 xc:\"$color\" -colorspace RGB txt:-", $array, $returnval);
+       getColorVals($array[1]);
+       # convert RGB colors to range 0-255 and percent and show RGB info
+       convertColorVals($color1,$color2,$color3,$color4,$color5,$qr,$prec,'rgb');
+       
+       
+       # get txt: info for 8-bit HEX
+       $array = array();
+       exec("$path2convert -size 1x1 xc:\"$color\" -colorspace RGB -depth 8 txt:-", $array, $returnval);
+       getColorVals($array[1]);
+
+       # convert RGB color values to HEX and show HEX info
+       $red = dechex($color1);
+       if ( strlen($red) == 1) {$red = "0" . $red;}
+       $green = dechex($color2);
+       if ( strlen($green) == 1) {$green = "0" . $green;}
+       $blue = dechex($color3);
+       if ( strlen($blue) == 1) {$blue = "0" . $blue;}
+       if ( is_numeric($color4) )
+               {
+               $alpha = dechex($color4);
+               if ( strlen($alpha) == 1) {$alpha = "0" . $alpha;}
+               $hexcolor = $red . $green . $blue . $alpha;
+               }
+       else
+               {
+               $hexcolor = $red . $green . $blue;
+               }
+       echo "<br />";
+       echo "HEX: <br />";
+       echo "#$hexcolor <br />";
+       
+       
+       # get txt: info for HSL
+       $array = array();
+       exec("$path2convert -size 1x1 xc:\"$color\" -colorspace HSL txt:-", $array, $returnval);
+       getColorVals($array[1]);
+       # convert HSL colors to range 0-255 (360 for hue) and percent and show HSL info
+       convertColorVals($color1,$color2,$color3,$color4,$color5,$qr,$prec,'hsl');
+       
+       
+       # get txt: info for HSB
+       $array = array();
+       exec("$path2convert -size 1x1 xc:\"$color\" -colorspace HSB txt:-", $array, $returnval);
+       getColorVals($array[1]);
+       # convert HSB colors to range 0-255 (360 for hue) and percent and show HSB info
+       convertColorVals($color1,$color2,$color3,$color4,$color5,$qr,$prec,'hsb');
+       
+       
+       # get txt: info for CMYK
+       $array = array();
+       exec("$path2convert -size 1x1 xc:\"$color\" -colorspace CMYK txt:-", $array, $returnval);
+       getColorVals($array[1]);
+       # convert CMYK colors to range 0-255 and percent and show CMYK info
+       convertColorVals($color1,$color2,$color3,$color4,$color5,$qr,$prec,'cmyk');     
+
+       echo "</td></tr></table>";
+       
+       }
+?>
+
+

diff --git a/www/contrib/color-swatch.html b/www/contrib/color-swatch.html
new file mode 100644 (file)
index 0000000..570e5e9
--- /dev/null
+++ b/www/contrib/color-swatch.html
@@ -0,0 +1,37 @@
+<?php\r
+# Authors: Anthony Barnett and Fred Weinhaus: 10/24/2009\r
+\r
+# set path to convert\r
+$path2convert = "/usr/local/bin/convert";\r
+\r
+# Get the color and bgcolor value from the php page image tag as get parameter\r
+# Then create PNG image and send back\r
+$color = $_GET['color'];\r
+$bgcolor = $_GET['bgcolor'];\r
+\r
+\r
+# test for not valid characters in color and bgcolor\r
+$colortest = preg_match_all('/[^#%(),.0-9a-zA-Z]/', $color, $matches);\r
+$bgcolortest = preg_match_all('/[^#%(),.0-9a-zA-Z]/', $bgcolor, $matches);\r
+\r
+if ( $colortest == 0 && $bgcolortest == 0 )\r
+       {\r
+       if ( $bgcolor == "checker" )\r
+               {\r
+               # Generate the checker background and overlay color\r
+               $cmd = "$path2convert -size 150x150 pattern:checkerboard -normalize xc:\"$color\" -composite -depth 8 PNG:-";\r
+               }\r
+       else\r
+               {\r
+               # Generate the checker background and overlay color\r
+               $cmd = "$path2convert -size 150x150 xc:\"$color\" -depth 8 PNG:-";\r
+               }\r
+\r
+       # Set the header type\r
+       header("Content-type: images/png");\r
+       \r
+       # Display the image\r
+       passthru($cmd, $retval);\r
+       }\r
+\r
+?>\r

diff --git a/www/convert.html b/www/convert.html
index 82e0b2bb80466fe7ec5af89ea0a94cfe198f057a..cc684a3666a164f71d0fcc8c12408a3f98b6f80c 100644 (file)
--- a/www/convert.html
+++ b/www/convert.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
 </div>
 </div>
 </div>

diff --git a/www/display.html b/www/display.html
index 082e1b18ec057b3933d7780bb6e7f5395f7852ff..5beb956a2f04dfb080f270a4d2835a4e718f212f 100644 (file)
--- a/www/display.html
+++ b/www/display.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/download.html b/www/download.html
index 192f5feaaa44a7c587b11cc4afb6b0365d03006d..232354a20b0a572803b12955c15816c2db8ff7e0 100644 (file)
--- a/www/download.html
+++ b/www/download.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
 </div>
 </div>
 </div>

diff --git a/www/examples.html b/www/examples.html
index 4d9e30a53173895b079a5f824ac3816e17dd0d88..c227170b3fc3eeb4273430a2efc52642d2f2dd4b 100644 (file)
--- a/www/examples.html
+++ b/www/examples.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/exception.html b/www/exception.html
index 58436944143d1f1aa0f8afb6c78f9dbc3152acef..a44f2675a794a676ac32bc1ac648280ff32035a0 100644 (file)
--- a/www/exception.html
+++ b/www/exception.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/export.html b/www/export.html
index e27a7094f19f63f3be55893805811c09cb20b5e5..e98c3f9fe7fba25c05e2466f719af742a906a6d8 100644 (file)
--- a/www/export.html
+++ b/www/export.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
 </div>
 </div>
 </div>

diff --git a/www/formats.html b/www/formats.html
index d07be62e96a03d63ef80fc5d9dd8970eb6a28b09..6163c89ac1982f156741e4bf9a8691c00966adf8 100644 (file)
--- a/www/formats.html
+++ b/www/formats.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
 </div>
 </div>
 </div>
@@ -508,7 +508,7 @@ the supported image formats.</p>
     <td valign="top">HPGL</td>
     <td valign="top">R</td>
     <td valign="top">HP-GL plotter language</td>
-    <td valign="top">Requires <a href="http://ftp.cdrom.com/pub/ImageMagick/delegates/hp2xx-3.2.0.tar.gz">hp2xx-3.2.0.tar.gz</a></td>
+    <td valign="top">Requires <a href="http://ftp.gnu.org/gnu/hp2xx">hp2xx-3.4.4.tar.gz</a></td>
   </tr>
 
   <tr>
@@ -617,17 +617,17 @@ the supported image formats.</p>
   </tr>
 
   <tr>
-    <td valign="top"><a href="http://www.mpeg.org/">M2V</a></td>
+    <td valign="top"><a href="http://www.ffmpeg.org/">M2V</a></td>
     <td valign="top">RW</td>
     <td valign="top">Motion Picture Experts Group file interchange format (version 2)</td>
-    <td valign="top">Requires <a href="ftp://ftp.mpeg.org/pub/mpeg/mssg/">mpeg2vidcodec_v12.tar.gz</a>.</td>
+    <td valign="top">Requires <a href="http://www.ffmpeg.org/download.html">ffmpeg</a>.</td>
   </tr>
 
   <tr>
-    <td valign="top"><a href="http://www.mpeg.org/">MPEG</a></td>
+    <td valign="top"><a href="http://www.ffmpeg.org/">MPEG</a></td>
     <td valign="top">RW</td>
     <td valign="top">Motion Picture Experts Group file interchange format (version 1)</td>
-    <td valign="top">Requires <a href="ftp://ftp.mpeg.org/pub/mpeg/mssg/">mpeg2vidcodec_v12.tar.gz</a>.</td>
+    <td valign="top">Requires <a href="http://www.ffmpeg.org/download.html">ffmpeg</a>.</td>
   </tr>
 
   <tr>

diff --git a/www/fx.html b/www/fx.html
index c2536fe28ef1f6fc07648eb254dd84293f3e2154..cf7705e70a47953adeb8d6e44b3310084a19307e 100644 (file)
--- a/www/fx.html
+++ b/www/fx.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/history.html b/www/history.html
index d19c13cecd270037125e4b6ef3c4d6a749dab8e6..eba47ebd5df6d9f884a4d63ffee5fe86a90ad99e 100644 (file)
--- a/www/history.html
+++ b/www/history.html
@@ -89,7 +89,7 @@
     <a title="Program Interface: PerlMagick" href="../www/perl-magick.html">PerlMagick</a>
 </div>
 <div class="sub">
-    <a title="Program Interface: Magick++" href="../Magick++/">Magick++</a>
+    <a title="Program Interface: Magick++" href="../www/Magick++/">Magick++</a>
 </div>
 <div class="sep"></div>\r
 <div  class="menu">

diff --git a/www/identify.html b/www/identify.html
index 758139910dc5526ec39f296c53081e211e44a97c..92606d1db525ccf19a1d0e5c03a3e9106137325e 100644 (file)
--- a/www/identify.html
+++ b/www/identify.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/import.html b/www/import.html
index ce965c360a442b3c483c55d9a685cacaad556332..14c2c0bfc8d97f18fbaa593c381c9db4507a5ef4 100644 (file)
--- a/www/import.html
+++ b/www/import.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/install-source.html b/www/install-source.html
index 00fd794c648812ebccd3e8d4f32e24ab06ffb68c..6505322e2b9731fb9399e93f0a765e6e6bd2a4e4 100644 (file)
--- a/www/install-source.html
+++ b/www/install-source.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/jp2.html b/www/jp2.html
index 69aca9d581682034164b29d525f4fb70aac68b55..d586b046a0e1100214781c19b545cda04ca8deb1 100644 (file)
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/license.html b/www/license.html
index b592dd6ced101a50622b28e90a9159b3485dfbdf..a21d9a3bfdeaccaf76fd434f3ad6f6ceaf63e396 100644 (file)
--- a/www/license.html
+++ b/www/license.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
 </div>
 </div>
 </div>

diff --git a/www/links.html b/www/links.html
index eda95de385ef08023cc4e560d7177ae3808965e2..1263dda5ecceef76b299484f98521643b23be097 100644 (file)
--- a/www/links.html
+++ b/www/links.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>
@@ -212,17 +212,16 @@
   <dd><a href="http://www.linux.com/archive/feature/113978">ImageMagick: A graphics wizard for the command line</a></dd>
   <dd><a href="http://www.ioncannon.net/linux/81/5-imagemagick-command-line-examples-part-1/">ImageMagick command line examples - part 1</a></dd>
   <dd><a href="http://www.ioncannon.net/linux/72/5-imagemagick-command-line-examples-part-2/">ImageMagick command line examples - part 2</a></dd>
-  <dd><a href="http://www.rabuser.info/jmagick.html">ImageMagick &amp; Java</a></dd>
+  <dd><a href="http://www.jmagick.org">ImageMagick &amp; Java</a></dd>
   <dd><a href="http://www.jpeek.com/articles/linuxmag/0606.pdf">ImageMagick, Part One</a></dd>
   <dd><a href="http://www.jpeek.com/articles/linuxmag/0607.pdf">ImageMagick, Part Two</a></dd>
   <dd><a href="http://www-106.ibm.com/developerworks/library/l-graf2/?ca=dgr-lnxw15GraphicsLine">More Graphics from the Command Line</a></dd>
-  <dd><a href="http://www.ffnn.nl/pages/projects/ubuntu-firefox-themes.html">Ubuntu Firefox Themes</a></dd>
 </dl>
 
 <h2><a id="program-interfaces"></a>Program Interface Tutorials</h2>
 
 <dl>
-  <dd><a href="http://www-128.ibm.com/developerworks/openwww/source/library/os-mosaic/?ca=dgr-lnxw09MosaicImages">Create Mosaic Images with Perl and ImageMagick</a></dd>
+  <dd><a href="http://www.ibm.com/developerworks/openwww/source/library/os-mosaic/?ca=dgr-lnxw09MosaicImages">Create Mosaic Images with Perl and ImageMagick</a></dd>
   <dd><a href="http://articles.techrepublic.com.com/5100-10878_11-5924990.html">Convert images for printing with MagickWand for PHP</a></dd>
   <dd><a href="http://www.sitepoint.com/article/dynamic-images-imagemagick">Create Dynamic Images with ImageMagick</a></dd>
   <dd><a href="http://www.ioncannon.net/php/75/how-to-compile-imagemagick-for-php-by-hand/">How to compile ImageMagick for PHP by hand</a></dd>
@@ -271,8 +270,6 @@
     <dd><a href="http://imagemagick.europnews.de">http://imagemagick.europnews.de</a></dd>
   <dt>Germany</dt>
     <dd><a href="http://imagemagick.linux-mirror.org">http://imagemagick.linux-mirror.org</a></dd>
-  <dt>Ireland</dt>
-    <dd><a href="http://imagemagick.oss-mirror.org">http://imagemagick.oss-mirror.org</a></dd>
   <dt>United States</dt>
     <dd><a href="http://www.imagemagick.org">http://www.imagemagick.org</a></dd>
 </dl>

diff --git a/www/magick++.html b/www/magick++.html
index dd4af7c5e47e30164bf90a549adde68d23977d71..b29cee54c53d506aaee7727f8a38e155bbba5a9f 100644 (file)
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
 </div>
 </div>
 </div>
@@ -219,14 +219,14 @@ performed on multiple images stored in STL containers.
 <h2>Documentation</h2>
 <div class="doc-section">
 <a id="documentation"></a>
-<p>Detailed <a href="../Magick++/Documentation.html">documentation</a> is
+<p>Detailed <a href="../www/Magick++/Documentation.html">documentation</a> is
 provided for all Magick++ classes, class methods, and template
 functions which comprise the API.  See a <a href="http://www.imagemagick.org/Magick++/tutorial/Magick++_tutorial.pdf">  Gentle Introduction to Magick++</a> for an introductory tutorial to Magick++.  We include the <a href="http://www.imagemagick.org/Magick++/tutorial/Magick++_tutorial.odt" >source</a> if you want to correct, enhance, or expand the tutorial.</p>
 </div>
 <h2>Obtaining Magick++</h2>
 <a id="get"></a>
 <div class="doc-section">
-<p>Magick++ is included as part of <a href="../www/index.html">ImageMagick</a>
+<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>.
 </p>
@@ -235,7 +235,7 @@ or <a href="http://www.imagemagick.org/www/subversion.html">Subversion</a>.
 <div class="doc-section">
 <a id="install"></a>
 <p>Once you have the Magick++ sources available, follow these detailed
-<a href="../Magick++/Install.html">installation instructions</a> for UNIX and
+<a href="../www/Magick++/Install.html">installation instructions</a> for UNIX and
 Windows. 
 </p>
 <p>A helper script named <kbd>Magick++-config</kbd> is installed

diff --git a/www/magick-core.html b/www/magick-core.html
index b23a6e6da8ac400990627e7caadbc1aff3c7736a..94f6e288e3558b1fe568210fb4548ad35c7e8150 100644 (file)
--- a/www/magick-core.html
+++ b/www/magick-core.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html
index d04a8d0f8e885f8b4c66a0d30674b8116cc28018..a5979853731cde226d2bad165c7c4e82133786cc 100644 (file)
--- a/www/magick-vector-graphics.html
+++ b/www/magick-vector-graphics.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/magick-wand.html b/www/magick-wand.html
index ec880c3579d8d510d7e9a1e0ef00859d36915dc5..91bc5c1bc492b0911e02672b13842b5a888a2652 100644 (file)
--- a/www/magick-wand.html
+++ b/www/magick-wand.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/mailing-list.html b/www/mailing-list.html
index d218946197af907135dbc5f070ed4378545c0a04..7bd3e87d1325ae6ec2557145493d136e8f083205 100644 (file)
--- a/www/mailing-list.html
+++ b/www/mailing-list.html
@@ -73,7 +73,7 @@
     <a href="../www/perl-magick.html">PerlMagick</a>
 </div>
 <div class="sub">
-    <a href="../Magick++/">Magick++</a>
+    <a href="../www/Magick++/">Magick++</a>
 </div>
 <div class="menu">
   <a href="../www/architecture.html">Architecture</a>

diff --git a/www/miff.html b/www/miff.html
index 04291b33ef0e745f9ed6d153c2ff14ef44a604f6..7a01ea02734dbaa51d0e5b9ccb659a1d104ebabc 100644 (file)
--- a/www/miff.html
+++ b/www/miff.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
 </div>
 </div>
 </div>

diff --git a/www/mirrors.html b/www/mirrors.html
index 51e7ca5a7aef4c3aea71bc195f725b7eab39b32b..29aa343ee7742925a9a0e47c336cffa430df847f 100644 (file)
--- a/www/mirrors.html
+++ b/www/mirrors.html
@@ -89,7 +89,7 @@
     <a title="Program Interface: PerlMagick" href="../www/perl-magick.html">PerlMagick</a>
 </div>
 <div class="sub">
-    <a title="Program Interface: Magick++" href="../Magick++/">Magick++</a>
+    <a title="Program Interface: Magick++" href="../www/Magick++/">Magick++</a>
 </div>
 <div class="sep"></div>\r
 <div  class="menu">

diff --git a/www/mogrify.html b/www/mogrify.html
index abc3da6e973332dcd527f31b7693542abb23a8b2..aaac855e27ccf01d7072d1fc4080862a15d6864b 100644 (file)
--- a/www/mogrify.html
+++ b/www/mogrify.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/montage.html b/www/montage.html
index 574bc83a41608ffbf86bfbc198eff679e31cd56d..2d6806ec6dcbf7ce295d0f7fcb5c4454f74d18f2 100644 (file)
--- a/www/montage.html
+++ b/www/montage.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
 </div>
 </div>
 </div>

diff --git a/www/motion-picture.html b/www/motion-picture.html
index 546540c5a1fea730f00d9cf20fac9eaf623722a0..d8d85485466c81a2a4be204409f2665474f8a75e 100644 (file)
--- a/www/motion-picture.html
+++ b/www/motion-picture.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/quantize.html b/www/quantize.html
index 0c20596052ea36acef26017a7db633433928ce3c..a6aa154e51eb416d58fe6d537c9e0ae2e9194338 100644 (file)
--- a/www/quantize.html
+++ b/www/quantize.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>

diff --git a/www/resources.html b/www/resources.html
index 7c5567c82403a7b6961cd8cd4e211bf6b73870d9..750b6f77b0962e63b92d38bfd04d51b47c8cd286 100644 (file)
--- a/www/resources.html
+++ b/www/resources.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011050100025 gabi.schulze-->
+   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
 </div>
 </div>
 </div>

diff --git a/www/search.html b/www/search.html
index 3f179414a913718c28f283dccc7e20a691a15ad5..a93883c7018e839bed2c07b3430bd502c35903d8 100644 (file)
--- a/www/search.html
+++ b/www/search.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>

diff --git a/www/sitemap.html b/www/sitemap.html
index 06d2a594605b45581678a46b05d2d2671f905863..6a69a1a9d023592d693ce3febc6df494f8023f03 100644 (file)
--- a/www/sitemap.html
+++ b/www/sitemap.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>
@@ -280,7 +280,7 @@
     <dd><a href="../www/magick-wand.html">MagickWand</a>: convert, compose, and edit images from the C language.</dd>\r
     <dd><a href="http://www.magickwand.org/">MagickWand for PHP</a>: a native PHP-extension to the ImageMagick MagickWand API.</dd>\r
     <dd><a href="http://code.google.com/p/nmagick">nMagick</a>: is a port of the ImageMagick library to the haXe and Neko platforms.</dd>\r
-    <dd><a href="http://wiki.lazarus.freepascal.org/index.html/PascalMagick">PascalMagick</a>: a Pascal binding for the MagickWand API and also the low-level MagickCore library.</dd>\r
+    <dd><a href="http://wiki.freepascal.org/PascalMagick">PascalMagick</a>: a Pascal binding for the MagickWand API and also the low-level MagickCore library.</dd>\r
     <dd><a href="../www/perl-magick.html">PerlMagick</a>: convert, compose, and edit images from the Perl language.</dd>\r
     <dd><a href="http://www.imagemagick.org/download/python/">PythonMagick</a>: an object-oriented Python interface to ImageMagick.</dd>\r
     <dd><a href="http://rmagick.rubyforge.org/">RMagick</a>: is an interface between the Ruby programming language and ImageMagick.</dd>\r

diff --git a/www/sponsors.html b/www/sponsors.html
index cd80b989f62f6e93ee342c5bdedad5e829dcb4a4..a2510e8f38d70b1e67767646d49245fb22d91ae1 100644 (file)
--- a/www/sponsors.html
+++ b/www/sponsors.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+   <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011050100025 atlas.multimedia-->
 </div>
 </div>
 </div>
@@ -212,7 +212,7 @@
   <dd><a title="Image Converter" href="http://batchphoto.com/">Image Converter</a></dd>
   <dd><a title="Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a></dd>
   <dd><a title="Webdesign" href="http://www.renehornig.com">Webdesign</a></dd>
-  <dd><a title="Web Hosting" href="http://www.bodhost.com/shosting.html">Web Hosting</a></dd>
+  <dd><a title="Web Hosting" href="http://www.bodhost.com/hosting.shtml">Web Hosting</a></dd>
   <dd><a title="Web Hosting Ratings" href="http://webhostingrating.com">Web Hosting Ratings</a></dd>
 </dl>
 

diff --git a/www/stream.html b/www/stream.html
index b240841070c41975e3e68cf4b17bc453fa958116..8df0d073be5b0c0fc2999b1c792eb85e45048aaa 100644 (file)
--- a/www/stream.html
+++ b/www/stream.html
@@ -169,7 +169,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
 </div>
 </div>
 </div>

diff --git a/www/subversion.html b/www/subversion.html
index c38a14d5109310a1b27689cae47e6bf38e36ad75..eff098dfeffba1cd361be0f6eb811d44da9eb8b2 100644 (file)
--- a/www/subversion.html
+++ b/www/subversion.html
@@ -168,7 +168,7 @@
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
 </div>
 <div  class="sponsor">
-   <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+   <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
 </div>
 </div>
 </div>