From 6bcf48e1e7de62a5ce47a6be419ca1666cb45b0b Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 15 Feb 2011 19:09:04 +0000 Subject: [PATCH] --- Magick++/INSTALL | 11 +- www/ImageMagickObject.html | 2 +- www/advanced-windows-installation.html | 4 +- www/animate.html | 2 +- www/api.html | 4 +- www/api/animate.html | 2 +- www/api/annotate.html | 2 +- www/api/attribute.html | 2 +- www/api/cache-view.html | 2 +- www/api/cache.html | 2 +- www/api/cipher.html | 2 +- www/api/color.html | 2 +- www/api/colormap.html | 2 +- www/api/colorspace.html | 2 +- www/api/compare.html | 2 +- www/api/composite.html | 2 +- www/api/constitute.html | 2 +- www/api/decorate.html | 2 +- www/api/deprecate.html | 2 +- www/api/display.html | 2 +- www/api/distort.html | 2 +- www/api/drawing-wand.html | 2 +- www/api/enhance.html | 2 +- www/api/exception.html | 2 +- www/api/feature.html | 2 +- www/api/fourier.html | 2 +- www/api/fx.html | 2 +- www/api/histogram.html | 2 +- www/api/image-view.html | 2 +- www/api/layer.html | 2 +- www/api/list.html | 2 +- www/api/magick-deprecate.html | 2 +- www/api/magick-image.html | 2 +- www/api/magick-property.html | 2 +- www/api/magick-wand.html | 2 +- www/api/memory.html | 2 +- www/api/module.html | 2 +- www/api/monitor.html | 2 +- www/api/paint.html | 2 +- www/api/pixel-iterator.html | 2 +- www/api/pixel-view.html | 2 +- www/api/pixel-wand.html | 2 +- www/api/profile.html | 2 +- www/api/property.html | 2 +- www/api/quantize.html | 2 +- www/api/resize.html | 2 +- www/api/resource.html | 2 +- www/api/segment.html | 2 +- www/api/shear.html | 2 +- www/api/signature.html | 2 +- www/api/statistic.html | 2 +- www/api/stream.html | 2 +- www/api/transform.html | 2 +- www/api/version.html | 2 +- www/api/wand-view.html | 2 +- www/binary-releases.html | 2 +- www/changelog.html | 2 +- www/color.html | 2 +- www/command-line-options.html | 4 +- www/compare.html | 2 +- www/composite.html | 2 +- www/conjure.html | 2 +- www/contrib/color-converter.html | 503 +++++++++++++++++++++++++ www/contrib/color-swatch.html | 37 ++ www/convert.html | 2 +- www/display.html | 2 +- www/download.html | 2 +- www/examples.html | 2 +- www/exception.html | 2 +- www/export.html | 2 +- www/formats.html | 12 +- www/fx.html | 2 +- www/history.html | 2 +- www/identify.html | 2 +- www/import.html | 2 +- www/install-source.html | 2 +- www/jp2.html | 2 +- www/license.html | 2 +- www/links.html | 9 +- www/magick++.html | 8 +- www/magick-core.html | 2 +- www/magick-vector-graphics.html | 2 +- www/magick-wand.html | 2 +- www/mailing-list.html | 2 +- www/miff.html | 2 +- www/mirrors.html | 2 +- www/mogrify.html | 2 +- www/montage.html | 2 +- www/motion-picture.html | 2 +- www/quantize.html | 2 +- www/resources.html | 2 +- www/search.html | 2 +- www/sitemap.html | 4 +- www/sponsors.html | 4 +- www/stream.html | 2 +- www/subversion.html | 2 +- 96 files changed, 651 insertions(+), 119 deletions(-) create mode 100644 www/contrib/color-converter.html create mode 100644 www/contrib/color-swatch.html diff --git a/Magick++/INSTALL b/Magick++/INSTALL index 97fc16ca2..7a36be089 100644 --- 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 2b403073f..aa506554f 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 1721c35f2..ded72cb27 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -168,7 +168,7 @@ Druckerei @@ -418,7 +418,7 @@

Prerequisites

    -
  1. Download and install Inno Setup 5.
    2. +
  2. Download and install Inno Setup 5.
  3. Download and install ActiveState ActivePerl.
