From: cristy Date: Fri, 20 Nov 2009 01:02:19 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10363 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d97b6eda714a6417526ab23845c235d9a35bff97;p=imagemagick --- diff --git a/ChangeLog b/ChangeLog index 5c90e05e7..c2fcf51d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2009-11-18 6.5.7-9 Cristy * Read / write 32-bit SUN raster images with a odd width. + * Cairo format returns pixels with the alpha premultiplied (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=15081). 2009-11-12 6.5.7-8 Cristy * Thumb::URI file URI now has the correct number of forward slashes. diff --git a/coders/svg.c b/coders/svg.c index bca0c907d..96912a7d4 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -2852,6 +2852,22 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) fill_color.blue=ScaleCharToQuantum(*p++); #endif fill_color.opacity=QuantumRange-ScaleCharToQuantum(*p++); +#if defined(MAGICKCORE_CAIRO_DELEGATE) + { + double + gamma; + + /* + CAIRO_FORMAT_ARGB32: http://library.gnome.org/devel/cairo/stable/ + cairo-image-surface.html#cairo-format-t + */ + gamma=1.0-QuantumScale*fill_color.opacity; + gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + fill_color.blue*=gamma; + fill_color.green*=gamma; + fill_color.red*=gamma; + } +#endif MagickCompositeOver(&fill_color,fill_color.opacity,q,(MagickRealType) q->opacity,q); q++; diff --git a/index.html b/index.html index 305a06a7f..fdf128aa8 100644 --- a/index.html +++ b/index.html @@ -124,7 +124,7 @@
diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 5d67ab243..c0560bc53 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -124,9 +124,6 @@ Sponsors:
- @@ -211,7 +208,7 @@ Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 584ae226d..98ee8d8b1 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -487,7 +487,7 @@ Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/animate.html b/www/animate.html index ee6144ea0..b4f2884c9 100644 --- a/www/animate.html +++ b/www/animate.html @@ -611,7 +611,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • Mailing Lists • - Studio + Studio   diff --git a/www/api.html b/www/api.html index de9ae25a6..1133c53ef 100644 --- a/www/api.html +++ b/www/api.html @@ -124,7 +124,7 @@
-

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

+

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

C

@@ -175,7 +175,7 @@

Ch

-

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

+

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

COM+

@@ -187,31 +187,31 @@

C++

-

Magick++ provides an object-oriented C++ interface to ImageMagick. 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.

+

Magick++ provides an object-oriented C++ interface to ImageMagick. 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.

Java

-

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

+

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

LabVIEW

-

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

+

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

Lisp

-

CL-Magick provides a Common Lisp interface to the ImageMagick library.

+

CL-Magick provides a Common Lisp interface to the ImageMagick library.

Neko

-

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

+

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

.NET

@@ -225,7 +225,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

@@ -237,50 +237,50 @@

PHP

-

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

+

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

-

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

+

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

-

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

+

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

Python

-

PythonMagick an object-oriented Python interface to ImageMagick.

+

PythonMagick an object-oriented Python interface to ImageMagick.

-

PythonMagickWand an object-oriented Python interface to MagickWand based on ctypes.

+

PythonMagickWand an object-oriented Python interface to MagickWand based on ctypes.

REALbasic

-

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

+

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

Ruby

-

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

+

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

-

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

+

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

-

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

+

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

-

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

+

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

Tcl/Tk

-

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

+

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

XML RPC

-

RemoteMagick is an XML-RPC web service that creates image thumbnails.

+

RemoteMagick is an XML-RPC web service that creates image thumbnails.

diff --git a/www/api/animate.html b/www/api/animate.html index 93b22af67..a8979fe04 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -124,7 +124,7 @@