From: cristy Date: Sat, 30 Apr 2011 23:11:03 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7600 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=baacd1791168d71a29884bfbe0ac39d95edf0978;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index f4aad1ed4..9241b690e 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.9 -%global Patchlevel 7 +%global Patchlevel 8 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index c196055c2..9b3637f62 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,9 +9,9 @@ - + - + diff --git a/config/delegates.xml b/config/delegates.xml index c9e321dd9..1abcbb84f 100644 --- a/config/delegates.xml +++ b/config/delegates.xml @@ -87,7 +87,7 @@ - + @@ -100,11 +100,11 @@ - + - + diff --git a/index.html b/index.html index c7f1af45d..24eab1ca6 100644 --- a/index.html +++ b/index.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -209,7 +209,7 @@

The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes memory and thread error detection to prevent security vulnerabilities.

-

The current release is ImageMagick 6.6.9-6.

+

The current release is ImageMagick 6.6.9-7.

diff --git a/libtool b/libtool index 7b4dd920d..fcf481b9d 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.6.9-7 +# Generated automatically by config.status (ImageMagick) 6.6.9-8 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/attribute.c b/magick/attribute.c index f70728e42..8378d460c 100644 --- a/magick/attribute.c +++ b/magick/attribute.c @@ -415,8 +415,9 @@ MagickExport size_t GetImageChannelDepth(const Image *image, ScaleQuantumToAny(GetOpacityPixelComponent(p),range),range); if (((channel & IndexChannel) != 0) && (image->colorspace == CMYKColorspace)) - status|=indexes[x] != ScaleAnyToQuantum(ScaleQuantumToAny( - GetIndexPixelComponent(indexes+x),range),range); + status|=GetIndexPixelComponent(indexes+x) != + ScaleAnyToQuantum(ScaleQuantumToAny(GetIndexPixelComponent(indexes+ + x),range),range); if (status == 0) break; current_depth[id]++; diff --git a/magick/colormap.c b/magick/colormap.c index 9df167de2..1b6247e89 100644 --- a/magick/colormap.c +++ b/magick/colormap.c @@ -232,13 +232,14 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, indexes=GetCacheViewAuthenticIndexQueue(image_view); for (x=0; x < (ssize_t) image->columns; x++) { - index=(ssize_t) (indexes[x]+displace) % image->colors; + index=(ssize_t) (GetIndexPixelComponent(indexes+x)+displace) % + image->colors; if (index < 0) index+=(ssize_t) image->colors; - indexes[x]=(IndexPacket) index; - q->red=image->colormap[index].red; - q->green=image->colormap[index].green; - q->blue=image->colormap[index].blue; + SetIndexPixelComponent(indexes+x,index); + SetRedPixelComponent(q,image->colormap[index].red); + SetGreenPixelComponent(q,image->colormap[index].green); + SetBluePixelComponent(q,image->colormap[index].blue); q++; } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) @@ -377,9 +378,11 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image) indexes=GetCacheViewAuthenticIndexQueue(image_view); for (x=0; x < (ssize_t) image->columns; x++) { - index=(IndexPacket) pixels[(ssize_t) indexes[x]]; - indexes[x]=index; - *q++=image->colormap[(ssize_t) index]; + index=(IndexPacket) pixels[(ssize_t) GetIndexPixelComponent(indexes+x)]; + SetIndexPixelComponent(indexes+x,index); + SetRedPixelComponent(q,image->colormap[(ssize_t) index].red); + SetGreenPixelComponent(q,image->colormap[(ssize_t) index].green); + SetBluePixelComponent(q,image->colormap[(ssize_t) index].blue); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) status=MagickFalse; diff --git a/magick/compress.c b/magick/compress.c index 25c72f619..1cde7f5ed 100644 --- a/magick/compress.c +++ b/magick/compress.c @@ -637,8 +637,10 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image) for (x=0; x < (ssize_t) image->columns; x++) { index=(IndexPacket) (*p++); - indexes[x]=index; - *q++=image->colormap[(ssize_t) index]; + SetIndexPixelComponent(indexes+x,index); + SetRedPixelComponent(q,image->colormap[(ssize_t) index].red); + SetGreenPixelComponent(q,image->colormap[(ssize_t) index].green); + SetBluePixelComponent(q,image->colormap[(ssize_t) index].blue); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) break; diff --git a/magick/deprecate.c b/magick/deprecate.c index 4d14233c2..ce94831c5 100644 --- a/magick/deprecate.c +++ b/magick/deprecate.c @@ -1833,15 +1833,19 @@ static double GetSimilarityMetric(const Image *image,const Image *reference, MagickRealType pixel; - pixel=QuantumScale*(GetRedPixelComponent(p)-(double) q->red); + pixel=QuantumScale*(GetRedPixelComponent(p)-(double) + GetRedPixelComponent(q)); similarity+=pixel*pixel; - pixel=QuantumScale*(GetGreenPixelComponent(p)-(double) q->green); + pixel=QuantumScale*(GetGreenPixelComponent(p)-(double) + GetGreenPixelComponent(q)); similarity+=pixel*pixel; - pixel=QuantumScale*(GetBluePixelComponent(p)-(double) q->blue); + pixel=QuantumScale*(GetBluePixelComponent(p)-(double) + GetBluePixelComponent(q)); similarity+=pixel*pixel; if ((image->matte != MagickFalse) && (reference->matte != MagickFalse)) { - pixel=QuantumScale*(GetOpacityPixelComponent(p)-(double) q->opacity); + pixel=QuantumScale*(GetOpacityPixelComponent(p)-(double) + GetOpacityPixelComponent(q)); similarity+=pixel*pixel; } if ((image->colorspace == CMYKColorspace) && @@ -2101,18 +2105,20 @@ MagickExport unsigned int FuzzyColorMatch(const PixelPacket *p, register MagickRealType distance; - if ((fuzz == 0.0) && (GetRedPixelComponent(p) == q->red) && (GetGreenPixelComponent(p) == q->green) && - (GetBluePixelComponent(p) == q->blue)) + if ((fuzz == 0.0) && (GetRedPixelComponent(p) == GetRedPixelComponent(q)) && + (GetGreenPixelComponent(p) == GetGreenPixelComponent(q)) && + (GetBluePixelComponent(p) == GetBluePixelComponent(q))) return(MagickTrue); - pixel.red=GetRedPixelComponent(p)-(MagickRealType) q->red; + pixel.red=GetRedPixelComponent(p)-(MagickRealType) GetRedPixelComponent(q); distance=pixel.red*pixel.red; if (distance > (fuzz*fuzz)) return(MagickFalse); - pixel.green=GetGreenPixelComponent(p)-(MagickRealType) q->green; + pixel.green=GetGreenPixelComponent(p)-(MagickRealType) + GetGreenPixelComponent(q); distance+=pixel.green*pixel.green; if (distance > (fuzz*fuzz)) return(MagickFalse); - pixel.blue=GetBluePixelComponent(p)-(MagickRealType) q->blue; + pixel.blue=GetBluePixelComponent(p)-(MagickRealType) GetBluePixelComponent(q); distance+=pixel.blue*pixel.blue; if (distance > (fuzz*fuzz)) return(MagickFalse); @@ -5479,34 +5485,34 @@ MagickExport unsigned int RandomChannelThresholdImage(Image *image,const char { indexes=GetAuthenticIndexQueue(image); for (x=0; x < (ssize_t) image->columns; x++) - { - MagickRealType - intensity; + { + MagickRealType + intensity; - intensity=(MagickRealType) PixelIntensityToQuantum(q); - if (order == 1) - { - if (intensity < lower_threshold) - threshold=lower_threshold; - else if (intensity > upper_threshold) - threshold=upper_threshold; - else - threshold=(MagickRealType) (QuantumRange* - GetPseudoRandomValue(random_info)); - } - else if (order == 2) - threshold=(MagickRealType) QuantumRange*o2[(x%2)+2*(y%2)]; - else if (order == 3) - threshold=(MagickRealType) QuantumRange*o3[(x%3)+3*(y%3)]; - else if (order == 4) - threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)]; - q->red=q->green=q->blue=(Quantum) (intensity <= - threshold ? 0 : QuantumRange); - index=(IndexPacket) (intensity <= threshold ? 0 : 1); - *indexes++=index; - q->red=q->green=q->blue=image->colormap[(ssize_t) index].red; - q++; - } + intensity=(MagickRealType) PixelIntensityToQuantum(q); + if (order == 1) + { + if (intensity < lower_threshold) + threshold=lower_threshold; + else if (intensity > upper_threshold) + threshold=upper_threshold; + else + threshold=(MagickRealType) (QuantumRange* + GetPseudoRandomValue(random_info)); + } + else if (order == 2) + threshold=(MagickRealType) QuantumRange*o2[(x%2)+2*(y%2)]; + else if (order == 3) + threshold=(MagickRealType) QuantumRange*o3[(x%3)+3*(y%3)]; + else if (order == 4) + threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)]; + index=(IndexPacket) (intensity <= threshold ? 0 : 1); + SetIndexPixelComponent(indexes+x,index); + SetRedPixelComponent(q,image->colormap[(ssize_t) index].red); + SetGreenPixelComponent(q,image->colormap[(ssize_t) index].green); + SetBluePixelComponent(q,image->colormap[(ssize_t) index].blue); + q++; + } } if (LocaleCompare(channel,"opacity") == 0 || LocaleCompare(channel,"all") == 0 || @@ -5531,8 +5537,8 @@ MagickExport unsigned int RandomChannelThresholdImage(Image *image,const char threshold=(MagickRealType) QuantumRange*o3[(x%3)+3*(y%3)]; else if (order == 4) threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)]/1.7; - q->opacity=(Quantum) ((MagickRealType) q->opacity <= threshold ? - 0 : QuantumRange); + SetOpacityPixelComponent(q,(MagickRealType) q->opacity <= + threshold ? 0 : QuantumRange); q++; } } @@ -6562,12 +6568,12 @@ MagickExport unsigned int ThresholdImage(Image *image,const double threshold) indexes=GetAuthenticIndexQueue(image); for (x=0; x < (ssize_t) image->columns; x++) { - index=(IndexPacket) ((MagickRealType) - PixelIntensityToQuantum(q) <= threshold ? 0 : 1); - indexes[x]=index; - q->red=image->colormap[(ssize_t) index].red; - q->green=image->colormap[(ssize_t) index].green; - q->blue=image->colormap[(ssize_t) index].blue; + index=(IndexPacket) ((MagickRealType) PixelIntensityToQuantum(q) <= + threshold ? 0 : 1); + SetIndexPixelComponent(indexes+x,index); + SetRedPixelComponent(q,image->colormap[(ssize_t) index].red); + SetGreenPixelComponent(q,image->colormap[(ssize_t) index].green); + SetBluePixelComponent(q,image->colormap[(ssize_t) index].blue); q++; } if (!SyncAuthenticPixels(image,&image->exception)) @@ -6681,23 +6687,20 @@ MagickExport unsigned int ThresholdImageChannel(Image *image, { index=(IndexPacket) ((MagickRealType) PixelIntensityToQuantum(q) <= pixel.red ? 0 : 1); - indexes[x]=index; - q->red=image->colormap[(ssize_t) index].red; - q->green=image->colormap[(ssize_t) index].green; - q->blue=image->colormap[(ssize_t) index].blue; + SetIndexPixelComponent(indexes+x,index); + SetRedPixelComponent(q,image->colormap[(ssize_t) index].red); + SetGreenPixelComponent(q,image->colormap[(ssize_t) index].green); + SetBluePixelComponent(q,image->colormap[(ssize_t) index].blue); q++; } else for (x=0; x < (ssize_t) image->columns; x++) { - q->red=(Quantum) ((MagickRealType) - q->red <= pixel.red ? 0 : QuantumRange); - q->green=(Quantum) ((MagickRealType) - q->green <= pixel.green ? 0 : QuantumRange); - q->blue=(Quantum) ((MagickRealType) - q->blue <= pixel.blue ? 0 : QuantumRange); - q->opacity=(Quantum) ((MagickRealType) - q->opacity <= pixel.opacity ? 0 : QuantumRange); + SetRedPixelComponent(q,q->red <= pixel.red ? 0 : QuantumRange); + SetGreenPixelComponent(q,q->green <= pixel.green ? 0 : QuantumRange); + SetBluePixelComponent(q,q->blue <= pixel.blue ? 0 : QuantumRange); + SetOpacityPixelComponent(q,q->opacity <= pixel.opacity ? 0 : + QuantumRange); q++; } if (!SyncAuthenticPixels(image,&image->exception)) diff --git a/magick/feature.c b/magick/feature.c index a5c89c15a..a49e8c3bc 100644 --- a/magick/feature.c +++ b/magick/feature.c @@ -257,8 +257,8 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image, grays[ScaleQuantumToMap(GetOpacityPixelComponent(p))].opacity= ScaleQuantumToMap(GetOpacityPixelComponent(p)); if (image->colorspace == CMYKColorspace) - grays[ScaleQuantumToMap(indexes[x])].index= - ScaleQuantumToMap(indexes[x]); + grays[ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))].index= + ScaleQuantumToMap(GetIndexPixelComponent(indexes+x)); p++; } } @@ -475,7 +475,7 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image, v=0; while (grays[u].red != ScaleQuantumToMap(GetRedPixelComponent(p))) u++; - while (grays[v].red != ScaleQuantumToMap((p+offset)->red)) + while (grays[v].red != ScaleQuantumToMap(GetRedPixelComponent(p+offset))) v++; cooccurrence[u][v].direction[i].red++; cooccurrence[v][u].direction[i].red++; @@ -483,7 +483,7 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image, v=0; while (grays[u].green != ScaleQuantumToMap(GetGreenPixelComponent(p))) u++; - while (grays[v].green != ScaleQuantumToMap((p+offset)->green)) + while (grays[v].green != ScaleQuantumToMap(GetGreenPixelComponent(p+offset))) v++; cooccurrence[u][v].direction[i].green++; cooccurrence[v][u].direction[i].green++; @@ -510,9 +510,9 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image, { u=0; v=0; - while (grays[u].index != ScaleQuantumToMap(indexes[x])) + while (grays[u].index != ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))) u++; - while (grays[v].index != ScaleQuantumToMap(indexes[x+offset])) + while (grays[v].index != ScaleQuantumToMap(GetIndexPixelComponent(indexes+x+offset))) v++; cooccurrence[u][v].direction[i].index++; cooccurrence[v][u].direction[i].index++; diff --git a/magick/fourier.c b/magick/fourier.c index dc1f4f870..855d5c37c 100644 --- a/magick/fourier.c +++ b/magick/fourier.c @@ -305,27 +305,32 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info, case RedChannel: default: { - q->red=ClampToQuantum(QuantumRange*magnitude_source[i]); + SetRedPixelComponent(q,ClampToQuantum(QuantumRange* + magnitude_source[i])); break; } case GreenChannel: { - q->green=ClampToQuantum(QuantumRange*magnitude_source[i]); + SetGreenPixelComponent(q,ClampToQuantum(QuantumRange* + magnitude_source[i])); break; } case BlueChannel: { - q->blue=ClampToQuantum(QuantumRange*magnitude_source[i]); + SetBluePixelComponent(q,ClampToQuantum(QuantumRange* + magnitude_source[i])); break; } case OpacityChannel: { - q->opacity=ClampToQuantum(QuantumRange*magnitude_source[i]); + SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange* + magnitude_source[i])); break; } case IndexChannel: { - indexes[x]=ClampToQuantum(QuantumRange*magnitude_source[i]); + SetIndexPixelComponent(indexes+x,ClampToQuantum(QuantumRange* + magnitude_source[i])); break; } case GrayChannels: @@ -357,27 +362,32 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info, case RedChannel: default: { - q->red=ClampToQuantum(QuantumRange*phase_source[i]); + SetRedPixelComponent(q,ClampToQuantum(QuantumRange* + phase_source[i])); break; } case GreenChannel: { - q->green=ClampToQuantum(QuantumRange*phase_source[i]); + SetGreenPixelComponent(q,ClampToQuantum(QuantumRange* + phase_source[i])); break; } case BlueChannel: { - q->blue=ClampToQuantum(QuantumRange*phase_source[i]); + SetBluePixelComponent(q,ClampToQuantum(QuantumRange* + phase_source[i])); break; } case OpacityChannel: { - q->opacity=ClampToQuantum(QuantumRange*phase_source[i]); + SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange* + phase_source[i])); break; } case IndexChannel: { - indexes[x]=ClampToQuantum(QuantumRange*phase_source[i]); + SetIndexPixelComponent(indexes+x,ClampToQuantum(QuantumRange* + phase_source[i])); break; } case GrayChannels: @@ -1100,27 +1110,28 @@ static MagickBooleanType InverseFourierTransform(FourierInfo *fourier_info, case RedChannel: default: { - q->red=ClampToQuantum(QuantumRange*source[i]); + SetRedPixelComponent(q,ClampToQuantum(QuantumRange*source[i])); break; } case GreenChannel: { - q->green=ClampToQuantum(QuantumRange*source[i]); + SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*source[i])); break; } case BlueChannel: { - q->blue=ClampToQuantum(QuantumRange*source[i]); + SetBluePixelComponent(q,ClampToQuantum(QuantumRange*source[i])); break; } case OpacityChannel: { - q->opacity=ClampToQuantum(QuantumRange*source[i]); + SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange*source[i])); break; } case IndexChannel: { - indexes[x]=ClampToQuantum(QuantumRange*source[i]); + SetIndexPixelComponent(indexes+x,ClampToQuantum(QuantumRange* + source[i])); break; } case GrayChannels: diff --git a/magick/histogram.c b/magick/histogram.c index 4b0532a7f..4586bcf72 100644 --- a/magick/histogram.c +++ b/magick/histogram.c @@ -286,7 +286,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, node_info->list[i].pixel=(*p); if ((image->colorspace == CMYKColorspace) || (image->storage_class == PseudoClass)) - node_info->list[i].index=indexes[x]; + node_info->list[i].index=GetIndexPixelComponent(indexes+x); node_info->list[i].count=1; node_info->number_unique++; cube_info->colors++; @@ -757,7 +757,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image, node_info->list[i].pixel=(*p); if ((image->colorspace == CMYKColorspace) || (image->storage_class == PseudoClass)) - node_info->list[i].index=indexes[x]; + node_info->list[i].index=GetIndexPixelComponent(indexes+x); node_info->list[i].count=1; node_info->number_unique++; cube_info->colors++; @@ -920,7 +920,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image, node_info->list[i].pixel=(*p); if ((image->colorspace == CMYKColorspace) || (image->storage_class == PseudoClass)) - node_info->list[i].index=indexes[x]; + node_info->list[i].index=GetIndexPixelComponent(indexes+x); node_info->list[i].count=1; node_info->number_unique++; cube_info->colors++; diff --git a/magick/mac.c b/magick/mac.c index bf8cbfed8..756c6f9ab 100644 --- a/magick/mac.c +++ b/magick/mac.c @@ -1364,11 +1364,11 @@ MagickExport Image *ReadPICTImage(const ImageInfo *image_info, for (x=0; x < image->columns; x++) { GetCPixel(x,y,&Pixel); - q->red=ScaleCharToQuantum(Pixel.red & 0xff); - q->green=ScaleCharToQuantum(Pixel.green & 0xff); - q->blue=ScaleCharToQuantum(Pixel.blue & 0xff); + SetRedPixelComponent(q,ScaleCharToQuantum(Pixel.red & 0xff)); + SetGreenPixelComponent(q,ScaleCharToQuantum(Pixel.green & 0xff)); + SetBluePixelComponent(q,ScaleCharToQuantum(Pixel.blue & 0xff)); if (image->storage_class == PseudoClass) - indexes[x]=Color2Index(&Pixel); + SetIndexPixelComponent(indexes+x,Color2Index(&Pixel)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/magick/version.h b/magick/version.h index d2da76321..9c481b975 100644 --- a/magick/version.h +++ b/magick/version.h @@ -31,11 +31,11 @@ extern "C" { #define MagickLibVersion 0x669 #define MagickLibVersionText "6.6.9" #define MagickLibVersionNumber 4,0,1 -#define MagickLibAddendum "-7" +#define MagickLibAddendum "-8" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2011-04-29" -#define MagickChangeDate "20110427" +#define MagickReleaseDate "2011-04-30" +#define MagickChangeDate "20110430" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " diff --git a/version.sh b/version.sh index a6c6cfd71..6e6f7cc81 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.9' PACKAGE_LIB_VERSION="0x669" -PACKAGE_RELEASE="7" +PACKAGE_RELEASE="8" PACKAGE_LIB_VERSION_NUMBER="6,6,9,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 8db2e0976..0fab4de14 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -161,14 +161,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -179,13 +176,16 @@ Flyer drucken
+ diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 161a08c5b..6c5e5d6c0 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -221,7 +221,7 @@