diff --git a/www/animate.html b/www/animate.html index 28552dc10..6b6930431 100644 --- a/www/animate.html +++ b/www/animate.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/api.html b/www/api.html index c366934e1..e7b02da21 100644 --- a/www/api.html +++ b/www/api.html @@ -168,7 +168,7 @@ Druckerei @@ -244,7 +244,7 @@
Pascal
-
PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.
+
PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.
Perl
diff --git a/www/api/animate.html b/www/api/animate.html index 994acd776..a952c1ea6 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/annotate.html b/www/api/annotate.html index 23a7f333e..3f3cbbe60 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/attribute.html b/www/api/attribute.html index ce92b63a5..23a820ebb 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 1ddc8bb75..b1252e485 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/cache.html b/www/api/cache.html index 1580cd91d..78257bbfd 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/cipher.html b/www/api/cipher.html index 6316d6337..eea227ac0 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/color.html b/www/api/color.html index 1f7319edd..1a117f9f1 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/colormap.html b/www/api/colormap.html index 29798ee33..c87a796c1 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/colorspace.html b/www/api/colorspace.html index 8b6cdc22f..069d7669f 100644 --- a/www/api/colorspace.html +++ b/www/api/colorspace.html @@ -56,7 +56,7 @@ MagickWand MagickCore PerlMagick - Magick++ + Magick++ Architecture ]
[ Install from Source diff --git a/www/api/compare.html b/www/api/compare.html index 9d90537d4..79a616873 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/composite.html b/www/api/composite.html index 8f5446beb..f1d54e1b1 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/constitute.html b/www/api/constitute.html index 362b333fe..d5bf929f3 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/decorate.html b/www/api/decorate.html index bc308a196..9f05731b7 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/deprecate.html b/www/api/deprecate.html index b5a8a0bce..88b7c7a66 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/display.html b/www/api/display.html index 9761f6118..698230b50 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/distort.html b/www/api/distort.html index 5309d8517..d80920940 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 4af0255b7..d7e658d09 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/enhance.html b/www/api/enhance.html index 248abfff1..2b4f785cc 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/exception.html b/www/api/exception.html index 0a2151806..ab8a448d3 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/feature.html b/www/api/feature.html index b53f77cb0..0e875ff87 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/fourier.html b/www/api/fourier.html index 8e6a3dcba..66004ff47 100644 --- a/www/api/fourier.html +++ b/www/api/fourier.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/fx.html b/www/api/fx.html index 724844b5f..e0f7d91e7 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/histogram.html b/www/api/histogram.html index ac1d2d5ef..80b421ea8 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/image-view.html b/www/api/image-view.html index 9f643d827..c93b903e9 100644 --- a/www/api/image-view.html +++ b/www/api/image-view.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/layer.html b/www/api/layer.html index 206be277e..c6df7da85 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/list.html b/www/api/list.html index e4b474983..c7e31d788 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 926ebc55a..89735d58d 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/magick-image.html b/www/api/magick-image.html index add004fc8..29ca181c6 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 5de22c22e..9b0b978f1 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index 9806d9012..3df4be94d 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/memory.html b/www/api/memory.html index 1051f5924..11d8b52a5 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/module.html b/www/api/module.html index a386f426c..0cacee947 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/monitor.html b/www/api/monitor.html index 08ca65746..e3a72a921 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/paint.html b/www/api/paint.html index 369b8ec76..24c81139c 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 20a1fa6a6..540046e3e 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/pixel-view.html b/www/api/pixel-view.html index 63857479f..cfc556c22 100644 --- a/www/api/pixel-view.html +++ b/www/api/pixel-view.html @@ -86,7 +86,7 @@ PerlMagick
- Magick++ + Magick++
diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index 7b8194ce4..c88e9c1b7 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -168,7 +168,7 @@ Druckerei
diff --git a/www/api/profile.html b/www/api/profile.html index 01ec750da..3f7213c5a 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/property.html b/www/api/property.html index 58f1262df..b326b2a18 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/quantize.html b/www/api/quantize.html index f81ab453a..54ac7c4f8 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/resize.html b/www/api/resize.html index 54a89d644..9cd1cb814 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/resource.html b/www/api/resource.html index ce3f62651..87c0f62c9 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/segment.html b/www/api/segment.html index 9eed1837e..c90d8834e 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/shear.html b/www/api/shear.html index 313f511d4..1e0757fcb 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/signature.html b/www/api/signature.html index 8832bfbb8..9749006c3 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/statistic.html b/www/api/statistic.html index 66f9ac61c..fa8810ba5 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/stream.html b/www/api/stream.html index 914d3cf00..71eed5ce9 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/transform.html b/www/api/transform.html index 2828c0c32..121393443 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/version.html b/www/api/version.html index 54af00957..b2df46d12 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/api/wand-view.html b/www/api/wand-view.html index a31b0b4b6..2e05dffc9 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/binary-releases.html b/www/binary-releases.html index 14906b053..1a6807da0 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/changelog.html b/www/changelog.html index 90333f039..2bc07c516 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/color.html b/www/color.html index a89bae34c..410959f0e 100644 --- a/www/color.html +++ b/www/color.html @@ -202,7 +202,7 @@

Use the -Color Converter +Color Converter 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.

diff --git a/www/command-line-options.html b/www/command-line-options.html index c0d979c6d..a79d21aad 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -172,7 +172,7 @@ Druckerei
@@ -2197,7 +2197,7 @@ class="arg">method being used.

Barrel Given the four coefficients (A,B,C,D) as defined by Helmut + href="http://wiki.panotools.org/Lens_correction_model" >Helmut Dersch, perform a barrell or pin-cushion distortion appropriate to correct radial lens distortions. That is in photographs, make straight lines straight again.
diff --git a/www/compare.html b/www/compare.html index 3b22f44ad..ad0446a10 100644 --- a/www/compare.html +++ b/www/compare.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/composite.html b/www/composite.html index 5d2372615..c1bf6b9d7 100644 --- a/www/composite.html +++ b/www/composite.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/conjure.html b/www/conjure.html index 885ce77fd..4b7a6b47b 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/contrib/color-converter.html b/www/contrib/color-converter.html new file mode 100644 index 000000000..6c0621540 --- /dev/null +++ b/www/contrib/color-converter.html @@ -0,0 +1,503 @@ + + + +Color Converter + + + + + + + + + +

COLOR CONVERTER

+ +

Please Specify Any Valid Single IM 6.5.6-6+ Color

+

e.g., name, hex, rgb(...), hsl(...), hsb(...), cmyk(...), gray(...) +
or rgba(...), hsla(...), hsba(...), cmyka(...), graya(...)

+

see +http://www.imagemagick.org/www/color.html

+ +
+Color: +
+Background For Transparent Colors:
+ /> White + /> Gray + /> Black + /> Checker +
+ + + +"; + echo strtoupper($colormode) . ":
"; + if ( $colormode != "cmyk" ) + { + if ( is_numeric($color4) ) + { + echo $colormode . "a($C1V,$C2V,$C3V,$C4V)
"; + echo $colormode . "a($C1P%,$C2P%,$C3P%,$C4V)
"; + } + else + { + echo $colormode . "($C1V,$C2V,$C3V)
"; + echo $colormode . "($C1P%,$C2P%,$C3P%)
"; + } + } + else + { + if ( is_numeric($color5) ) + { + echo "cmyka($C1V,$C2V,$C3V,$C4V,$C5V)
"; + echo "cmyka($C1P%,$C2P%,$C3P%,$C4P%,$C5V)
"; + } + else + { + echo "cmyk($C1V,$C2V,$C3V,$C4V)
"; + echo "cmyk($C1P%,$C2P%,$C3P%,$C4P%)
"; + } + } + } + + + # 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 "

$errMsg $numArray[1]

"; + exit; + } + elseif ( $commacount >= 1 && $commacount <= 4 && $lparenct != 1 ) + { + echo "

$errMsg $numArray[2]

"; + exit; + } + elseif ( $commacount >= 1 && $commacount <= 4 && $rparenct != 1 ) + { + echo "

$errMsg $numArray[3]

"; + exit; + } + elseif ( $commacount == 0 && $lparenct == 1 && $rparenct == 1 && $chars5 != "gray(" ) + { + echo "

$errMsg $numArray[4]

"; + exit; + } + elseif ( $commacount == 1 && $chars6 != "graya(" ) + { + echo "

$errMsg $numArray[5]

"; + exit; + } + elseif ( $commacount == 2 && $chars4 != "rgb(" && $chars4 != "hsl(" && $chars4 != "hsb(" ) + { + echo "

$errMsg $numArray[6]

"; + exit; + } + elseif ( $commacount == 3 && $chars5 != "rgba(" && $chars5 != "hsla(" && $chars5 != "hsba(" && $chars5 != "cmyk(" ) + { + echo "

$errMsg $numArray[7]

"; + exit; + } + elseif ( $commacount == 4 && $chars6 != "cmyka(" ) + { + echo "

$errMsg $numArray[8]

"; + exit; + } + elseif ( $color == "rgb" || $color == "hsl" || $color == "hsb" || $color == "rgba" || $color == "hsla" || $color == "hsba" || $color == "cmyk" || $color == "cmyka" ) + { + echo "

$errMsg $numArray[9]

"; + exit; + } + elseif ( $lparenct != 1 && $rparenct !=1 && ( $chars3 == "rgb" || $chars3 == "hsl" || $chars3 == "hsb" || $chars4 == "rgba" || $chars4 == "hsla" || $chars4 == "hsba" || $chars4 == "cmyk" || $chars5 == "cmyka" ) ) + { + echo "

$errMsg $numArray[10]

"; + exit; + } + + # test if color contains ,, or (, or ,) + if ( substr_count($color, ',,') > 0 ) + { + echo "

$errMsg $numArray[11]

"; + exit; + } + elseif ( substr_count($color, '(,') > 0 ) + { + echo "

$errMsg $numArray[12]

"; + exit; + } + elseif ( substr_count($color, ',)') > 0 ) + { + echo "

$errMsg $numArray[13]

"; + 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 "

$errMsg $numArray[14]

"; + exit; + } + elseif ( $hashcount == 1 && $hashloc != 0 ) + { + echo "

$errMsg $numArray[15]

"; + exit; + } + elseif ( $hashcount == 1 && $hashloc == 0 && $hexcount != 4 && $hexcount != 5 && $hexcount != 7 && $hexcount != 9 && $hexcount != 13 && $hexcount != 17 ) + { + echo "

$errMsg $numArray[16]

"; + exit; + } + elseif ( $hashcount == 0 && $lparenct != 1 && $rparencount != 1 ) + { + for( $i = 1; $i < sizeof($alphnumArray); $i++ ) + { + if ( $alphnumArray[$i] != "" ) + { + echo "

$errMsg $numArray[17]

"; + exit; + } + } + } + + # test for invalid characters in color input + if ( preg_match_all('/[^#%(),.0-9a-zA-Z]/', $color, $matches) != "" ) + { + echo "

$errMsg $numArray[18]

"; + 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 "

$color Contains A Numerical Color Component That Is Greater Than 100%

"; + exit; + } + elseif ( is_numeric($colorArray[$i]) && $colorArray[$i] > 255 && ( $chars3 == "rgb" || $chars4 == "cmyk" || $chars4 == "gray" ) ) + { + echo "

$color Contains A Numerical Color Component That Is Greater Than 255

"; + exit; + } + elseif ( is_numeric($colorArray[1]) && $colorArray[1] > 360 && ( $chars3 == "hsl" || $chars3 == "hsb" ) ) + { + echo "

$color Contains A Numerical Hue Component That Is Greater Than 360

"; + exit; + } + elseif ( is_numeric($colorArray[$i]) && $i != 1 && $colorArray[$i] > 255 && ( $chars3 == "hsl" || $chars3 == "hsb" ) ) + { + echo "

$color Contains A Numerical Non-Hue Component That Is Greater Than 255

"; + exit; + } + elseif ( is_numeric($colorArray[4]) && $colorArray[4] > 1 && ( $chars4 == "rgba" || $chars4 == "hsla" || $chars4 == "hsba" ) ) + { + echo "

$color Contains A Numerical Alpha Component That Is Greater Than 1

"; + exit; + } + elseif ( is_numeric($colorArray[5]) && $colorArray[5] > 1 && $chars5 == "cmyka" ) + { + echo "

$color Contains A Numerical Alpha Component That Is Greater Than 1

"; + exit; + } + elseif ( is_numeric($colorArray[2]) && $colorArray[2] > 1 && $chars5 == "graya" ) + { + echo "

$color Contains A Numerical Alpha Component That Is Greater Than 1

"; + 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 "

$color Contains A Non-Numerical Color Component

"; + exit; + } + elseif ( ( $chars4 == "rgb(" || $chars4 == "hsl(" || $chars4 == "hsb(" ) && ( !is_numeric($colorArray1) || !is_numeric($colorArray2) || !is_numeric($colorArray3) ) ) + { + echo "

$color Contains A Non-Numerical Color Component

"; + exit; + } + elseif ( ( $chars5 == "rgba(" || $chars5 == "hsla(" || $chars5 == "hsba(" || $chars5 =="cmyk" ) && ( !is_numeric($colorArray1) || !is_numeric($colorArray2) || !is_numeric($colorArray3) || !is_numeric($colorArray4) ) ) + { + echo "

$color Contains A Non-Numerical Color Component

"; + exit; + } + elseif ( $chars6 =="cmyka(" && ( !is_numeric($colorArray1) || !is_numeric($colorArray2) || !is_numeric($colorArray3) || !is_numeric($colorArray4) || !is_numeric($colorArray5) ) ) + { + echo "

$color Contains A Non-Numerical Color Component

"; + 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 "

$errMsg $numArray[19]

"; + exit; + } + } + + + # create display of colorswatch and textual color values + + # make one cell table and fill with PNG image from colorswatch.html + echo "
"; + echo "

$color
"; + echo ""; + if ( $bgcolor == "checker" ) + { + echo "
"; + } + else + { + echo "
"; + } + echo ""; + echo "
"; + echo "

"; + + echo "		"; + + # 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 "
"; + echo "HEX:
"; + echo "#$hexcolor
"; + + + # 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 "
"; + + } +?> + + diff --git a/www/contrib/color-swatch.html b/www/contrib/color-swatch.html new file mode 100644 index 000000000..570e5e9bd --- /dev/null +++ b/www/contrib/color-swatch.html @@ -0,0 +1,37 @@ + diff --git a/www/convert.html b/www/convert.html index 82e0b2bb8..cc684a366 100644 --- a/www/convert.html +++ b/www/convert.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/display.html b/www/display.html index 082e1b18e..5beb956a2 100644 --- a/www/display.html +++ b/www/display.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/download.html b/www/download.html index 192f5feaa..232354a20 100644 --- a/www/download.html +++ b/www/download.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/examples.html b/www/examples.html index 4d9e30a53..c227170b3 100644 --- a/www/examples.html +++ b/www/examples.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/exception.html b/www/exception.html index 584369441..a44f2675a 100644 --- a/www/exception.html +++ b/www/exception.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/export.html b/www/export.html index e27a7094f..e98c3f9fe 100644 --- a/www/export.html +++ b/www/export.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/formats.html b/www/formats.html index d07be62e9..6163c89ac 100644 --- a/www/formats.html +++ b/www/formats.html @@ -169,7 +169,7 @@ Druckerei @@ -508,7 +508,7 @@ the supported image formats.

HPGL R HP-GL plotter language - Requires hp2xx-3.2.0.tar.gz + Requires hp2xx-3.4.4.tar.gz @@ -617,17 +617,17 @@ the supported image formats.

- M2V + M2V RW Motion Picture Experts Group file interchange format (version 2) - Requires mpeg2vidcodec_v12.tar.gz. + Requires ffmpeg. - MPEG + MPEG RW Motion Picture Experts Group file interchange format (version 1) - Requires mpeg2vidcodec_v12.tar.gz. + Requires ffmpeg. diff --git a/www/fx.html b/www/fx.html index c2536fe28..cf7705e70 100644 --- a/www/fx.html +++ b/www/fx.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/history.html b/www/history.html index d19c13cec..eba47ebd5 100644 --- a/www/history.html +++ b/www/history.html @@ -89,7 +89,7 @@ PerlMagick
- Magick++ + Magick++
diff --git a/www/identify.html b/www/identify.html index 758139910..92606d1db 100644 --- a/www/identify.html +++ b/www/identify.html @@ -168,7 +168,7 @@ Druckerei
diff --git a/www/import.html b/www/import.html index ce965c360..14c2c0bfc 100644 --- a/www/import.html +++ b/www/import.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/install-source.html b/www/install-source.html index 00fd794c6..6505322e2 100644 --- a/www/install-source.html +++ b/www/install-source.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/jp2.html b/www/jp2.html index 69aca9d58..d586b046a 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/license.html b/www/license.html index b592dd6ce..a21d9a3bf 100644 --- a/www/license.html +++ b/www/license.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/links.html b/www/links.html index eda95de38..1263dda5e 100644 --- a/www/links.html +++ b/www/links.html @@ -168,7 +168,7 @@ Druckerei @@ -212,17 +212,16 @@
ImageMagick: A graphics wizard for the command line
ImageMagick command line examples - part 1
ImageMagick command line examples - part 2
-
ImageMagick & Java
+
ImageMagick & Java
ImageMagick, Part One
ImageMagick, Part Two
More Graphics from the Command Line
-
Ubuntu Firefox Themes

Program Interface Tutorials

-
Create Mosaic Images with Perl and ImageMagick
+
Create Mosaic Images with Perl and ImageMagick
Convert images for printing with MagickWand for PHP
Create Dynamic Images with ImageMagick
How to compile ImageMagick for PHP by hand
@@ -271,8 +270,6 @@
http://imagemagick.europnews.de
Germany
http://imagemagick.linux-mirror.org
-
Ireland
-
http://imagemagick.oss-mirror.org
United States
http://www.imagemagick.org
diff --git a/www/magick++.html b/www/magick++.html index dd4af7c5e..b29cee54c 100644 --- a/www/magick++.html +++ b/www/magick++.html @@ -169,7 +169,7 @@ Druckerei @@ -219,14 +219,14 @@ performed on multiple images stored in STL containers.

Documentation

-

Detailed documentation is +

Detailed documentation is provided for all Magick++ classes, class methods, and template functions which comprise the API. See a Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

Obtaining Magick++

-

Magick++ is included as part of ImageMagick +

Magick++ is included as part of ImageMagick source releases and may be retrieved via ftp or Subversion.

@@ -235,7 +235,7 @@ or Subversion.

Once you have the Magick++ sources available, follow these detailed -installation instructions for UNIX and +installation instructions for UNIX and Windows.

A helper script named Magick++-config is installed diff --git a/www/magick-core.html b/www/magick-core.html index b23a6e6da..94f6e288e 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -169,7 +169,7 @@ Druckerei

diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html index d04a8d0f8..a59798537 100644 --- a/www/magick-vector-graphics.html +++ b/www/magick-vector-graphics.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/magick-wand.html b/www/magick-wand.html index ec880c357..91bc5c1bc 100644 --- a/www/magick-wand.html +++ b/www/magick-wand.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/mailing-list.html b/www/mailing-list.html index d21894619..7bd3e87d1 100644 --- a/www/mailing-list.html +++ b/www/mailing-list.html @@ -73,7 +73,7 @@ PerlMagick
- Magick++ + Magick++
Architecture diff --git a/www/miff.html b/www/miff.html index 04291b33e..7a01ea027 100644 --- a/www/miff.html +++ b/www/miff.html @@ -168,7 +168,7 @@ Druckerei
diff --git a/www/mirrors.html b/www/mirrors.html index 51e7ca5a7..29aa343ee 100644 --- a/www/mirrors.html +++ b/www/mirrors.html @@ -89,7 +89,7 @@ PerlMagick
- Magick++ + Magick++
diff --git a/www/mogrify.html b/www/mogrify.html index abc3da6e9..aaac855e2 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -169,7 +169,7 @@ Druckerei
diff --git a/www/montage.html b/www/montage.html index 574bc83a4..2d6806ec6 100644 --- a/www/montage.html +++ b/www/montage.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/motion-picture.html b/www/motion-picture.html index 546540c5a..d8d854854 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/quantize.html b/www/quantize.html index 0c2059605..a6aa154e5 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/resources.html b/www/resources.html index 7c5567c82..750b6f77b 100644 --- a/www/resources.html +++ b/www/resources.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/search.html b/www/search.html index 3f179414a..a93883c70 100644 --- a/www/search.html +++ b/www/search.html @@ -168,7 +168,7 @@ Druckerei diff --git a/www/sitemap.html b/www/sitemap.html index 06d2a5946..6a69a1a9d 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -168,7 +168,7 @@ Druckerei @@ -280,7 +280,7 @@
MagickWand: convert, compose, and edit images from the C language.
MagickWand for PHP: a native PHP-extension to the ImageMagick MagickWand API.
nMagick: is a port of the ImageMagick library to the haXe and Neko platforms.
-
PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
+
PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
PerlMagick: convert, compose, and edit images from the Perl language.
PythonMagick: an object-oriented Python interface to ImageMagick.
RMagick: is an interface between the Ruby programming language and ImageMagick.
diff --git a/www/sponsors.html b/www/sponsors.html index cd80b989f..a2510e8f3 100644 --- a/www/sponsors.html +++ b/www/sponsors.html @@ -168,7 +168,7 @@ Druckerei @@ -212,7 +212,7 @@
Image Converter
Notebook Reparatur Berlin
Webdesign
-
Web Hosting
+
Web Hosting
Web Hosting Ratings
diff --git a/www/stream.html b/www/stream.html index b24084107..8df0d073b 100644 --- a/www/stream.html +++ b/www/stream.html @@ -169,7 +169,7 @@ Druckerei diff --git a/www/subversion.html b/www/subversion.html index c38a14d51..eff098dfe 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -168,7 +168,7 @@ Druckerei -- 2.50.0