From c02484c6f0b78135e8300ea1e3e580377f83efd3 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 8 Mar 2010 00:14:58 +0000 Subject: [PATCH] --- index.html | 2 +- magick/statistic.c | 5 +- www/ImageMagickObject.html | 5 +- www/advanced-windows-installation.html | 2 +- www/api.html | 42 +++++------ www/api/animate.html | 2 +- www/api/annotate.html | 3 - www/api/attribute.html | 4 +- www/api/blob.html | 3 + www/api/cache-view.html | 2 +- www/api/cache.html | 2 +- www/api/cipher.html | 3 + www/api/color.html | 2 +- www/api/colormap.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 | 4 +- www/api/drawing-wand.html | 2 +- www/api/feature.html | 2 +- www/api/fx.html | 4 +- www/api/histogram.html | 2 +- www/api/image.html | 3 - www/api/layer.html | 4 +- www/api/list.html | 2 +- www/api/magick-image.html | 5 +- www/api/magick-wand.html | 3 - www/api/magick.html | 5 +- www/api/memory.html | 4 +- www/api/montage.html | 4 +- www/api/morphology.html | 2 +- www/api/pixel-iterator.html | 3 - www/api/pixel-view.html | 2 +- www/api/property.html | 2 +- www/api/quantize.html | 5 +- www/api/registry.html | 4 +- www/api/resize.html | 4 +- www/api/resource.html | 2 +- www/api/segment.html | 4 +- www/api/shear.html | 4 +- www/api/signature.html | 5 +- www/api/statistic.html | 2 +- www/api/stream.html | 2 +- www/api/transform.html | 2 +- www/api/version.html | 2 +- www/architecture.html | 4 +- www/binary-releases.html | 4 +- www/cipher.html | 4 +- www/color.html | 2 +- www/command-line-options.html | 4 +- www/command-line-tools.html | 6 +- www/compare.html | 4 +- www/composite.html | 2 +- www/conjure.html | 2 +- www/contact.html | 4 +- www/convert.html | 4 +- www/display.html | 3 - www/download.html | 3 - www/escape.html | 2 +- www/examples.html | 4 +- www/exception.html | 2 +- www/formats.html | 2 +- www/fx.html | 4 +- www/high-dynamic-range.html | 2 +- www/history.html | 4 +- www/identify.html | 4 +- www/import.html | 2 +- www/index.html | 2 +- www/jp2.html | 5 +- www/license.html | 4 +- www/links.html | 96 +++++++++++++------------- www/magick-core.html | 2 +- www/magick-vector-graphics.html | 4 +- www/miff.html | 2 +- www/mirrors.html | 4 +- www/montage.html | 2 +- www/motion-picture.html | 5 +- www/quantize.html | 2 +- www/resources.html | 2 +- www/search.html | 2 +- www/sitemap.html | 52 +++++++------- www/sponsors.html | 2 +- www/subversion.html | 4 +- www/t-shirt.html | 2 +- 85 files changed, 216 insertions(+), 224 deletions(-) diff --git a/index.html b/index.html index 130ceae3a..decdc85ac 100644 --- a/index.html +++ b/index.html @@ -226,7 +226,7 @@ Discourse Server • - Studio + Studio   diff --git a/magick/statistic.c b/magick/statistic.c index 09337873f..c11ef5bea 100644 --- a/magick/statistic.c +++ b/magick/statistic.c @@ -533,7 +533,10 @@ MagickExport Image *EvaluateImages(const Image *images, q->red=ClampToQuantum(evaluate_pixel[x].red); q->green=ClampToQuantum(evaluate_pixel[x].green); q->blue=ClampToQuantum(evaluate_pixel[x].blue); - q->opacity=ClampToQuantum(evaluate_pixel[x].opacity); + if (evaluate_image->matte == MagickFalse) + q->opacity=ClampToQuantum(evaluate_pixel[x].opacity); + else + q->opacity=ClampToQuantum(QuantumRange-evaluate_pixel[x].opacity); if (evaluate_image->colorspace == CMYKColorspace) evaluate_indexes[x]=ClampToQuantum(evaluate_pixel[x].index); q++; diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 260efe6e9..ee7b1801d 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -124,6 +124,9 @@ Sponsors:
+ @@ -207,7 +210,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 760d5d3c3..3f3d40ce1 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -124,7 +124,7 @@
diff --git a/www/api/annotate.html b/www/api/annotate.html index 6b96aee4a..0465ed4fd 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -123,9 +123,6 @@ Sponsors:
- diff --git a/www/api/attribute.html b/www/api/attribute.html index 8ea6cb6bc..2e5e2ffbf 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -124,7 +124,7 @@
diff --git a/www/api/blob.html b/www/api/blob.html index c7d1a353d..202cedf7e 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -123,6 +123,9 @@ Sponsors:
+ diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 85984d88c..429239c80 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -579,7 +579,7 @@ _8c.html" target="source" name="SyncCacheViewAuthenticPixels">SyncCacheViewAuthe Discourse Server • - Studio + Studio  
diff --git a/www/api/cache.html b/www/api/cache.html index db253ebca..35c9065de 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -124,7 +124,7 @@