The configure script looks at your environment and decides what it can cobble together to get ImageMagick compiled and installed on your system. This includes finding a compiler, where your compiler header files are located (e.g. stdlib.h), and if any delegate libraries are available for ImageMagick to use (e.g. JPEG, PNG, TIFF, etc.). If you are willing to accept configure's default options, and build from within the source directory, you can simply type:

-

$magick> cd ImageMagick-6.6.9-6 $magick> ./configure

+

$magick> cd ImageMagick-6.6.9-7 $magick> ./configure

Watch the configure script output to verify that it finds everything that you think it should. Pay particular attention to the last lines of the script output. For example, here is a recent report from our system:

@@ -573,7 +573,7 @@ Options used to compile and link:

Download the ImageMagick source distribution and verify the distribution against its message digest.

Unpack and change into the top-level ImageMagick directory:

-

$magick> tar xvfz ImageMagick-6.6.9-6.tar.gz $magick> cd ImageMagick-6.6.9-6

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.6.9-7.tar.gz $magick> cd ImageMagick-6.6.9-7

Configure ImageMagick:

$magick> ./configure --prefix=/opt --with-quantum-depth=16 \
--disable-dependency-tracking --with-x=yes \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \
@@ -593,7 +593,7 @@ Options used to compile and link:

Although you can download and install delegate libraries yourself, many are already available in the GnuWin32 distribution. Download and install whichever delegate libraries you require such as JPEG, PNG, TIFF, etc. Make sure you specify the development headers when you install a package. Next type,

-

$magick> tar jxvf ImageMagick-6.6.9-?.tar.bz2 $magick> cd ImageMagick-6.6.9-6 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

+

$magick> tar jxvf ImageMagick-6.6.9-?.tar.bz2 $magick> cd ImageMagick-6.6.9-7 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

Dealing with Unexpected Problems

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 36aacd4af..5bb5dc847 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,11 +175,14 @@ Flyer drucken
+ @@ -473,7 +473,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.9-6-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.6.9-7-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
  2. Complete the installer screens to install ImageMagick on your system.
diff --git a/www/animate.html b/www/animate.html index 5315cc2f1..9879ef617 100644 --- a/www/animate.html +++ b/www/animate.html @@ -161,14 +161,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -179,13 +176,16 @@ Flyer drucken
+
diff --git a/www/api.html b/www/api.html index 6a33f5794..db43c6a7a 100644 --- a/www/api.html +++ b/www/api.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/animate.html b/www/api/animate.html index 86baa50f7..f515d6586 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/annotate.html b/www/api/annotate.html index 8f3f06b95..2b1de0b52 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/attribute.html b/www/api/attribute.html index 84a04c7c1..27bc03313 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/blob.html b/www/api/blob.html index 1e37c8a59..6028733c0 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/cache-view.html b/www/api/cache-view.html index b9f1f0fe1..e1567eb65 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -197,7 +197,7 @@

Module cache-view Methods

-

[AcquireCacheView • CloneCacheView • DestroyCacheView • GetCacheViewColorspace • GetCacheViewException • GetCacheViewStorageClass • GetCacheViewAuthenticPixels • GetOneCacheViewAuthenticPixel • GetCacheViewAuthenticIndexQueue • GetCacheViewAuthenticPixelQueue • GetCacheViewVirtualIndexQueue • GetCacheViewVirtualPixelQueue • GetCacheViewVirtualPixels • GetOneCacheViewVirtualPixel • GetOneCacheViewVirtualMethodPixel • QueueCacheViewAuthenticPixels • SetCacheViewStorageClass • SetCacheViewVirtualPixelMethod • SyncCacheViewAuthenticPixels]

+

[AcquireCacheView • CloneCacheView • DestroyCacheView • GetCacheViewChannels • GetCacheViewColorspace • GetCacheViewException • GetCacheViewStorageClass • GetCacheViewAuthenticPixels • GetOneCacheViewAuthenticPixel • GetCacheViewAuthenticIndexQueue • GetCacheViewAuthenticPixelQueue • GetCacheViewVirtualIndexQueue • GetCacheViewVirtualPixelQueue • GetCacheViewVirtualPixels • GetOneCacheViewVirtualPixel • GetOneCacheViewVirtualMethodPixel • QueueCacheViewAuthenticPixels • SetCacheViewStorageClass • SetCacheViewVirtualPixelMethod • SyncCacheViewAuthenticPixels]

AcquireCacheView

@@ -246,6 +246,23 @@

A description of each parameter follows:

+
cache_view
+

the cache view.

+ +
+

GetCacheViewChannels

+
+ +

GetCacheViewChannels() returns the image pixel channels associated with the specified view.

+ +

The format of the GetCacheViewChannels method is:

+ +
+  size_t GetCacheViewChannels(const CacheView *cache_view)
+
+ +

A description of each parameter follows:

+
cache_view

the cache view.

diff --git a/www/api/cache.html b/www/api/cache.html index 6a9a5c015..a83666daf 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+
diff --git a/www/api/cipher.html b/www/api/cipher.html index 006ca574e..23220f545 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,11 +175,14 @@ Flyer drucken
+ diff --git a/www/api/color.html b/www/api/color.html index 754bd3204..25092059b 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/colormap.html b/www/api/colormap.html index f54374b70..63d884fa7 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/compare.html b/www/api/compare.html index a26a452e9..3c7c1732c 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/composite.html b/www/api/composite.html index 2f79d1248..a6167794d 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/constitute.html b/www/api/constitute.html index 576f20c1a..b2fb93137 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/decorate.html b/www/api/decorate.html index fa98bc41c..484db0043 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 3a66f5cb1..72d313df6 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/display.html b/www/api/display.html index 022c3c150..380cbadbf 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/distort.html b/www/api/distort.html index 2b3b09e00..8a539f1f7 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -244,7 +244,7 @@

Extra Controls from Image meta-data (artifacts)...

-

o "verbose" Output to stderr alternatives, internal coefficents, and FX equivelents for the distortion operation (if feasible). This forms an extra check of the distortion method, and allows users access to the internal constants IM calculates for the distortion.

+

o "verbose" Output to stderr alternatives, internal coefficents, and FX equivalents for the distortion operation (if feasible). This forms an extra check of the distortion method, and allows users access to the internal constants IM calculates for the distortion.

o "distort:viewport" Directly set the output image canvas area and offest to use for the resulting image, rather than use the original images canvas, or a calculated 'bestfit' canvas.

diff --git a/www/api/draw.html b/www/api/draw.html index 211d9988d..dc0be8e1a 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index b7b046b16..23a57c47c 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/effect.html b/www/api/effect.html index bdaa78a4e..ffd09b44c 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/enhance.html b/www/api/enhance.html index 80b4fd40a..570195c0b 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/exception.html b/www/api/exception.html index 1f9042c5b..fb475777b 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,11 +175,14 @@ Flyer drucken
+ diff --git a/www/api/feature.html b/www/api/feature.html index b8d403208..814e3035e 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/fourier.html b/www/api/fourier.html index 78f97115e..4d122aa1b 100644 --- a/www/api/fourier.html +++ b/www/api/fourier.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/fx.html b/www/api/fx.html index 793501b61..8dc6d5700 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/histogram.html b/www/api/histogram.html index e4aa28be9..e2a3597ec 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -270,7 +270,7 @@

MinMaxStretchImage() uses the exact minimum and maximum values found in each of the channels given, as the BlackPoint and WhitePoint to linearly stretch the colors (and histogram) of the image. The stretch points are also moved further inward by the adjustment values given.

-

If the adjustment values are both zero this function is equivelent to a perfect normalization (or autolevel) of the image.

+

If the adjustment values are both zero this function is equivalent to a perfect normalization (or autolevel) of the image.

Each channel is stretched independantally of each other (producing color distortion) unless the special 'SyncChannels' flag is also provided in the channels setting. If this flag is present the minimum and maximum point will be extracted from all the given channels, and those channels will be stretched by exactly the same amount (preventing color distortion).

diff --git a/www/api/image-view.html b/www/api/image-view.html index 1bb277542..abf2429ed 100644 --- a/www/api/image-view.html +++ b/www/api/image-view.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,11 +175,14 @@ Flyer drucken
+ diff --git a/www/api/image.html b/www/api/image.html index 131aee933..2f1c3ea81 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -197,7 +197,7 @@

Module image Methods

-

[AcquireImage • AcquireImageInfo • AcquireNextImage • AppendImages • CatchImageException • ClipImagePath • CloneImage • CloneImageInfo • CombineImages • DestroyImage • DestroyImageInfo • GetImageAlphaChannel • GetImageClipMask • GetImageException • GetImageInfo • GetImageInfoFile • GetImageMask • GetImageVirtualPixelMethod • InterpretImageFilename • IsHighDynamicRangeImage • IsImageObject • IsTaintImage • ModifyImage • NewMagickImage • ReferenceImage • ResetImagePage • SeparateImageChannel • SeparateImages • SetImageAlphaChannel • SetImageBackgroundColor • SetImageColor • SetImageStorageClass • SetImageClipMask • SetImageExtent • SetImageInfoBlob • SetImageInfoFile • SetImageMask • SetImageOpacity • SetImageType • SetImageVirtualPixelMethod • SmushImages • StripImage • SyncImageSettings]

+

[AcquireImage • AcquireImageInfo • AcquireNextImage • AppendImages • CatchImageException • ClipImagePath • CloneImage • CloneImageInfo • CombineImages • DestroyImage • DestroyImageInfo • GetImageAlphaChannel • GetImageClipMask • GetImageException • GetImageInfo • GetImageInfoFile • GetImageMask • GetImageChannels • GetImageVirtualPixelMethod • InterpretImageFilename • IsHighDynamicRangeImage • IsImageObject • IsTaintImage • ModifyImage • NewMagickImage • ReferenceImage • ResetImagePage • SeparateImageChannel • SeparateImages • SetImageAlphaChannel • SetImageBackgroundColor • SetImageChannels • SetImageColor • SetImageStorageClass • SetImageClipMask • SetImageExtent • SetImageInfoBlob • SetImageInfoFile • SetImageMask • SetImageOpacity • SetImageType • SetImageVirtualPixelMethod • SmushImages • StripImage • SyncImageSettings]

AcquireImage

@@ -521,6 +521,23 @@

A description of each parameter follows:

+
image
+

the image.

+ +
+

GetImageChannels

+
+ +

GetImageChannels() returns the number of pixel channels associated with the specified image.

+ +

The format of the GetChannels method is:

+ +
+  size_t GetImageChannels(Image *image)
+
+ +

A description of each parameter follows:

+
image

the image.

@@ -794,6 +811,26 @@
image

the image.

+
+

SetImageChannels

+
+ +

SetImageChannels() sets the number of pixels channels associated with the image.

+ +

The format of the SetImageChannels method is:

+ +
+  MagickBooleanType SetImageChannels(Image *image,const size_t channels)
+
+ +

A description of each parameter follows:

+ +
image
+

the image.

+ +
channels
+

The number of pixel channels.

+

SetImageColor

diff --git a/www/api/layer.html b/www/api/layer.html index 189503438..fe682ccf5 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+
diff --git a/www/api/list.html b/www/api/list.html index 6745dcc83..28e004ebe 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 499173c5c..a4a694fab 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/magick-image.html b/www/api/magick-image.html index 6f95d995a..55843b04c 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -3712,7 +3712,7 @@
threshold_map

A string containing the name of the threshold dither map to use, followed by zero or more numbers representing the number of color levels tho dither between.

-

Any level number less than 2 is equivelent to 2, and means only binary dithering will be applied to each color channel.

+

Any level number less than 2 is equivalent to 2, and means only binary dithering will be applied to each color channel.

No numbers also means a 2 level (bitmap) dither will be applied to all channels, while a single number is the number of levels applied to each channel in sequence. More numbers will be applied in turn to each of the color channels.

diff --git a/www/api/magick-property.html b/www/api/magick-property.html index d55f957fb..cc599f957 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index bd2b38ab1..2cba4e42f 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/magick.html b/www/api/magick.html index c8be741a5..29037b7df 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/memory.html b/www/api/memory.html index edc8bc242..0ba2176ca 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/module.html b/www/api/module.html index 48cdbb816..c1914e1a7 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/mogrify.html b/www/api/mogrify.html index 9cc3a0d66..e11eee586 100644 --- a/www/api/mogrify.html +++ b/www/api/mogrify.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/monitor.html b/www/api/monitor.html index 2ed6a8663..542ee07bc 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/montage.html b/www/api/montage.html index 9daf47b47..34d26dd9a 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,11 +175,14 @@ Flyer drucken
+ diff --git a/www/api/morphology.html b/www/api/morphology.html index a55844ea8..4d635ed87 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -289,7 +289,7 @@

If 'sigma' is zero, you get a single pixel on a field of zeros.

-

Note that two convolutions with two "Blur" kernels perpendicular to each other, is equivelent to a far larger "Gaussian" kernel with the same sigma value, However it is much faster to apply. This is how the "-blur" operator actually works.

+

Note that two convolutions with two "Blur" kernels perpendicular to each other, is equivalent to a far larger "Gaussian" kernel with the same sigma value, However it is much faster to apply. This is how the "-blur" operator actually works.

Comet:{width},{sigma},{angle} Blur in one direction only, much like how a bright object leaves a comet like trail. The Kernel is actually half a gaussian curve, Adding two such blurs in opposite directions produces a Blur Kernel. Angle can be rotated in multiples of 90 degrees.

@@ -383,7 +383,7 @@

Plus:[{radius}[,{scale}]] Cross:[{radius}[,{scale}]] Generate a kernel in the shape of a 'plus' or a 'cross' with a each arm the length of the given radius (default 2).

-

NOTE: "plus:1" is equivelent to a "Diamond" kernel.

+

NOTE: "plus:1" is equivalent to a "Diamond" kernel.

Ring:{radius1},{radius2}[,{scale}] A ring of the values given that falls between the two radii. Defaults to a ring of approximataly 3 radius in a 7x7 kernel. This is the 'edge' pixels of the default "Disk" kernel, More specifically, "Ring" -> "Ring:2.5,3.5,1.0"

@@ -451,7 +451,7 @@

MorphologyApply() applies a morphological method, multiple times using a list of multiple kernels.

-

It is basically equivelent to as MorphologyImageChannel() (see below) but without any user controls. This allows internel programs to use this function, to actually perform a specific task without posible interference by any API user supplied settings.

+

It is basically equivalent to as MorphologyImageChannel() (see below) but without any user controls. This allows internel programs to use this function, to actually perform a specific task without posible interference by any API user supplied settings.

It is MorphologyImageChannel() task to extract any such user controls, and pass them to this function for processing.

diff --git a/www/api/paint.html b/www/api/paint.html index d921a4c18..e12ec1e5c 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 2e6e66834..9b3a22f6d 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index ee2cda683..9b985dfd9 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,11 +175,14 @@ Flyer drucken
+ diff --git a/www/api/profile.html b/www/api/profile.html index 9f877f1a7..535c45793 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/property.html b/www/api/property.html index f597faabf..4176f0502 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,11 +175,14 @@ Flyer drucken
+ diff --git a/www/api/quantize.html b/www/api/quantize.html index 6a9a33acf..f620e7bbe 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/registry.html b/www/api/registry.html index 8c9ae7ff3..e95374141 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,11 +175,14 @@ Flyer drucken
+ diff --git a/www/api/resize.html b/www/api/resize.html index 6789567d1..58c6bce4d 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/resource.html b/www/api/resource.html index 045c93b78..9577660c2 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/segment.html b/www/api/segment.html index 076bf8af6..d89428847 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/shear.html b/www/api/shear.html index 784e68276..600b82b7d 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,11 +175,14 @@ Flyer drucken
+ diff --git a/www/api/signature.html b/www/api/signature.html index 7b2147cd2..e4eb9ccc3 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/statistic.html b/www/api/statistic.html index fb1183a5a..5fe4605fb 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/stream.html b/www/api/stream.html index 3e808acfd..024a7015a 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/transform.html b/www/api/transform.html index 6bf30fd0d..368799aa1 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/version.html b/www/api/version.html index 87b8a88cc..baf580938 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/api/wand-view.html b/www/api/wand-view.html index 1e4466ed5..591ce3d41 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ diff --git a/www/architecture.html b/www/architecture.html index 0de4446aa..45152e712 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -288,7 +288,7 @@

When the pixel cache is initialized, pixels are scaled from whatever bit depth they originated from to that required by the pixel cache. For example, a 1-channel 1-bit monochrome PBM image is scaled to a 4 channel 8-bit RGBA image, if you are using the Q8 version of ImageMagick, and 16-bit RGBA for the Q16 version. You can determine which version you have with the ‑version option:

-

$magick> identify -versionVersion: ImageMagick 6.6.9-6 2011-04-06 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.6.9-7 2011-04-06 Q16 http://www.imagemagick.org

As you can see, the convenience of the pixel cache sometimes comes with a trade-off in storage (e.g. storing a 1-bit monochrome image as 16-bit RGBA is wasteful) and speed (i.e. storing the entire image in memory is generally slower than accessing one scanline of pixels at a time). In most cases, the benefits of the pixel cache typically outweigh any disadvantages.

diff --git a/www/binary-releases.html b/www/binary-releases.html index eb620885f..ac0f5fde5 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -160,14 +160,11 @@ style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" />
- @@ -178,13 +175,16 @@ Flyer drucken
+ @@ -219,16 +219,16 @@ - ImageMagick-6.6.9-6.i386.rpm - download - download + ImageMagick-6.6.9-7.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.6.9-6.x86_64.rpm - download - download + ImageMagick-6.6.9-7.x86_64.rpm + download + download CentOS 5.4 x86_64 RPM @@ -265,7 +265,7 @@

ImageMagick RPM's are self-installing. Simply type the following command and you're ready to start using ImageMagick:

-

$magick> rpm -Uvh ImageMagick-6.6.9-6.i386.rpm

+

$magick> rpm -Uvh ImageMagick-6.6.9-7.i386.rpm

For other systems, create (or choose) a directory to install the package into and change to that directory, for example:

$magick> cd $HOME

@@ -365,7 +365,7 @@ 
 	./imagemagick_compile.sh VERSION
-

where VERSION is the version of ImageMagick you want to compile (i.e.: 6.6.9-6, svn, ...)

+

where VERSION is the version of ImageMagick you want to compile (i.e.: 6.6.9-7, svn, ...)

This script compiles ImageMagick as a static library to be included in iPhone projects and adds support for