Upgrade ImageMagick to 'a429d15fb81877e627d2b83519f4c8142271eec7'
Change-Id: I4286dfc40380190b4f128949fa780aebc2043019
diff --git a/ChangeLog b/ChangeLog
index b205750..0fbe509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,137 @@
+2020-03-07 7.0.10-1 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.10-1, GIT revision 17...
+
+2020-03-07 7.0.10-1 Cristy <quetzlzacatenango@image...>
+ * Do not throw exception on empty draw path (reference
+ https://github.com/ImageMagick/ImageMagick/issues/974).
+ * Fix possible buffer overflow in ComplexImages().
+ * SVG to MVG requires transforms to appear before clipping paths (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1860).
+
+2020-03-06 7.0.10-0 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.10-0, GIT revision 17026:fd430ac9a:20200307
+
+2020-03-01 7.0.10-0 Cristy <quetzlzacatenango@image...>
+ * Label text no longer gets cut-off (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=1&t=37621).
+ * Prevent heap overflow (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1857).
+
+2020-02-29 7.0.9-27 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-27, GIT revision 17006:49d81b672:20200229
+
+2020-02-24 7.0.9-27 Cristy <quetzlzacatenango@image...>
+ * Make sure we can grok this Fx expression: 1- -2.
+ * Do not advance when substituting a NULL string.
+ * Correct alpha for named colors in the Q32 non-HDRI build.
+ * Write Group4 compressed image as a single strip.
+
+2020-02-23 7.0.9-26 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-26, GIT revision 16972:49f1e4de2:20200223
+
+2020-02-22 7.0.9-26 Cristy <quetzlzacatenango@image...>
+ * No percent sign in lab() color.
+ * Introducing the -color-threshold command-line option.
+ * Handle out of range HDRI values for -statistic option (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=37589).
+ * Fix improper casting when computing image signature (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=1&t=37594).
+
+2020-02-21 7.0.9-25 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-25, GIT revision 16931:2a56db8:20200221
+
+2020-02-18 7.0.9-25 Cristy <quetzlzacatenango@image...>
+ * Adapt to a change in command-line options in the SVG inkscape delegate.
+
+2020-02-17 7.0.9-24 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-24, GIT revision 16919:41efef9de:20200217
+
+2020-02-15 7.0.9-24 Cristy <quetzlzacatenango@image...>
+ * Support connected-components:eccentricity-threshold,
+ connected-components:major-axis-threshold,
+ connected-components:minor-axis-threshold,
+ connected-components:angle-threshold.
+ * Set the alpha channel if the write mask is not enabled.
+ * Corrected ellipse orientation when computing image moments.
+
+2020-02-14 7.0.9-23 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-23, GIT revision 16884:acb56cd:20200214
+
+2020-02-08 7.0.9-23 Cristy <quetzlzacatenango@image...>
+ * Report gray(127.5) as gray(50%).
+ * Support -define connected-components:perimeter-threshold=min-max
+
+2020-02-07 7.0.9-22 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-22, GIT revision 16855:8733f3e:20200207
+
+2020-02-03 7.0.9-22 Cristy <quetzlzacatenango@image...>
+ * More work on connect components, e.g. keep-colors, remove-colors,
+ keep-topids.
+ * Initialize mutex before locking if its not already initialized.
+ * Support 24-bit TIFF images.
+
+2020-02-01 7.0.9-21 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-21, GIT revision 16823:290cb93:20200201.
+
+2020-01-27 7.0.9-21 Cristy <quetzlzacatenango@image...>
+ * Support additional connected components defines.
+ * Refresh cache morphology when writing MPC images.
+
+2020-01-26 7.0.9-19 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-19, GIT revision 16789:bac6ecc:20200126
+
+2020-01-26 7.0.9-19 Cristy <quetzlzacatenango@image...>
+ * Make PNG creation reproducible (reference
+ https://github.com/ImageMagick/ImageMagick/pull/1270).
+ * Refactor uninitialize variable patch for -fx "while(,)" expression.
+
+2020-01-25 7.0.9-18 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-18, GIT revision 16780:08beae5:20200125
+
+2020-01-19 7.0.9-18 Cristy <quetzlzacatenango@image...>
+ * Alpha draw primitive no longer returns a parser exception.
+ * Support 32-bit tiled TIFF images.
+ * New -connected-component options (reference
+ https://imagemagick.org/script/connected-components.php).
+
+ https://imagemagick.org/discourse-server/viewtopic.php?f=1&t=37391).
+2020-01-18 7.0.9-17 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-17, GIT revision 16753:c300b3a:20200118
+
+2020-01-12 7.0.9-17 Cristy <quetzlzacatenango@image...>
+ * Allow larger negative interline spacing (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=1&t=37391).
+ * Conditional compile for huge xml pages for RSVG delegate library.
+ * Put "width" property in the PNG namespace (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1833).
+ * -combine -colorspace sRGB no longer returns grayscale output (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1835).
+ * Support Jzazbz colorspace (contributed by snibgo @
+ http://im.snibgo.com/jzazbz.htm).
+
+2020-01-12 7.0.9-16 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-16, GIT revision 16719:fefd765:20200112.
+
+2020-01-12 7.0.9-16 Cristy <quetzlzacatenango@image...>
+ * Fixed three failing Magick.NET unit tests.
+
+2020-01-11 7.0.9-15 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.9-15, GIT revision 16709:0000f6d:20200111.
+
+2020-01-11 7.0.9-15 Dirk Lemstra <dirk@lem.....org>
+ * Also support svg:xml-parse-huge when using librsvg.
+
+2020-01-10 7.0.9-15 Cristy <quetzlzacatenango@image...>
+ * Optimize -evaluate-sequence option (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1824).
+ * Support Fx do() iterator.
+ * `magick -size 100x100 xc:black black.pnm` no longer creates a white image
+ (reference https://github.com/ImageMagick/ImageMagick/issues/1817).
+ * setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=37379).
+ * Permit compositing in the CMYK colorspace (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=37368).
+
2020-01-04 7.0.9-14 Cristy <quetzlzacatenango@image...>
* Release ImageMagick version 7.0.9-14, GIT revision 16654:89ef7ea:20200104.
diff --git a/METADATA b/METADATA
index 58cc181..6242fe8 100644
--- a/METADATA
+++ b/METADATA
@@ -9,10 +9,10 @@
type: GIT
value: "https://github.com/ImageMagick/ImageMagick.git"
}
- version: "886e5a7d5806f9deb937fc4cf8aa7b7ca0b14481"
+ version: "a429d15fb81877e627d2b83519f4c8142271eec7"
last_upgrade_date {
year: 2020
- month: 1
- day: 8
+ month: 3
+ day: 9
}
}
diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 61030bb..f9d5972 100644
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -260,7 +260,7 @@
return std::string("none");
pixel.colorspace=(_pixelType == RGBPixel || _pixelType == RGBAPixel) ?
- RGBColorspace : CMYKColorspace;
+ sRGBColorspace : CMYKColorspace;
pixel.alpha_trait=(_pixelType == RGBAPixel || _pixelType == CMYKAPixel) ?
BlendPixelTrait : UndefinedPixelTrait;
pixel.depth=MAGICKCORE_QUANTUM_DEPTH;
@@ -405,9 +405,9 @@
double Magick::Color::scaleQuantumToDouble(const Magick::Quantum quantum_)
{
#if (MAGICKCORE_QUANTUM_DEPTH < 32) && (MAGICKCORE_SIZEOF_FLOAT_T != MAGICKCORE_SIZEOF_DOUBLE || !defined(MAGICKCORE_HDRI_SUPPORT))
- return(static_cast<double>(quantum_)/QuantumRange);
+ return(static_cast<double>(QuantumScale*quantum_));
#else
- return(quantum_/QuantumRange);
+ return(QuantumScale*quantum_);
#endif
}
@@ -421,7 +421,7 @@
void Magick::Color::setAlpha(const Magick::Quantum alpha_)
{
_pixel->alpha=alpha_;
- if (alpha_ == QuantumRange)
+ if (alpha_ == OpaqueAlpha)
{
_pixel->alpha_trait=UndefinedPixelTrait;
if (_pixelType == RGBAPixel)
diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
index 84a0728..8392d95 100644
--- a/Magick++/tests/attributes.cpp
+++ b/Magick++/tests/attributes.cpp
@@ -1273,7 +1273,7 @@
//
if (
- ( image.signature() != "373ba105dfe1c3e35a0ad70c18534db5c253911b32f1ef5b94b564b5fbd3f87d") &&
+ ( image.signature() != "6b08f7559b92760e8945b924f514a2e997753eb4408ddf571dd5222a782b8b48") &&
( image.signature() != "5e32612a0a3f2f1632d135f8c2df360604b0b84e9f082ddc20efbb0de752a53e") &&
( image.signature() != "dba5480face4d9eb973a116fe32ef37a7b47211e563900d21f47d6f0904aba22") &&
( image.signature() != "eccb7a8ac230b0deb76c8dd10ddeeb76a0918cbe6e3469d2d9f223d35c66498b") &&
diff --git a/Magick++/tests/averageImages.cpp b/Magick++/tests/averageImages.cpp
index 424c35d..336cceb 100644
--- a/Magick++/tests/averageImages.cpp
+++ b/Magick++/tests/averageImages.cpp
@@ -40,10 +40,10 @@
averageImages( &averaged, imageList.begin(), imageList.end() );
// averaged.display();
if (
- ( averaged.signature() != "be10086221b349ccf2ca03bf4e18d68c75a4ab434814e16de8c9a347f3b7d68f") &&
- ( averaged.signature() != "9706be2595aabde3ad70b70968e9a6a22de40c73da46c52b32539c05958f4813") &&
- ( averaged.signature() != "90c4ba4b092f37a0600d51356f9aba89e7402ba3f59ac591ae216bace4a9d10b") &&
- ( averaged.signature() != "2e9af094ccbb8c3c824980f597321aeef15d7accea84a5d233ba23e615d0c891") &&
+ ( averaged.signature() != "16fac0dc82f3901de623ce9ff991c368f6752acf6cb0c11170d78412c3729730") &&
+ ( averaged.signature() != "6574796b7b07d7400a7a310052eabf2b58f81952d1854a76ac9a23890ac2073b") &&
+ ( averaged.signature() != "ad4861b99339d84bed685eb42bbabe657abb60d48b8fc7ddf680af866dd45ad4") &&
+ ( averaged.signature() != "8e6e1a9b5f1eec5539b1f44347249f227f3e07f9acb07d80404ca6a19f88db7c") &&
( averaged.signature() != "a88e978776d45b73bc8c9f37f6726cc9f14a3118b9a82384ee5acf488c5c2863") &&
( averaged.signature() != "6bda37a8b6734ac271595f5b583d801cfb2479637401d056eae9be97127f558f") &&
( averaged.signature() != "919a9e18a5e5ded83c2c4e5cfcd21d654802fcc14b06b02898d96fe28f04a1a1")
diff --git a/MagickCore/Android.bp b/MagickCore/Android.bp
index ee9a33b..c52dfda 100644
--- a/MagickCore/Android.bp
+++ b/MagickCore/Android.bp
@@ -28,6 +28,7 @@
"-Wno-for-loop-analysis",
"-Wno-unused-function",
"-Wno-unused-parameter",
+ "-Wno-unused-variable",
],
header_libs: ["Magick_headers"],
diff --git a/MagickCore/MagickCore-config b/MagickCore/MagickCore-config
index e65e30f..d665eca 100755
--- a/MagickCore/MagickCore-config
+++ b/MagickCore/MagickCore-config
@@ -35,7 +35,7 @@
echo $exec_prefix
;;
--version)
- echo '7.0.9 Q16 HDRI'
+ echo '7.0.10 Q16 HDRI'
;;
--cflags)
/usr/bin/pkg-config --cflags MagickCore
@@ -53,10 +53,10 @@
/usr/bin/pkg-config --libs MagickCore
;;
--coder-path)
- echo "/usr/local/lib/ImageMagick-7.0.9/modules-Q16HDRI/coders"
+ echo "/usr/local/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders"
;;
--filter-path)
- echo "/usr/local/lib/ImageMagick-7.0.9/modules-Q16HDRI/filters"
+ echo "/usr/local/lib/ImageMagick-7.0.10/modules-Q16HDRI/filters"
;;
*)
echo "${usage}" 1>&2
diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index bcbe104..76d0d67 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -717,17 +717,22 @@
char
**textlist;
+ double
+ height;
+
DrawInfo
*annotate_info;
MagickBooleanType
status;
+ MagickSizeType
+ size;
+
register ssize_t
i;
size_t
- height,
count;
TypeMetric
@@ -762,7 +767,8 @@
*metrics=extent;
height=(count*(size_t) (metrics->ascent-metrics->descent+
0.5)+(count-1)*draw_info->interline_spacing);
- if (AcquireMagickResource(HeightResource,height) == MagickFalse)
+ size=(MagickSizeType) fabs(height);
+ if (AcquireMagickResource(HeightResource,size) == MagickFalse)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
"WidthOrHeightExceedsLimit","`%s'",image->filename);
@@ -778,7 +784,8 @@
break;
if (extent.width > metrics->width)
*metrics=extent;
- if (AcquireMagickResource(WidthResource,extent.width) == MagickFalse)
+ size=(MagickSizeType) fabs(extent.width);
+ if (AcquireMagickResource(WidthResource,size) == MagickFalse)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
"WidthOrHeightExceedsLimit","`%s'",image->filename);
@@ -1706,11 +1713,13 @@
q+=GetPixelChannels(image);
continue;
}
- if (bitmap->bitmap.pixel_mode != ft_pixel_mode_mono)
+ fill_opacity=1.0;
+ if (bitmap->bitmap.pixel_mode == ft_pixel_mode_grays)
fill_opacity=(double) (r[n])/(bitmap->bitmap.num_grays-1);
else
- fill_opacity=((r[(x >> 3)+y*bitmap->bitmap.pitch] &
- (1 << (~x & 0x07)))) == 0 ? 0.0 : 1.0;
+ if (bitmap->bitmap.pixel_mode == ft_pixel_mode_mono)
+ fill_opacity=((r[(x >> 3)+y*bitmap->bitmap.pitch] &
+ (1 << (~x & 0x07)))) == 0 ? 0.0 : 1.0;
if (draw_info->text_antialias == MagickFalse)
fill_opacity=fill_opacity >= 0.5 ? 1.0 : 0.0;
if (active == MagickFalse)
diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index e7fb08f..2866840 100644
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -584,7 +584,7 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetCacheViewVirtualPixelQueue() returns the the pixels associated with
+% GetCacheViewVirtualPixelQueue() returns the pixels associated with
% the last call to GetCacheViewVirtualPixels(). The pixels are virtual
% and therefore cannot be updated.
%
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 476f25e..c99c682 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -322,6 +322,7 @@
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
+ (void) exception;
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickCoreSignature);
*length=0;
@@ -1750,9 +1751,10 @@
/*
Ensure the image matches the pixel cache morphology.
*/
+ if (image->type != UndefinedType)
+ image->type=UndefinedType;
if (ValidatePixelCacheMorphology(image) == MagickFalse)
{
- image->type=UndefinedType;
status=OpenPixelCache(image,IOMode,exception);
cache_info=(CacheInfo *) image->cache;
if (cache_info->file != -1)
@@ -3204,7 +3206,7 @@
% Pixels accessed via the returned pointer represent a simple array of type
% Quantum. If the image type is CMYK or the storage class is PseudoClass,
% call GetAuthenticMetacontent() after invoking GetAuthenticPixels() to
-% access the meta-content (of type void) corresponding to the the
+% access the meta-content (of type void) corresponding to the
% region.
%
% If you plan to modify the pixels, use GetAuthenticPixels() instead.
diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index deb19da..02968bb 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -613,7 +613,7 @@
{
if (x < (ssize_t) next->columns)
{
- q[i]=GetPixelGray(next,p);
+ q[i]=GetPixelIntensity(next,p);
p+=GetPixelChannels(next);
}
q+=GetPixelChannels(combine_image);
diff --git a/MagickCore/color-private.h b/MagickCore/color-private.h
index 65fce46..856a87e 100644
--- a/MagickCore/color-private.h
+++ b/MagickCore/color-private.h
@@ -33,6 +33,39 @@
extern MagickPrivate void
ColorComponentTerminus(void);
+static inline MagickBooleanType GetColorRange(const char *color,
+ PixelInfo *start,PixelInfo *stop,ExceptionInfo *exception)
+{
+ char
+ start_color[MagickPathExtent] = "white",
+ stop_color[MagickPathExtent] = "black";
+
+ MagickBooleanType
+ status;
+
+ if (*color != '\0')
+ {
+ register char
+ *p;
+
+ (void) CopyMagickString(start_color,color,MagickPathExtent);
+ for (p=start_color; (*p != '-') && (*p != '\0'); p++)
+ if (*p == '(')
+ {
+ for (p++; (*p != ')') && (*p != '\0'); p++);
+ if (*p == '\0')
+ break;
+ }
+ if (*p == '-')
+ (void) CopyMagickString(stop_color,p+1,MagickPathExtent);
+ *p='\0';
+ }
+ status=QueryColorCompliance(start_color,AllCompliance,start,exception);
+ if (status == MagickFalse)
+ return(status);
+ return(QueryColorCompliance(stop_color,AllCompliance,stop,exception));
+}
+
static inline double GetFuzzyColorDistance(const Image *p,const Image *q)
{
double
diff --git a/MagickCore/color.c b/MagickCore/color.c
index 4fd7d56..82c30b0 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -892,7 +892,7 @@
color_info->color.red=(double) ScaleCharToQuantum(p->red);
color_info->color.green=(double) ScaleCharToQuantum(p->green);
color_info->color.blue=(double) ScaleCharToQuantum(p->blue);
- color_info->color.alpha=(double) (QuantumRange*p->alpha);
+ color_info->color.alpha=((double) QuantumRange*p->alpha);
color_info->compliance=(ComplianceType) p->compliance;
color_info->exempt=MagickTrue;
color_info->signature=MagickCoreSignature;
@@ -1125,9 +1125,33 @@
% o tuple: The color tuple.
%
*/
+
+static inline MagickBooleanType IsSVGCompliant(const PixelInfo *pixel)
+{
+#define SVGCompliant(component) ((double) \
+ ScaleCharToQuantum(ScaleQuantumToChar(ClampToQuantum(component))))
+
+ /*
+ SVG requires color depths > 8 expressed as percentages.
+ */
+ if (fabs(SVGCompliant(pixel->red)-pixel->red) >= MagickEpsilon)
+ return(MagickFalse);
+ if (fabs(SVGCompliant(pixel->green)-pixel->green) >= MagickEpsilon)
+ return(MagickFalse);
+ if (fabs(SVGCompliant(pixel->blue)-pixel->blue) >= MagickEpsilon)
+ return(MagickFalse);
+ if ((pixel->colorspace == CMYKColorspace) &&
+ (fabs(SVGCompliant(pixel->black)-pixel->black) >= MagickEpsilon))
+ return(MagickFalse);
+ return(MagickTrue);
+}
+
MagickExport void ConcatenateColorComponent(const PixelInfo *pixel,
const PixelChannel channel,const ComplianceType compliance,char *tuple)
{
+#define IsColorComponentFactional(color) \
+ ((color)-ScaleCharToQuantum(ScaleQuantumToChar(color)))
+
char
component[MagickPathExtent];
@@ -1137,20 +1161,18 @@
color=0.0f;
scale=QuantumRange;
- if (compliance != NoCompliance)
+ if ((compliance != NoCompliance) || (pixel->depth <= 8))
scale=255.0f;
+ if ((compliance != NoCompliance) &&
+ (IssRGBCompatibleColorspace(pixel->colorspace) != MagickFalse) &&
+ (IsSVGCompliant(pixel) == MagickFalse))
+ scale=100.0f;
switch (channel)
{
case RedPixelChannel:
{
color=pixel->red;
- if ((pixel->colorspace == HCLColorspace) ||
- (pixel->colorspace == HCLpColorspace) ||
- (pixel->colorspace == HSBColorspace) ||
- (pixel->colorspace == HSIColorspace) ||
- (pixel->colorspace == HSLColorspace) ||
- (pixel->colorspace == HSVColorspace) ||
- (pixel->colorspace == HWBColorspace))
+ if (IsHueCompatibleColorspace(pixel->colorspace) != MagickFalse)
scale=360.0f;
if ((compliance != NoCompliance) && (pixel->colorspace == LabColorspace))
scale=100.0f;
@@ -1159,13 +1181,7 @@
case GreenPixelChannel:
{
color=pixel->green;
- if ((pixel->colorspace == HCLColorspace) ||
- (pixel->colorspace == HCLpColorspace) ||
- (pixel->colorspace == HSBColorspace) ||
- (pixel->colorspace == HSIColorspace) ||
- (pixel->colorspace == HSLColorspace) ||
- (pixel->colorspace == HSVColorspace) ||
- (pixel->colorspace == HWBColorspace))
+ if (IsHueCompatibleColorspace(pixel->colorspace) != MagickFalse)
scale=100.0f;
if ((compliance != NoCompliance) && (pixel->colorspace == LabColorspace))
color-=QuantumRange/2.0f;
@@ -1174,13 +1190,7 @@
case BluePixelChannel:
{
color=pixel->blue;
- if ((pixel->colorspace == HCLColorspace) ||
- (pixel->colorspace == HCLpColorspace) ||
- (pixel->colorspace == HSBColorspace) ||
- (pixel->colorspace == HSIColorspace) ||
- (pixel->colorspace == HSLColorspace) ||
- (pixel->colorspace == HSVColorspace) ||
- (pixel->colorspace == HWBColorspace))
+ if (IsHueCompatibleColorspace(pixel->colorspace) != MagickFalse)
scale=100.0f;
if (pixel->colorspace == LabColorspace)
color-=QuantumRange/2.0f;
@@ -1206,10 +1216,7 @@
default:
break;
}
- if ((pixel->colorspace == sRGBColorspace) &&
- (fabs((double) color-(ssize_t) color) > 0.01f))
- scale=100.0f;
- if (scale != 100.0f)
+ if ((scale != 100.0f) || (pixel->colorspace == LabColorspace))
(void) FormatLocaleString(component,MagickPathExtent,"%.*g",
GetMagickPrecision(),(double) (scale*QuantumScale*color));
else
@@ -1439,29 +1446,6 @@
%
*/
-static inline MagickBooleanType IsSVGCompliant(const PixelInfo *pixel)
-{
-#define SVGCompliant(component) ((double) \
- ScaleCharToQuantum(ScaleQuantumToChar(ClampToQuantum(component))))
-
- /*
- SVG requires color depths > 8 expressed as percentages.
- */
- if (fabs(SVGCompliant(pixel->red)-pixel->red) >= MagickEpsilon)
- return(MagickFalse);
- if (fabs(SVGCompliant(pixel->green)-pixel->green) >= MagickEpsilon)
- return(MagickFalse);
- if (fabs(SVGCompliant(pixel->blue)-pixel->blue) >= MagickEpsilon)
- return(MagickFalse);
- if ((pixel->colorspace == CMYKColorspace) &&
- (fabs(SVGCompliant(pixel->black)-pixel->black) >= MagickEpsilon))
- return(MagickFalse);
- if ((pixel->alpha_trait != UndefinedPixelTrait) &&
- (fabs(SVGCompliant(pixel->alpha)-pixel->alpha) >= MagickEpsilon))
- return(MagickFalse);
- return(MagickTrue);
-}
-
static void ConcatentateHexColorComponent(const PixelInfo *pixel,
const PixelChannel channel,char *tuple)
{
@@ -2195,9 +2179,6 @@
MagickExport MagickBooleanType QueryColorCompliance(const char *name,
const ComplianceType compliance,PixelInfo *color,ExceptionInfo *exception)
{
- extern const char
- BackgroundColor[];
-
GeometryInfo
geometry_info;
@@ -2467,6 +2448,7 @@
if ((LocaleCompare(colorspace,"HCL") == 0) ||
(LocaleCompare(colorspace,"HSB") == 0) ||
(LocaleCompare(colorspace,"HSL") == 0) ||
+ (LocaleCompare(colorspace,"HSV") == 0) ||
(LocaleCompare(colorspace,"HWB") == 0))
{
double
@@ -2474,36 +2456,49 @@
green,
red;
- if (LocaleCompare(colorspace,"HCL") == 0)
- color->colorspace=HCLColorspace;
- else
- if (LocaleCompare(colorspace,"HSB") == 0)
- color->colorspace=HSBColorspace;
- else
- if (LocaleCompare(colorspace,"HSL") == 0)
- color->colorspace=HSLColorspace;
- else
- if (LocaleCompare(colorspace,"HWB") == 0)
- color->colorspace=HWBColorspace;
scale=1.0/255.0;
if ((flags & PercentValue) != 0)
scale=1.0/100.0;
geometry_info.sigma*=scale;
geometry_info.xi*=scale;
- if (LocaleCompare(colorspace,"HCL") == 0)
- ConvertHCLToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
- 360.0,geometry_info.sigma,geometry_info.xi,&red,&green,&blue);
- else
- if (LocaleCompare(colorspace,"HSB") == 0)
+ red=0.0;
+ green=0.0;
+ blue=0.0;
+ switch (color->colorspace)
+ {
+ case HCLColorspace:
+ {
+ ConvertHCLToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
+ 360.0,geometry_info.sigma,geometry_info.xi,&red,&green,&blue);
+ break;
+ }
+ case HSBColorspace:
+ {
ConvertHSBToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
360.0,geometry_info.sigma,geometry_info.xi,&red,&green,&blue);
- else
- if (LocaleCompare(colorspace,"HSL") == 0)
- ConvertHSLToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
- 360.0,geometry_info.sigma,geometry_info.xi,&red,&green,&blue);
- else
- ConvertHWBToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
- 360.0,geometry_info.sigma,geometry_info.xi,&red,&green,&blue);
+ break;
+ }
+ case HSLColorspace:
+ {
+ ConvertHSLToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
+ 360.0,geometry_info.sigma,geometry_info.xi,&red,&green,&blue);
+ break;
+ }
+ case HSVColorspace:
+ {
+ ConvertHSVToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
+ 360.0,geometry_info.sigma,geometry_info.xi,&red,&green,&blue);
+ break;
+ }
+ case HWBColorspace:
+ {
+ ConvertHWBToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
+ 360.0,geometry_info.sigma,geometry_info.xi,&red,&green,&blue);
+ break;
+ }
+ default:
+ break;
+ }
color->colorspace=sRGBColorspace;
color->red=(MagickRealType) red;
color->green=(MagickRealType) green;
diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index 15be7fe..205575f 100644
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -101,6 +101,16 @@
return(MagickFalse);
}
+static inline MagickBooleanType IsHueCompatibleColorspace(
+ const ColorspaceType colorspace)
+{
+ if ((colorspace == HCLColorspace) || (colorspace == HCLpColorspace) ||
+ (colorspace == HSBColorspace) || (colorspace == HSIColorspace) ||
+ (colorspace == HSLColorspace) || (colorspace == HSVColorspace))
+ return(MagickTrue);
+ return(MagickFalse);
+}
+
static inline MagickBooleanType IsRGBColorspace(const ColorspaceType colorspace)
{
if ((colorspace == RGBColorspace) || (colorspace == scRGBColorspace) ||
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index d891c7d..ac9f7e9 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -197,18 +197,6 @@
ConvertXYZToLMS(X,Y,Z,L,M,S);
}
-static void ConvertRGBToLab(const double red,const double green,
- const double blue,double *L,double *a,double *b)
-{
- double
- X,
- Y,
- Z;
-
- ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
- ConvertXYZToLab(X,Y,Z,L,a,b);
-}
-
static void ConvertRGBToLuv(const double red,const double green,
const double blue,double *L,double *u,double *v)
{
@@ -237,6 +225,118 @@
*cap_Y=Y;
}
+static void inline ConvertXYZToJzazbz(const double X,const double Y,
+ const double Z,const double white_luminance,double *Jz,double *az,double *bz)
+{
+#define Jzazbz_b 1.15 /* https://observablehq.com/@jrus/jzazbz */
+#define Jzazbz_g 0.66
+#define Jzazbz_c1 (3424.0/4096.0)
+#define Jzazbz_c2 (2413.0/128.0)
+#define Jzazbz_c3 (2392.0/128.0)
+#define Jzazbz_n (2610.0/16384.0)
+#define Jzazbz_p (1.7*2523.0/32.0)
+#define Jzazbz_d (-0.56)
+#define Jzazbz_d0 (1.6295499532821566e-11)
+
+ double
+ gamma,
+ Iz,
+ L,
+ Lp,
+ M,
+ Mp,
+ S,
+ Sp,
+ Xp,
+ Yp,
+ Zp;
+
+ Xp=(Jzazbz_b*X-Z*(Jzazbz_b-1));
+ Yp=(Jzazbz_g*Y-X*(Jzazbz_g-1));
+ Zp=Z;
+ L=0.41478972*Xp+0.579999*Yp+0.0146480*Zp;
+ M=(-0.2015100)*Xp+1.120649*Yp+0.0531008*Zp;
+ S=(-0.0166008)*Xp+0.264800*Yp+0.6684799*Zp;
+ gamma=pow(L/white_luminance,Jzazbz_n);
+ Lp=pow((Jzazbz_c1+Jzazbz_c2*gamma)/(1.0+Jzazbz_c3*gamma),Jzazbz_p);
+ gamma=pow(M/white_luminance,Jzazbz_n);
+ Mp=pow((Jzazbz_c1+Jzazbz_c2*gamma)/(1.0+Jzazbz_c3*gamma),Jzazbz_p);
+ gamma=pow(S/white_luminance,Jzazbz_n);
+ Sp=pow((Jzazbz_c1+Jzazbz_c2*gamma)/(1.0+Jzazbz_c3*gamma),Jzazbz_p);
+ Iz=0.5*Lp+0.5*Mp;
+ *az=3.52400*Lp-4.066708*Mp+0.542708*Sp+0.5;
+ *bz=0.199076*Lp+1.096799*Mp-1.295875*Sp+0.5;
+ *Jz=((Jzazbz_d+1.0)*Iz)/(Jzazbz_d*Iz+1.0)-Jzazbz_d0;
+}
+
+static void inline ConvertJzazbzToXYZ(const double Jz,const double az,
+ const double bz,const double white_luminance,double *X,double *Y,double *Z)
+{
+ double
+ azz,
+ bzz,
+ gamma,
+ Iz,
+ L,
+ Lp,
+ M,
+ Mp,
+ S,
+ Sp,
+ Xp,
+ Yp,
+ Zp;
+
+ gamma=Jz+Jzazbz_d0;
+ Iz=gamma/(Jzazbz_d-Jzazbz_d*gamma+1.0);
+ azz=az-0.5;
+ bzz=bz-0.5;
+ Lp=Iz+0.138605043271539*azz+0.0580473161561189*bzz;
+ Mp=Iz-0.138605043271539*azz-0.0580473161561189*bzz;
+ Sp=Iz-0.0960192420263189*azz-0.811891896056039*bzz;
+ gamma=pow(Lp,1.0/Jzazbz_p);
+ L=white_luminance*pow((Jzazbz_c1-gamma)/(Jzazbz_c3*gamma-Jzazbz_c2),1.0/
+ Jzazbz_n);
+ gamma=pow(Mp,1.0/Jzazbz_p);
+ M=white_luminance*pow((Jzazbz_c1-gamma)/(Jzazbz_c3*gamma-Jzazbz_c2),1.0/
+ Jzazbz_n);
+ gamma=pow(Sp,1.0/Jzazbz_p);
+ S=white_luminance*pow((Jzazbz_c1-gamma)/(Jzazbz_c3*gamma-Jzazbz_c2),1.0/
+ Jzazbz_n);
+ Xp=1.92422643578761*L-1.00479231259537*M+0.037651404030618*S;
+ Yp=0.350316762094999*L+0.726481193931655*M-0.065384422948085*S;
+ Zp=(-0.0909828109828476)*L-0.312728290523074*M+1.52276656130526*S;
+ *X=(Xp+(Jzazbz_b-1.0)*Zp)/Jzazbz_b;
+ *Y=(Yp+(Jzazbz_g-1.0)**X)/Jzazbz_g;
+ *Z=Zp;
+}
+
+static void ConvertRGBToJzazbz(const double red,const double green,
+ const double blue,const double white_luminance,double *Jz,double *az,
+ double *bz)
+{
+ double
+ X,
+ Y,
+ Z;
+
+ ConvertRGBToXYZ(red,blue,green,&X,&Y,&Z);
+ ConvertXYZToJzazbz(X,Y,Z,white_luminance,Jz,az,bz);
+}
+
+static void ConvertJzazbzToRGB(const double Jz,const double az,
+ const double bz,const double white_luminance,double *red,double *green,
+ double *blue)
+{
+ double
+ X,
+ Y,
+ Z;
+
+ ConvertJzazbzToXYZ(Jz,az,bz,white_luminance,&X,&Y,&Z);
+ ConvertXYZToRGB(X,Y,Z,red,blue,green);
+}
+
static void ConvertRGBToYDbDr(const double red,const double green,
const double blue,double *Y,double *Db,double *Dr)
{
@@ -501,6 +601,7 @@
case HSLColorspace:
case HSVColorspace:
case HWBColorspace:
+ case JzazbzColorspace:
case LabColorspace:
case LCHColorspace:
case LCHabColorspace:
@@ -515,9 +616,19 @@
case YPbPrColorspace:
case YUVColorspace:
{
+ const char
+ *value;
+
+ double
+ white_luminance;
+
/*
Transform image from sRGB to target colorspace.
*/
+ white_luminance=10000.0;
+ value=GetImageProperty(image,"white-luminance",exception);
+ if (value != (const char *) NULL)
+ white_luminance=StringToDouble(value,(char **) NULL);
if (image->storage_class == PseudoClass)
{
if (SyncImage(image,exception) == MagickFalse)
@@ -605,6 +716,11 @@
ConvertRGBToHWB(red,green,blue,&X,&Y,&Z);
break;
}
+ case JzazbzColorspace:
+ {
+ ConvertRGBToJzazbz(red,green,blue,white_luminance,&X,&Y,&Z);
+ break;
+ }
case LabColorspace:
{
ConvertRGBToLab(red,green,blue,&X,&Y,&Z);
@@ -1286,7 +1402,7 @@
assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (IsImageGray(image))
+ if (IsImageGray(image) != MagickFalse)
return(MagickTrue);
if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
return(MagickFalse);
@@ -2034,6 +2150,7 @@
case HSLColorspace:
case HSVColorspace:
case HWBColorspace:
+ case JzazbzColorspace:
case LabColorspace:
case LCHColorspace:
case LCHabColorspace:
@@ -2048,9 +2165,19 @@
case YPbPrColorspace:
case YUVColorspace:
{
+ const char
+ *value;
+
+ double
+ white_luminance;
+
/*
Transform image from source colorspace to sRGB.
*/
+ white_luminance=10000.0;
+ value=GetImageProperty(image,"white-luminance",exception);
+ if (value != (const char *) NULL)
+ white_luminance=StringToDouble(value,(char **) NULL);
if (image->storage_class == PseudoClass)
{
if (SyncImage(image,exception) == MagickFalse)
@@ -2138,6 +2265,11 @@
ConvertHWBToRGB(X,Y,Z,&red,&green,&blue);
break;
}
+ case JzazbzColorspace:
+ {
+ ConvertJzazbzToRGB(X,Y,Z,white_luminance,&red,&green,&blue);
+ break;
+ }
case LabColorspace:
{
ConvertLabToRGB(X,Y,Z,&red,&green,&blue);
diff --git a/MagickCore/colorspace.h b/MagickCore/colorspace.h
index 71690e4..7fa1b9c 100644
--- a/MagickCore/colorspace.h
+++ b/MagickCore/colorspace.h
@@ -57,7 +57,8 @@
YIQColorspace,
YPbPrColorspace,
YUVColorspace,
- LinearGRAYColorspace /* Single Channel greyscale (linear) image */
+ LinearGRAYColorspace, /* Single Channel greyscale (linear) image */
+ JzazbzColorspace
} ColorspaceType;
extern MagickExport ColorspaceType
diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 5c516f8..d15da47 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -78,7 +78,7 @@
% %
% %
% %
-% C o m p a r e I m a g e %
+% C o m p a r e I m a g e s %
% %
% %
% %
@@ -261,6 +261,7 @@
{
double
Da,
+ distance,
Sa;
MagickStatusType
@@ -279,12 +280,13 @@
continue;
}
difference=MagickFalse;
+ distance=0.0;
Sa=QuantumScale*GetPixelAlpha(image,p);
Da=QuantumScale*GetPixelAlpha(reconstruct_image,q);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
double
- distance;
+ pixel;
PixelChannel channel = GetPixelChannelChannel(image,i);
PixelTrait traits = GetPixelChannelTraits(image,channel);
@@ -295,10 +297,11 @@
((reconstruct_traits & UpdatePixelTrait) == 0))
continue;
if (channel == AlphaPixelChannel)
- distance=(double) p[i]-GetPixelChannel(reconstruct_image,channel,q);
+ pixel=(double) p[i]-GetPixelChannel(reconstruct_image,channel,q);
else
- distance=Sa*p[i]-Da*GetPixelChannel(reconstruct_image,channel,q);
- if ((distance*distance) > fuzz)
+ pixel=Sa*p[i]-Da*GetPixelChannel(reconstruct_image,channel,q);
+ distance+=pixel*pixel;
+ if (distance >= fuzz)
{
difference=MagickTrue;
break;
@@ -461,7 +464,7 @@
else
pixel=Sa*p[i]-Da*GetPixelChannel(reconstruct_image,channel,q);
distance+=pixel*pixel;
- if (distance > fuzz)
+ if (distance >= fuzz)
{
channel_distortion[i]++;
difference=MagickTrue;
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index a5bcbaa..8e35f04 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -579,24 +579,6 @@
source_image=CloneImage(composite,0,0,MagickTrue,exception);
if (source_image == (const Image *) NULL)
return(MagickFalse);
- switch (compose)
- {
- case CopyCompositeOp:
- case CopyRedCompositeOp:
- case CopyGreenCompositeOp:
- case CopyBlueCompositeOp:
- case CopyCyanCompositeOp:
- case CopyMagentaCompositeOp:
- case CopyYellowCompositeOp:
- case CopyBlackCompositeOp:
- break;
- default:
- {
- if (IsGrayColorspace(image->colorspace) == MagickFalse)
- (void) SetImageColorspace(image,sRGBColorspace,exception);
- break;
- }
- }
(void) SetImageColorspace(source_image,image->colorspace,exception);
if ((compose == OverCompositeOp) || (compose == SrcOverCompositeOp))
{
@@ -983,8 +965,7 @@
X = red_channel; Y = green_channel;
compose:args = x_scale[,y_scale[,center.x,center.y]]
*/
- canvas_image=CloneImage(image,0,0,MagickTrue,
- exception);
+ canvas_image=CloneImage(image,0,0,MagickTrue,exception);
if (canvas_image == (Image *) NULL)
{
source_image=DestroyImage(source_image);
@@ -1430,21 +1411,28 @@
case DivideDstCompositeOp:
case DivideSrcCompositeOp:
case ExclusionCompositeOp:
+ case FreezeCompositeOp:
case HardLightCompositeOp:
case HardMixCompositeOp:
+ case InterpolateCompositeOp:
+ case LightenCompositeOp:
case LinearBurnCompositeOp:
case LinearDodgeCompositeOp:
case LinearLightCompositeOp:
- case LightenCompositeOp:
case MathematicsCompositeOp:
case MinusDstCompositeOp:
case MinusSrcCompositeOp:
case MultiplyCompositeOp:
+ case NegateCompositeOp:
case OverlayCompositeOp:
case PegtopLightCompositeOp:
case PinLightCompositeOp:
+ case ReflectCompositeOp:
case ScreenCompositeOp:
+ case SoftBurnCompositeOp:
+ case SoftDodgeCompositeOp:
case SoftLightCompositeOp:
+ case StampCompositeOp:
case VividLightCompositeOp:
{
alpha=RoundToUnity(Sa+Da-Sa*Da);
@@ -1647,6 +1635,20 @@
pixel=QuantumRange*fabs(Sa-Da);
break;
}
+ case FreezeCompositeOp:
+ {
+ pixel=QuantumRange*(1.0-(1.0-Sa)*(1.0-Sa)*
+ PerceptibleReciprocal(Da));
+ if (pixel < 0.0)
+ pixel=0.0;
+ break;
+ }
+ case InterpolateCompositeOp:
+ {
+ pixel=QuantumRange*(0.5-0.25*cos(MagickPI*Sa)-0.25*
+ cos(MagickPI*Da));
+ break;
+ }
case LightenIntensityCompositeOp:
{
pixel=Sa*GetPixelIntensity(source_image,p) >
@@ -1663,6 +1665,21 @@
pixel=QuantumRange*Sa*Da;
break;
}
+ case NegateCompositeOp:
+ {
+ pixel=QuantumRange*((1.0-Sa-Da));
+ break;
+ }
+ case ReflectCompositeOp:
+ {
+ pixel=QuantumRange*(Sa*Sa*PerceptibleReciprocal(1.0-Da));
+ break;
+ }
+ case StampCompositeOp:
+ {
+ pixel=QuantumRange*(Sa+Da*Da-1.0);
+ break;
+ }
case StereoCompositeOp:
{
pixel=QuantumRange*(Sa+Da)/2;
@@ -1950,6 +1967,14 @@
Dca*(1.0-Sa));
break;
}
+ case FreezeCompositeOp:
+ {
+ pixel=QuantumRange*(1.0-(1.0-Sca)*(1.0-Sca)*
+ PerceptibleReciprocal(Dca));
+ if (pixel < 0.0)
+ pixel=0.0;
+ break;
+ }
case HardLightCompositeOp:
{
if ((2.0*Sca) < Sa)
@@ -1999,6 +2024,12 @@
pixel=QuantumRange*(Sca*Da);
break;
}
+ case InterpolateCompositeOp:
+ {
+ pixel=QuantumRange*(0.5-0.25*cos(MagickPI*Sca)-0.25*
+ cos(MagickPI*Dca));
+ break;
+ }
case LinearBurnCompositeOp:
{
/*
@@ -2169,6 +2200,11 @@
pixel=QuantumRange*gamma*(Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
break;
}
+ case NegateCompositeOp:
+ {
+ pixel=QuantumRange*(1.0-fabs(1.0-Sca-Dca));
+ break;
+ }
case OutCompositeOp:
case SrcOutCompositeOp:
{
@@ -2238,6 +2274,11 @@
pixel=QuantumRange*(Sca+Dca);
break;
}
+ case ReflectCompositeOp:
+ {
+ pixel=QuantumRange*(Sca*Sca*PerceptibleReciprocal(1.0-Dca));
+ break;
+ }
case SaturateCompositeOp:
{
if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon)
@@ -2274,6 +2315,24 @@
pixel=QuantumRange*gamma*(Sca+Dca-Sca*Dca);
break;
}
+ case SoftBurnCompositeOp:
+ {
+ if ((Sca+Dca) < 1.0)
+ pixel=QuantumRange*gamma*(0.5*Dca*PerceptibleReciprocal(1.0-Sca));
+ else
+ pixel=QuantumRange*gamma*(1.0-0.5*(1.0-Sca)*
+ PerceptibleReciprocal(Dca));
+ break;
+ }
+ case SoftDodgeCompositeOp:
+ {
+ if ((Sca+Dca) < 1.0)
+ pixel=QuantumRange*gamma*(0.5*Sca*PerceptibleReciprocal(1.0-Dca));
+ else
+ pixel=QuantumRange*gamma*(1.0-0.5*(1.0-Dca)*
+ PerceptibleReciprocal(Sca));
+ break;
+ }
case SoftLightCompositeOp:
{
if ((2.0*Sca) < Sa)
@@ -2293,6 +2352,11 @@
DcaDa)+Sca*(1.0-Da)+Dca*(1.0-Sa));
break;
}
+ case StampCompositeOp:
+ {
+ pixel=QuantumRange*(Sca+Dca*Dca-1.0);
+ break;
+ }
case StereoCompositeOp:
{
if (channel == RedPixelChannel)
diff --git a/MagickCore/composite.h b/MagickCore/composite.h
index 4240404..c2fa6ec 100644
--- a/MagickCore/composite.h
+++ b/MagickCore/composite.h
@@ -95,7 +95,14 @@
ThresholdCompositeOp,
VividLightCompositeOp,
XorCompositeOp,
- StereoCompositeOp
+ StereoCompositeOp,
+ FreezeCompositeOp,
+ InterpolateCompositeOp,
+ NegateCompositeOp,
+ ReflectCompositeOp,
+ SoftBurnCompositeOp,
+ SoftDodgeCompositeOp,
+ StampCompositeOp
} CompositeOperator;
extern MagickExport MagickBooleanType
diff --git a/MagickCore/compress.c b/MagickCore/compress.c
index 768dcd5..af56c0f 100644
--- a/MagickCore/compress.c
+++ b/MagickCore/compress.c
@@ -228,11 +228,11 @@
%
%
*/
-#define MaxLineExtent 36L
-
static inline void Ascii85Tuple(Ascii85Info *ascii85_info,
const unsigned char *magick_restrict data)
{
+#define MaxLineExtent 36L
+
register ssize_t
i,
x;
diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index 1ef68f4..c9c4412 100644
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -662,6 +662,12 @@
ssize_t
option_type;
+ static const char
+ *source_date_epoch = (const char *) NULL;
+
+ static MagickBooleanType
+ epoch_initalized = MagickFalse;
+
next->taint=MagickFalse;
GetPathComponent(magick_filename,MagickPath,magick_path);
if (*magick_path == '\0' && *next->magick == '\0')
@@ -791,12 +797,20 @@
profile=GetImageProfile(next,"iptc");
if (profile == (const StringInfo *) NULL)
profile=GetImageProfile(next,"8bim");
- (void) FormatMagickTime((time_t) GetBlobProperties(next)->st_mtime,
- MagickPathExtent,timestamp);
- (void) SetImageProperty(next,"date:modify",timestamp,exception);
- (void) FormatMagickTime((time_t) GetBlobProperties(next)->st_ctime,
- MagickPathExtent,timestamp);
- (void) SetImageProperty(next,"date:create",timestamp,exception);
+ if (epoch_initalized == MagickFalse)
+ {
+ source_date_epoch=getenv("SOURCE_DATE_EPOCH");
+ epoch_initalized=MagickTrue;
+ }
+ if (source_date_epoch == (const char *) NULL)
+ {
+ (void) FormatMagickTime((time_t) GetBlobProperties(next)->st_mtime,
+ MagickPathExtent,timestamp);
+ (void) SetImageProperty(next,"date:modify",timestamp,exception);
+ (void) FormatMagickTime((time_t) GetBlobProperties(next)->st_ctime,
+ MagickPathExtent,timestamp);
+ (void) SetImageProperty(next,"date:create",timestamp,exception);
+ }
option=GetImageOption(image_info,"delay");
if (option != (const char *) NULL)
{
diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index b7b766b..6920041 100644
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1560,6 +1560,8 @@
(void) CompositeImage(resize_image,resize_alpha,CopyAlphaCompositeOp,
MagickTrue,0,0,exception);
resize_alpha=DestroyImage(resize_alpha);
+ resize_image->alpha_trait=image->alpha_trait;
+ resize_image->compose=image->compose;
}
(void) SetImageVirtualPixelMethod(resize_image,vp_save,exception);
@@ -1576,8 +1578,6 @@
tmp_image=DestroyImage(tmp_image);
if (resize_image != (Image *) NULL)
{
- resize_image->alpha_trait=image->alpha_trait;
- resize_image->compose=image->compose;
resize_image->page.width=0;
resize_image->page.height=0;
}
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 74ea7ff..4754485 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -208,7 +208,7 @@
static PrimitiveInfo
*TraceStrokePolygon(const Image *,const DrawInfo *,const PrimitiveInfo *);
-static size_t
+static ssize_t
TracePath(MVGInfo *,const char *,ExceptionInfo *);
/*
@@ -991,10 +991,14 @@
register ssize_t
i;
- for (i=0; i < (ssize_t) polygon_info->number_edges; i++)
- polygon_info->edges[i].points=(PointInfo *)
- RelinquishMagickMemory(polygon_info->edges[i].points);
- polygon_info->edges=(EdgeInfo *) RelinquishMagickMemory(polygon_info->edges);
+ if (polygon_info->edges != (EdgeInfo *) NULL)
+ {
+ for (i=0; i < (ssize_t) polygon_info->number_edges; i++)
+ polygon_info->edges[i].points=(PointInfo *)
+ RelinquishMagickMemory(polygon_info->edges[i].points);
+ polygon_info->edges=(EdgeInfo *) RelinquishMagickMemory(
+ polygon_info->edges);
+ }
return((PolygonInfo *) RelinquishMagickMemory(polygon_info));
}
@@ -4262,7 +4266,7 @@
case PathPrimitive:
{
coordinates=(double) TracePath(&mvg_info,token,exception);
- if (coordinates == 0.0)
+ if (coordinates < 0.0)
{
status=MagickFalse;
break;
@@ -5184,7 +5188,7 @@
if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
((IsPixelInfoGray(&draw_info->fill) == MagickFalse) ||
(IsPixelInfoGray(&draw_info->stroke) == MagickFalse)))
- status=SetImageColorspace(image,sRGBColorspace,exception);
+ status&=SetImageColorspace(image,sRGBColorspace,exception);
if (draw_info->compliance == SVGCompliance)
{
status&=SetImageMask(image,WritePixelMask,draw_info->clipping_mask,
@@ -5200,7 +5204,7 @@
case AlphaPrimitive:
{
if (image->alpha_trait == UndefinedPixelTrait)
- (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
+ status&=SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
switch (primitive_info->method)
{
case PointMethod:
@@ -5217,19 +5221,16 @@
break;
GetFillColor(draw_info,x,y,&pixel,exception);
SetPixelAlpha(image,ClampToQuantum(pixel.alpha),q);
- (void) SyncCacheViewAuthenticPixels(image_view,exception);
+ status&=SyncCacheViewAuthenticPixels(image_view,exception);
break;
}
case ReplaceMethod:
{
- MagickBooleanType
- sync;
-
PixelInfo
pixel,
target;
- (void) GetOneCacheViewVirtualPixelInfo(image_view,x,y,&target,
+ status&=GetOneCacheViewVirtualPixelInfo(image_view,x,y,&target,
exception);
GetPixelInfo(image,&pixel);
for (y=0; y < (ssize_t) image->rows; y++)
@@ -5253,8 +5254,8 @@
SetPixelAlpha(image,ClampToQuantum(pixel.alpha),q);
q+=GetPixelChannels(image);
}
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
+ status&=SyncCacheViewAuthenticPixels(image_view,exception);
+ if (status == MagickFalse)
break;
}
break;
@@ -5268,7 +5269,7 @@
PixelInfo
target;
- (void) GetOneVirtualPixelInfo(image,TileVirtualPixelMethod,x,y,
+ status&=GetOneVirtualPixelInfo(image,TileVirtualPixelMethod,x,y,
&target,exception);
if (primitive_info->method == FillToBorderMethod)
{
@@ -5285,9 +5286,6 @@
}
case ResetMethod:
{
- MagickBooleanType
- sync;
-
PixelInfo
pixel;
@@ -5306,8 +5304,8 @@
SetPixelAlpha(image,ClampToQuantum(pixel.alpha),q);
q+=GetPixelChannels(image);
}
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
+ status&=SyncCacheViewAuthenticPixels(image_view,exception);
+ if (status == MagickFalse)
break;
}
break;
@@ -5334,19 +5332,16 @@
GetPixelInfo(image,&pixel);
GetFillColor(draw_info,x,y,&pixel,exception);
SetPixelViaPixelInfo(image,&pixel,q);
- (void) SyncCacheViewAuthenticPixels(image_view,exception);
+ status&=SyncCacheViewAuthenticPixels(image_view,exception);
break;
}
case ReplaceMethod:
{
- MagickBooleanType
- sync;
-
PixelInfo
pixel,
target;
- (void) GetOneCacheViewVirtualPixelInfo(image_view,x,y,&target,
+ status&=GetOneCacheViewVirtualPixelInfo(image_view,x,y,&target,
exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -5369,8 +5364,8 @@
SetPixelViaPixelInfo(image,&pixel,q);
q+=GetPixelChannels(image);
}
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
+ status&=SyncCacheViewAuthenticPixels(image_view,exception);
+ if (status == MagickFalse)
break;
}
break;
@@ -5381,7 +5376,7 @@
PixelInfo
target;
- (void) GetOneVirtualPixelInfo(image,TileVirtualPixelMethod,x,y,
+ status&=GetOneVirtualPixelInfo(image,TileVirtualPixelMethod,x,y,
&target,exception);
if (primitive_info->method == FillToBorderMethod)
{
@@ -5396,9 +5391,6 @@
}
case ResetMethod:
{
- MagickBooleanType
- sync;
-
PixelInfo
pixel;
@@ -5418,8 +5410,8 @@
SetPixelViaPixelInfo(image,&pixel,q);
q+=GetPixelChannels(image);
}
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
+ status&=SyncCacheViewAuthenticPixels(image_view,exception);
+ if (status == MagickFalse)
break;
}
break;
@@ -5466,7 +5458,7 @@
clone_info=DestroyImageInfo(clone_info);
if (composite_images == (Image *) NULL)
{
- status=0;
+ status=MagickFalse;
break;
}
composite_image=RemoveFirstImageFromList(&composite_images);
@@ -5484,14 +5476,14 @@
(void) FormatLocaleString(composite_geometry,MagickPathExtent,
"%gx%g!",primitive_info[1].point.x,primitive_info[1].point.y);
composite_image->filter=image->filter;
- (void) TransformImage(&composite_image,(char *) NULL,
+ status&=TransformImage(&composite_image,(char *) NULL,
composite_geometry,exception);
}
if (composite_image->alpha_trait == UndefinedPixelTrait)
- (void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel,
+ status&=SetImageAlphaChannel(composite_image,OpaqueAlphaChannel,
exception);
if (draw_info->alpha != OpaqueAlpha)
- (void) SetImageAlpha(composite_image,draw_info->alpha,exception);
+ status&=SetImageAlpha(composite_image,draw_info->alpha,exception);
SetGeometry(image,&geometry);
image->gravity=draw_info->gravity;
geometry.x=x;
@@ -5506,9 +5498,9 @@
composite_image->interpolate=image->interpolate;
if ((draw_info->compose == OverCompositeOp) ||
(draw_info->compose == SrcOverCompositeOp))
- (void) DrawAffineImage(image,composite_image,&affine,exception);
+ status&=DrawAffineImage(image,composite_image,&affine,exception);
else
- (void) CompositeImage(image,composite_image,draw_info->compose,
+ status&=CompositeImage(image,composite_image,draw_info->compose,
MagickTrue,geometry.x,geometry.y,exception);
composite_image=DestroyImage(composite_image);
break;
@@ -5529,9 +5521,9 @@
if (q == (Quantum *) NULL)
break;
GetFillColor(draw_info,x,y,&fill_color,exception);
- CompositePixelOver(image,&fill_color,(double) fill_color.alpha,q,
- (double) GetPixelAlpha(image,q),q);
- (void) SyncCacheViewAuthenticPixels(image_view,exception);
+ CompositePixelOver(image,&fill_color,(double) fill_color.alpha,q,(double)
+ GetPixelAlpha(image,q),q);
+ status&=SyncCacheViewAuthenticPixels(image_view,exception);
break;
}
case TextPrimitive:
@@ -5579,7 +5571,8 @@
status&=DrawPolygonPrimitive(image,clone_info,primitive_info,
exception);
clone_info=DestroyDrawInfo(clone_info);
- status=DrawDashPolygon(draw_info,primitive_info,image,exception);
+ if (status != MagickFalse)
+ status&=DrawDashPolygon(draw_info,primitive_info,image,exception);
break;
}
mid=ExpandAffine(&draw_info->affine)*SaneStrokeWidth(image,draw_info)/2.0;
@@ -5608,7 +5601,7 @@
(draw_info->linejoin == RoundJoin)) ||
(primitive_info[i].primitive != UndefinedPrimitive))
{
- status=DrawPolygonPrimitive(image,draw_info,primitive_info,
+ status&=DrawPolygonPrimitive(image,draw_info,primitive_info,
exception);
break;
}
@@ -5618,7 +5611,8 @@
status&=DrawPolygonPrimitive(image,clone_info,primitive_info,
exception);
clone_info=DestroyDrawInfo(clone_info);
- status&=DrawStrokePolygon(image,draw_info,primitive_info,exception);
+ if (status != MagickFalse)
+ status&=DrawStrokePolygon(image,draw_info,primitive_info,exception);
break;
}
status&=DrawPolygonPrimitive(image,draw_info,primitive_info,exception);
@@ -6398,7 +6392,7 @@
return(MagickTrue);
}
-static size_t TracePath(MVGInfo *mvg_info,const char *path,
+static ssize_t TracePath(MVGInfo *mvg_info,const char *path,
ExceptionInfo *exception)
{
char
@@ -6525,7 +6519,7 @@
end.x=(double) (attribute == (int) 'A' ? x : point.x+x);
end.y=(double) (attribute == (int) 'A' ? y : point.y+y);
if (TraceArcPath(mvg_info,point,end,arc,angle,large_arc,sweep) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
@@ -6567,7 +6561,7 @@
for (i=0; i < 4; i++)
(q+i)->point=points[i];
if (TraceBezier(mvg_info,4) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
@@ -6592,10 +6586,10 @@
ThrowPointExpectedException(token,exception);
point.x=(double) (attribute == (int) 'H' ? x: point.x+x);
if (CheckPrimitiveExtent(mvg_info,PrimitiveExtentPad) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
if (TracePoint(q,point) == MagickFalse)
- return(0);
+ return(-1);
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
while (isspace((int) ((unsigned char) *p)) != 0)
@@ -6628,10 +6622,10 @@
point.x=(double) (attribute == (int) 'L' ? x : point.x+x);
point.y=(double) (attribute == (int) 'L' ? y : point.y+y);
if (CheckPrimitiveExtent(mvg_info,PrimitiveExtentPad) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
if (TracePoint(q,point) == MagickFalse)
- return(0);
+ return(-1);
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
while (isspace((int) ((unsigned char) *p)) != 0)
@@ -6676,10 +6670,10 @@
start=point;
i++;
if (CheckPrimitiveExtent(mvg_info,PrimitiveExtentPad) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
if (TracePoint(q,point) == MagickFalse)
- return(0);
+ return(-1);
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
while (isspace((int) ((unsigned char) *p)) != 0)
@@ -6721,7 +6715,7 @@
for (i=0; i < 3; i++)
(q+i)->point=points[i];
if (TraceBezier(mvg_info,3) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
@@ -6772,7 +6766,7 @@
for (i=0; i < 4; i++)
(q+i)->point=points[i];
if (TraceBezier(mvg_info,4) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
@@ -6824,7 +6818,7 @@
for (i=0; i < 3; i++)
(q+i)->point=points[i];
if (TraceBezier(mvg_info,3) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
@@ -6853,10 +6847,10 @@
ThrowPointExpectedException(token,exception);
point.y=(double) (attribute == (int) 'V' ? y : point.y+y);
if (CheckPrimitiveExtent(mvg_info,PrimitiveExtentPad) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
if (TracePoint(q,point) == MagickFalse)
- return(0);
+ return(-1);
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
while (isspace((int) ((unsigned char) *p)) != 0)
@@ -6874,10 +6868,10 @@
*/
point=start;
if (CheckPrimitiveExtent(mvg_info,PrimitiveExtentPad) == MagickFalse)
- return(0);
+ return(-1);
q=(*mvg_info->primitive_info)+mvg_info->offset;
if (TracePoint(q,point) == MagickFalse)
- return(0);
+ return(-1);
mvg_info->offset+=q->coordinates;
q+=q->coordinates;
primitive_info=(*mvg_info->primitive_info)+subpath_offset;
@@ -6897,7 +6891,7 @@
}
}
if (status == MagickFalse)
- return(0);
+ return(-1);
primitive_info=(*mvg_info->primitive_info)+subpath_offset;
primitive_info->coordinates=(size_t) (q-primitive_info);
number_coordinates+=primitive_info->coordinates;
@@ -6909,7 +6903,7 @@
q->method=FillToBorderMethod;
}
q=primitive_info;
- return(number_coordinates);
+ return((ssize_t) number_coordinates);
}
static MagickBooleanType TraceRectangle(PrimitiveInfo *primitive_info,
@@ -7089,40 +7083,48 @@
const DrawInfo *draw_info,const PrimitiveInfo *primitive_info)
{
#define MaxStrokePad (6*BezierQuantum+360)
-#define CheckPathExtent(pad) \
- if ((ssize_t) (q+(pad)) >= (ssize_t) max_strokes) \
+#define CheckPathExtent(pad_p,pad_q) \
+{ \
+ if ((ssize_t) (p+(pad_p)) >= (ssize_t) extent_p) \
{ \
- if (~max_strokes < (pad)) \
- { \
- path_p=(PointInfo *) RelinquishMagickMemory(path_p); \
- path_q=(PointInfo *) RelinquishMagickMemory(path_q); \
- } \
+ if (~extent_p < (pad_p)) \
+ stroke_p=(PointInfo *) RelinquishMagickMemory(stroke_p); \
else \
{ \
- max_strokes+=(pad); \
- path_p=(PointInfo *) ResizeQuantumMemory(path_p,max_strokes+ \
- MaxStrokePad,sizeof(*path_p)); \
- path_q=(PointInfo *) ResizeQuantumMemory(path_q,max_strokes+ \
- MaxStrokePad,sizeof(*path_q)); \
+ extent_p+=(pad_p); \
+ stroke_p=(PointInfo *) ResizeQuantumMemory(stroke_p,extent_p+ \
+ MaxStrokePad,sizeof(*stroke_p)); \
} \
- if ((path_p == (PointInfo *) NULL) || (path_q == (PointInfo *) NULL)) \
+ } \
+ if ((ssize_t) (q+(pad_q)) >= (ssize_t) extent_q) \
+ { \
+ if (~extent_q < (pad_q)) \
+ stroke_q=(PointInfo *) RelinquishMagickMemory(stroke_q); \
+ else \
{ \
- if (path_p != (PointInfo *) NULL) \
- path_p=(PointInfo *) RelinquishMagickMemory(path_p); \
- if (path_q != (PointInfo *) NULL) \
- path_q=(PointInfo *) RelinquishMagickMemory(path_q); \
- polygon_primitive=(PrimitiveInfo *) \
- RelinquishMagickMemory(polygon_primitive); \
- return((PrimitiveInfo *) NULL); \
+ extent_q+=(pad_q); \
+ stroke_q=(PointInfo *) ResizeQuantumMemory(stroke_q,extent_q+ \
+ MaxStrokePad,sizeof(*stroke_q)); \
} \
- }
+ } \
+ if ((stroke_p == (PointInfo *) NULL) || (stroke_q == (PointInfo *) NULL)) \
+ { \
+ if (stroke_p != (PointInfo *) NULL) \
+ stroke_p=(PointInfo *) RelinquishMagickMemory(stroke_p); \
+ if (stroke_q != (PointInfo *) NULL) \
+ stroke_q=(PointInfo *) RelinquishMagickMemory(stroke_q); \
+ polygon_primitive=(PrimitiveInfo *) \
+ RelinquishMagickMemory(polygon_primitive); \
+ return((PrimitiveInfo *) NULL); \
+ } \
+}
- typedef struct _LineSegment
+ typedef struct _StrokeSegment
{
double
p,
q;
- } LineSegment;
+ } StrokeSegment;
double
delta_theta,
@@ -7130,13 +7132,6 @@
mid,
miterlimit;
- LineSegment
- dx = {0,0},
- dy = {0,0},
- inverse_slope = {0,0},
- slope = {0,0},
- theta = {0,0};
-
MagickBooleanType
closed_path;
@@ -7145,8 +7140,8 @@
box_q[5],
center,
offset,
- *path_p,
- *path_q;
+ *stroke_p,
+ *stroke_q;
PrimitiveInfo
*polygon_primitive,
@@ -7157,7 +7152,8 @@
size_t
arc_segments,
- max_strokes,
+ extent_p,
+ extent_q,
number_vertices;
ssize_t
@@ -7166,11 +7162,17 @@
p,
q;
+ StrokeSegment
+ dx = {0.0, 0.0},
+ dy = {0.0, 0.0},
+ inverse_slope = {0.0, 0.0},
+ slope = {0.0, 0.0},
+ theta = {0.0, 0.0};
+
/*
Allocate paths.
*/
number_vertices=primitive_info->coordinates;
- max_strokes=2*number_vertices;
polygon_primitive=(PrimitiveInfo *) AcquireQuantumMemory((size_t)
number_vertices+2UL,sizeof(*polygon_primitive));
if (polygon_primitive == (PrimitiveInfo *) NULL)
@@ -7214,21 +7216,20 @@
}
n=(ssize_t) number_vertices-1L;
}
- path_p=(PointInfo *) AcquireQuantumMemory((size_t) max_strokes+MaxStrokePad,
- sizeof(*path_p));
- if (path_p == (PointInfo *) NULL)
+ extent_p=2*number_vertices;
+ extent_q=2*number_vertices;
+ stroke_p=(PointInfo *) AcquireQuantumMemory((size_t) extent_p+MaxStrokePad,
+ sizeof(*stroke_p));
+ stroke_q=(PointInfo *) AcquireQuantumMemory((size_t) extent_q+MaxStrokePad,
+ sizeof(*stroke_q));
+ if ((stroke_p == (PointInfo *) NULL) || (stroke_q == (PointInfo *) NULL))
{
- polygon_primitive=(PrimitiveInfo *) RelinquishMagickMemory(
- polygon_primitive);
- return((PrimitiveInfo *) NULL);
- }
- path_q=(PointInfo *) AcquireQuantumMemory((size_t) max_strokes+MaxStrokePad,
- sizeof(*path_q));
- if (path_q == (PointInfo *) NULL)
- {
- path_p=(PointInfo *) RelinquishMagickMemory(path_p);
- polygon_primitive=(PrimitiveInfo *) RelinquishMagickMemory(
- polygon_primitive);
+ if (stroke_p != (PointInfo *) NULL)
+ stroke_p=(PointInfo *) RelinquishMagickMemory(stroke_p);
+ if (stroke_q != (PointInfo *) NULL)
+ stroke_q=(PointInfo *) RelinquishMagickMemory(stroke_q);
+ polygon_primitive=(PrimitiveInfo *)
+ RelinquishMagickMemory(polygon_primitive);
return((PrimitiveInfo *) NULL);
}
slope.p=0.0;
@@ -7286,8 +7287,8 @@
*/
p=0;
q=0;
- path_q[p++]=box_q[0];
- path_p[q++]=box_p[0];
+ stroke_q[p++]=box_q[0];
+ stroke_p[q++]=box_p[0];
for (i=(ssize_t) n+1; i < (ssize_t) number_vertices; i++)
{
/*
@@ -7359,23 +7360,23 @@
box_q[3].y)/(slope.p-slope.q));
box_q[4].y=(double) (slope.p*(box_q[4].x-box_q[0].x)+box_q[0].y);
}
- CheckPathExtent(6*BezierQuantum+360);
+ CheckPathExtent(MaxStrokePad,MaxStrokePad);
dot_product=dx.q*dy.p-dx.p*dy.q;
if (dot_product <= 0.0)
switch (draw_info->linejoin)
{
case BevelJoin:
{
- path_q[q++]=box_q[1];
- path_q[q++]=box_q[2];
+ stroke_q[q++]=box_q[1];
+ stroke_q[q++]=box_q[2];
dot_product=(box_q[4].x-box_p[4].x)*(box_q[4].x-box_p[4].x)+
(box_q[4].y-box_p[4].y)*(box_q[4].y-box_p[4].y);
if (dot_product <= miterlimit)
- path_p[p++]=box_p[4];
+ stroke_p[p++]=box_p[4];
else
{
- path_p[p++]=box_p[1];
- path_p[p++]=box_p[2];
+ stroke_p[p++]=box_p[1];
+ stroke_p[p++]=box_p[2];
}
break;
}
@@ -7385,15 +7386,15 @@
(box_q[4].y-box_p[4].y)*(box_q[4].y-box_p[4].y);
if (dot_product <= miterlimit)
{
- path_q[q++]=box_q[4];
- path_p[p++]=box_p[4];
+ stroke_q[q++]=box_q[4];
+ stroke_p[p++]=box_p[4];
}
else
{
- path_q[q++]=box_q[1];
- path_q[q++]=box_q[2];
- path_p[p++]=box_p[1];
- path_p[p++]=box_p[2];
+ stroke_q[q++]=box_q[1];
+ stroke_q[q++]=box_q[2];
+ stroke_p[p++]=box_p[1];
+ stroke_p[p++]=box_p[2];
}
break;
}
@@ -7402,11 +7403,11 @@
dot_product=(box_q[4].x-box_p[4].x)*(box_q[4].x-box_p[4].x)+
(box_q[4].y-box_p[4].y)*(box_q[4].y-box_p[4].y);
if (dot_product <= miterlimit)
- path_p[p++]=box_p[4];
+ stroke_p[p++]=box_p[4];
else
{
- path_p[p++]=box_p[1];
- path_p[p++]=box_p[2];
+ stroke_p[p++]=box_p[1];
+ stroke_p[p++]=box_p[2];
}
center=polygon_primitive[n].point;
theta.p=atan2(box_q[1].y-center.y,box_q[1].x-center.x);
@@ -7415,20 +7416,20 @@
theta.q+=2.0*MagickPI;
arc_segments=(size_t) ceil((double) ((theta.q-theta.p)/
(2.0*sqrt((double) (1.0/mid)))));
- CheckPathExtent(arc_segments+6*BezierQuantum+360);
- path_q[q].x=box_q[1].x;
- path_q[q].y=box_q[1].y;
+ CheckPathExtent(MaxStrokePad,arc_segments+MaxStrokePad);
+ stroke_q[q].x=box_q[1].x;
+ stroke_q[q].y=box_q[1].y;
q++;
for (j=1; j < (ssize_t) arc_segments; j++)
{
delta_theta=(double) (j*(theta.q-theta.p)/arc_segments);
- path_q[q].x=(double) (center.x+mid*cos(fmod((double)
+ stroke_q[q].x=(double) (center.x+mid*cos(fmod((double)
(theta.p+delta_theta),DegreesToRadians(360.0))));
- path_q[q].y=(double) (center.y+mid*sin(fmod((double)
+ stroke_q[q].y=(double) (center.y+mid*sin(fmod((double)
(theta.p+delta_theta),DegreesToRadians(360.0))));
q++;
}
- path_q[q++]=box_q[2];
+ stroke_q[q++]=box_q[2];
break;
}
default:
@@ -7439,16 +7440,16 @@
{
case BevelJoin:
{
- path_p[p++]=box_p[1];
- path_p[p++]=box_p[2];
+ stroke_p[p++]=box_p[1];
+ stroke_p[p++]=box_p[2];
dot_product=(box_q[4].x-box_p[4].x)*(box_q[4].x-box_p[4].x)+
(box_q[4].y-box_p[4].y)*(box_q[4].y-box_p[4].y);
if (dot_product <= miterlimit)
- path_q[q++]=box_q[4];
+ stroke_q[q++]=box_q[4];
else
{
- path_q[q++]=box_q[1];
- path_q[q++]=box_q[2];
+ stroke_q[q++]=box_q[1];
+ stroke_q[q++]=box_q[2];
}
break;
}
@@ -7458,15 +7459,15 @@
(box_q[4].y-box_p[4].y)*(box_q[4].y-box_p[4].y);
if (dot_product <= miterlimit)
{
- path_q[q++]=box_q[4];
- path_p[p++]=box_p[4];
+ stroke_q[q++]=box_q[4];
+ stroke_p[p++]=box_p[4];
}
else
{
- path_q[q++]=box_q[1];
- path_q[q++]=box_q[2];
- path_p[p++]=box_p[1];
- path_p[p++]=box_p[2];
+ stroke_q[q++]=box_q[1];
+ stroke_q[q++]=box_q[2];
+ stroke_p[p++]=box_p[1];
+ stroke_p[p++]=box_p[2];
}
break;
}
@@ -7475,11 +7476,11 @@
dot_product=(box_q[4].x-box_p[4].x)*(box_q[4].x-box_p[4].x)+
(box_q[4].y-box_p[4].y)*(box_q[4].y-box_p[4].y);
if (dot_product <= miterlimit)
- path_q[q++]=box_q[4];
+ stroke_q[q++]=box_q[4];
else
{
- path_q[q++]=box_q[1];
- path_q[q++]=box_q[2];
+ stroke_q[q++]=box_q[1];
+ stroke_q[q++]=box_q[2];
}
center=polygon_primitive[n].point;
theta.p=atan2(box_p[1].y-center.y,box_p[1].x-center.x);
@@ -7488,18 +7489,18 @@
theta.p+=2.0*MagickPI;
arc_segments=(size_t) ceil((double) ((theta.p-theta.q)/
(2.0*sqrt((double) (1.0/mid)))));
- CheckPathExtent(arc_segments+6*BezierQuantum+360);
- path_p[p++]=box_p[1];
+ CheckPathExtent(arc_segments+MaxStrokePad,MaxStrokePad);
+ stroke_p[p++]=box_p[1];
for (j=1; j < (ssize_t) arc_segments; j++)
{
delta_theta=(double) (j*(theta.q-theta.p)/arc_segments);
- path_p[p].x=(double) (center.x+mid*cos(fmod((double)
+ stroke_p[p].x=(double) (center.x+mid*cos(fmod((double)
(theta.p+delta_theta),DegreesToRadians(360.0))));
- path_p[p].y=(double) (center.y+mid*sin(fmod((double)
+ stroke_p[p].y=(double) (center.y+mid*sin(fmod((double)
(theta.p+delta_theta),DegreesToRadians(360.0))));
p++;
}
- path_p[p++]=box_p[2];
+ stroke_p[p++]=box_p[2];
break;
}
default:
@@ -7515,8 +7516,8 @@
dy.p=dy.q;
n=i;
}
- path_p[p++]=box_p[1];
- path_q[q++]=box_q[1];
+ stroke_p[p++]=box_p[1];
+ stroke_q[q++]=box_q[1];
/*
Trace stroked polygon.
*/
@@ -7527,7 +7528,7 @@
for (i=0; i < (ssize_t) p; i++)
{
stroke_polygon[i]=polygon_primitive[0];
- stroke_polygon[i].point=path_p[i];
+ stroke_polygon[i].point=stroke_p[i];
}
if (closed_path != MagickFalse)
{
@@ -7538,7 +7539,7 @@
for ( ; i < (ssize_t) (p+q+closed_path); i++)
{
stroke_polygon[i]=polygon_primitive[0];
- stroke_polygon[i].point=path_q[p+q+closed_path-(i+1)];
+ stroke_polygon[i].point=stroke_q[p+q+closed_path-(i+1)];
}
if (closed_path != MagickFalse)
{
@@ -7552,8 +7553,8 @@
stroke_polygon[i].primitive=UndefinedPrimitive;
stroke_polygon[0].coordinates=(size_t) (p+q+2*closed_path+1);
}
- path_p=(PointInfo *) RelinquishMagickMemory(path_p);
- path_q=(PointInfo *) RelinquishMagickMemory(path_q);
+ stroke_p=(PointInfo *) RelinquishMagickMemory(stroke_p);
+ stroke_q=(PointInfo *) RelinquishMagickMemory(stroke_q);
polygon_primitive=(PrimitiveInfo *) RelinquishMagickMemory(polygon_primitive);
return(stroke_polygon);
}
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 0a215d6..fbf159e 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -2276,9 +2276,6 @@
sigma,
threshold;
- extern const char
- DefaultTileFrame[];
-
Image
*images,
*montage_image,
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index ff4232c..c8570cf 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -504,7 +504,7 @@
number_bins*sizeof(*tiles));
if (tile_cache == (MemoryInfo *) NULL)
return(MagickFalse);
- lut=AcquireQuantumMemory(NumberCLAHEGrays,sizeof(*lut));
+ lut=(unsigned short *) AcquireQuantumMemory(NumberCLAHEGrays,sizeof(*lut));
if (lut == (unsigned short *) NULL)
{
tile_cache=RelinquishVirtualMemory(tile_cache);
@@ -609,7 +609,7 @@
}
p+=clahe_info->width*(tile.height-1);
}
- lut=RelinquishMagickMemory(lut);
+ lut=(unsigned short *) RelinquishMagickMemory(lut);
tile_cache=RelinquishVirtualMemory(tile_cache);
return(MagickTrue);
}
@@ -4154,7 +4154,7 @@
constant" set to a.
The first version, based on the hyperbolic tangent tanh, when combined with
- the scaling step, is an exact arithmetic clone of the the sigmoid function
+ the scaling step, is an exact arithmetic clone of the sigmoid function
based on the logistic curve. The equivalence is based on the identity
1/(1+exp(-t)) = (1+tanh(t/2))/2
diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c
index 981a4f7..d338e38 100644
--- a/MagickCore/fourier.c
+++ b/MagickCore/fourier.c
@@ -165,7 +165,9 @@
progress;
size_t
- number_channels;
+ columns,
+ number_channels,
+ rows;
ssize_t
y;
@@ -193,17 +195,23 @@
image->depth=32UL;
complex_images=NewImageList();
AppendImageToList(&complex_images,image);
- image=CloneImage(images,0,0,MagickTrue,exception);
+ image=CloneImage(images->next,0,0,MagickTrue,exception);
if (image == (Image *) NULL)
{
complex_images=DestroyImageList(complex_images);
return(complex_images);
}
+ image->depth=32UL;
AppendImageToList(&complex_images,image);
+ if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
+ {
+ complex_images=DestroyImageList(complex_images);
+ return(complex_images);
+ }
/*
Apply complex mathematics to image pixels.
*/
- artifact=GetImageArtifact(image,"complex:snr");
+ artifact=GetImageArtifact(images,"complex:snr");
snr=0.0;
if (artifact != (const char *) NULL)
snr=StringToDouble(artifact,(char **) NULL);
@@ -231,11 +239,13 @@
Ci_view=AcquireAuthenticCacheView(Ci_image,exception);
status=MagickTrue;
progress=0;
+ columns=MagickMin(Cr_image->columns,Ci_image->columns);
+ rows=MagickMin(Cr_image->rows,Ci_image->rows);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
- magick_number_threads(Cr_image,complex_images,Cr_image->rows,1L)
+ magick_number_threads(Cr_image,complex_images,rows,1L)
#endif
- for (y=0; y < (ssize_t) Cr_image->rows; y++)
+ for (y=0; y < (ssize_t) rows; y++)
{
register const Quantum
*magick_restrict Ai,
@@ -252,12 +262,12 @@
if (status == MagickFalse)
continue;
- Ar=GetCacheViewVirtualPixels(Ar_view,0,y,Cr_image->columns,1,exception);
- Ai=GetCacheViewVirtualPixels(Ai_view,0,y,Cr_image->columns,1,exception);
- Br=GetCacheViewVirtualPixels(Br_view,0,y,Cr_image->columns,1,exception);
- Bi=GetCacheViewVirtualPixels(Bi_view,0,y,Cr_image->columns,1,exception);
- Cr=QueueCacheViewAuthenticPixels(Cr_view,0,y,Cr_image->columns,1,exception);
- Ci=QueueCacheViewAuthenticPixels(Ci_view,0,y,Ci_image->columns,1,exception);
+ Ar=GetCacheViewVirtualPixels(Ar_view,0,y,columns,1,exception);
+ Ai=GetCacheViewVirtualPixels(Ai_view,0,y,columns,1,exception);
+ Br=GetCacheViewVirtualPixels(Br_view,0,y,columns,1,exception);
+ Bi=GetCacheViewVirtualPixels(Bi_view,0,y,columns,1,exception);
+ Cr=QueueCacheViewAuthenticPixels(Cr_view,0,y,columns,1,exception);
+ Ci=QueueCacheViewAuthenticPixels(Ci_view,0,y,columns,1,exception);
if ((Ar == (const Quantum *) NULL) || (Ai == (const Quantum *) NULL) ||
(Br == (const Quantum *) NULL) || (Bi == (const Quantum *) NULL) ||
(Cr == (Quantum *) NULL) || (Ci == (Quantum *) NULL))
@@ -265,7 +275,7 @@
status=MagickFalse;
continue;
}
- for (x=0; x < (ssize_t) Cr_image->columns; x++)
+ for (x=0; x < (ssize_t) columns; x++)
{
register ssize_t
i;
@@ -292,7 +302,8 @@
double
gamma;
- gamma=PerceptibleReciprocal((double) Br[i]*Br[i]+Bi[i]*Bi[i]+snr);
+ gamma=PerceptibleReciprocal((double) Br[i]*Br[i]+(double) Bi[i]*
+ Bi[i]+snr);
Cr[i]=gamma*((double) Ar[i]*Br[i]+(double) Ai[i]*Bi[i]);
Ci[i]=gamma*((double) Ai[i]*Br[i]-(double) Ar[i]*Bi[i]);
break;
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index e5fdaac..c184615 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -180,9 +180,6 @@
MagickPrivate FxInfo *AcquireFxInfo(const Image *images,const char *expression,
ExceptionInfo *exception)
{
- char
- fx_op[2];
-
const Image
*next;
@@ -192,6 +189,9 @@
register ssize_t
i;
+ unsigned char
+ fx_op[2];
+
fx_info=(FxInfo *) AcquireCriticalMemory(sizeof(*fx_info));
(void) memset(fx_info,0,sizeof(*fx_info));
fx_info->exception=AcquireExceptionInfo();
@@ -214,53 +214,52 @@
fx_info->random_info=AcquireRandomInfo();
fx_info->expression=ConstantString(expression);
fx_info->file=stderr;
- (void) SubstituteString(&fx_info->expression," ",""); /* compact string */
/*
Convert compound to simple operators.
*/
fx_op[1]='\0';
- *fx_op=(char) BitwiseAndAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"&=",fx_op);
- *fx_op=(char) BitwiseOrAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"|=",fx_op);
- *fx_op=(char) LeftShiftAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"<<=",fx_op);
- *fx_op=(char) RightShiftAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,">>=",fx_op);
- *fx_op=(char) PowerAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"^=",fx_op);
- *fx_op=(char) ModuloAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"%=",fx_op);
- *fx_op=(char) PlusAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"+=",fx_op);
- *fx_op=(char) SubtractAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"-=",fx_op);
- *fx_op=(char) MultiplyAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"*=",fx_op);
- *fx_op=(char) DivideAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"/=",fx_op);
- *fx_op=(char) IncrementAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"++",fx_op);
- *fx_op=(char) DecrementAssignmentOperator;
- (void) SubstituteString(&fx_info->expression,"--",fx_op);
- *fx_op=(char) LeftShiftOperator;
- (void) SubstituteString(&fx_info->expression,"<<",fx_op);
- *fx_op=(char) RightShiftOperator;
- (void) SubstituteString(&fx_info->expression,">>",fx_op);
- *fx_op=(char) LessThanEqualOperator;
- (void) SubstituteString(&fx_info->expression,"<=",fx_op);
- *fx_op=(char) GreaterThanEqualOperator;
- (void) SubstituteString(&fx_info->expression,">=",fx_op);
- *fx_op=(char) EqualOperator;
- (void) SubstituteString(&fx_info->expression,"==",fx_op);
- *fx_op=(char) NotEqualOperator;
- (void) SubstituteString(&fx_info->expression,"!=",fx_op);
- *fx_op=(char) LogicalAndOperator;
- (void) SubstituteString(&fx_info->expression,"&&",fx_op);
- *fx_op=(char) LogicalOrOperator;
- (void) SubstituteString(&fx_info->expression,"||",fx_op);
- *fx_op=(char) ExponentialNotation;
- (void) SubstituteString(&fx_info->expression,"**",fx_op);
+ *fx_op=(unsigned char) BitwiseAndAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"&=",(char *) fx_op);
+ *fx_op=(unsigned char) BitwiseOrAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"|=",(char *) fx_op);
+ *fx_op=(unsigned char) LeftShiftAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"<<=",(char *) fx_op);
+ *fx_op=(unsigned char) RightShiftAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,">>=",(char *) fx_op);
+ *fx_op=(unsigned char) PowerAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"^=",(char *) fx_op);
+ *fx_op=(unsigned char) ModuloAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"%=",(char *) fx_op);
+ *fx_op=(unsigned char) PlusAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"+=",(char *) fx_op);
+ *fx_op=(unsigned char) SubtractAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"-=",(char *) fx_op);
+ *fx_op=(unsigned char) MultiplyAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"*=",(char *) fx_op);
+ *fx_op=(unsigned char) DivideAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"/=",(char *) fx_op);
+ *fx_op=(unsigned char) IncrementAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"++",(char *) fx_op);
+ *fx_op=(unsigned char) DecrementAssignmentOperator;
+ (void) SubstituteString(&fx_info->expression,"--",(char *) fx_op);
+ *fx_op=(unsigned char) LeftShiftOperator;
+ (void) SubstituteString(&fx_info->expression,"<<",(char *) fx_op);
+ *fx_op=(unsigned char) RightShiftOperator;
+ (void) SubstituteString(&fx_info->expression,">>",(char *) fx_op);
+ *fx_op=(unsigned char) LessThanEqualOperator;
+ (void) SubstituteString(&fx_info->expression,"<=",(char *) fx_op);
+ *fx_op=(unsigned char) GreaterThanEqualOperator;
+ (void) SubstituteString(&fx_info->expression,">=",(char *) fx_op);
+ *fx_op=(unsigned char) EqualOperator;
+ (void) SubstituteString(&fx_info->expression,"==",(char *) fx_op);
+ *fx_op=(unsigned char) NotEqualOperator;
+ (void) SubstituteString(&fx_info->expression,"!=",(char *) fx_op);
+ *fx_op=(unsigned char) LogicalAndOperator;
+ (void) SubstituteString(&fx_info->expression,"&&",(char *) fx_op);
+ *fx_op=(unsigned char) LogicalOrOperator;
+ (void) SubstituteString(&fx_info->expression,"||",(char *) fx_op);
+ *fx_op=(unsigned char) ExponentialNotation;
+ (void) SubstituteString(&fx_info->expression,"**",(char *) fx_op);
/*
Force right-to-left associativity for unary negation.
*/
@@ -268,6 +267,7 @@
(void) SubstituteString(&fx_info->expression,"^-1.0*","^-");
(void) SubstituteString(&fx_info->expression,"E-1.0*","E-");
(void) SubstituteString(&fx_info->expression,"e-1.0*","e-");
+ (void) SubstituteString(&fx_info->expression," ",""); /* compact string */
return(fx_info);
}
@@ -1149,6 +1149,8 @@
value=GetFxSymbolValue(fx_info,symbol);
if (value != (const double *) NULL)
return(*value);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "UndefinedVariable","`%s'",symbol);
(void) SetFxSymbolValue(fx_info,symbol,0.0);
return(0.0);
}
@@ -1438,6 +1440,26 @@
subexpression=DestroyString(subexpression); \
return(value); \
}
+#define FxParseConditional(subexpression,sentinal,p,q) \
+{ \
+ p=subexpression; \
+ for (q=(char *) p; (*q != (sentinal)) && (*q != '\0'); q++) \
+ if (*q == '(') \
+ { \
+ for (q++; (*q != ')') && (*q != '\0'); q++); \
+ if (*q == '\0') \
+ break; \
+ } \
+ if (*q == '\0') \
+ { \
+ (void) ThrowMagickException(exception,GetMagickModule(), \
+ OptionError,"UnableToParseExpression","`%s'",subexpression); \
+ FxReturn(0.0); \
+ } \
+ if (strlen(q) == 1) \
+ *(q+1)='\0'; \
+ *q='\0'; \
+}
char
*q,
@@ -1865,18 +1887,8 @@
}
case '?':
{
- (void) CopyMagickString(subexpression,++p,MagickPathExtent);
- p=subexpression;
- for (q=(char *) p; (*q != ':') && (*q != '\0'); q++)
- if (*q == '(')
- for ( ; (*q != ')') && (*q != '\0'); q++);
- if (*q == '\0')
- {
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnableToParseExpression","`%s'",subexpression);
- FxReturn(0.0);
- }
- *q='\0';
+ (void) CopyMagickString(subexpression,++p,MagickPathExtent-1);
+ FxParseConditional(subexpression,':',p,q);
if (fabs(alpha) >= MagickEpsilon)
gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,beta,
exception);
@@ -2151,20 +2163,12 @@
/*
Parse do(expression,condition test).
*/
- length=CopyMagickString(subexpression,expression+3,MagickPathExtent);
+ length=CopyMagickString(subexpression,expression+3,
+ MagickPathExtent-1);
if (length != 0)
subexpression[length-1]='\0';
- p=subexpression;
- for (q=(char *) p; (*q != ',') && (*q != '\0'); q++)
- if (*q == '(')
- for ( ; (*q != ')') && (*q != '\0'); q++);
- if (*q == '\0')
- {
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnableToParseExpression","`%s'",subexpression);
- FxReturn(0.0);
- }
- for (*q='\0'; ; )
+ FxParseConditional(subexpression,',',p,q);
+ for (alpha=0.0; ; )
{
alpha=FxEvaluateSubexpression(fx_info,channel,x,y,q+1,depth+1,beta,
exception);
@@ -2226,34 +2230,16 @@
/*
Parse for(initialization, condition test, expression).
*/
- length=CopyMagickString(subexpression,expression+4,MagickPathExtent);
+ length=CopyMagickString(subexpression,expression+4,
+ MagickPathExtent-1);
if (length != 0)
subexpression[length-1]='\0';
- p=subexpression;
- for (q=(char *) p; (*q != ',') && (*q != '\0'); q++)
- if (*q == '(')
- for ( ; (*q != ')') && (*q != '\0'); q++);
- if (*q == '\0')
- {
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnableToParseExpression","`%s'",subexpression);
- FxReturn(0.0);
- }
- *q='\0';
+ FxParseConditional(subexpression,',',p,q);
alpha=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans,
exception);
- (void) CopyMagickString(subexpression,q+1,MagickPathExtent);
- p=subexpression;
- for (q=(char *) p; (*q != ',') && (*q != '\0'); q++)
- if (*q == '(')
- for ( ; (*q != ')') && (*q != '\0'); q++);
- if (*q == '\0')
- {
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnableToParseExpression","`%s'",subexpression);
- FxReturn(0.0);
- }
- for (*q='\0'; ; )
+ (void) CopyMagickString(subexpression,q+1,MagickPathExtent-1);
+ FxParseConditional(subexpression,',',p,q);
+ for (alpha=0.0; ; )
{
gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans,
exception);
@@ -2323,34 +2309,15 @@
size_t
length;
- length=CopyMagickString(subexpression,expression+3,MagickPathExtent);
+ length=CopyMagickString(subexpression,expression+3,
+ MagickPathExtent-1);
if (length != 0)
subexpression[length-1]='\0';
- p=subexpression;
- for (q=(char *) p; (*q != ',') && (*q != '\0'); q++)
- if (*q == '(')
- for ( ; (*q != ')') && (*q != '\0'); q++);
- if (*q == '\0')
- {
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnableToParseExpression","`%s'",subexpression);
- FxReturn(0.0);
- }
- *q='\0';
+ FxParseConditional(subexpression,',',p,q);
alpha=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans,
exception);
- (void) CopyMagickString(subexpression,q+1,MagickPathExtent);
- p=subexpression;
- for (q=(char *) p; (*q != ',') && (*q != '\0'); q++)
- if (*q == '(')
- for ( ; (*q != ')') && (*q != '\0'); q++);
- if (*q == '\0')
- {
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnableToParseExpression","`%s'",subexpression);
- FxReturn(0.0);
- }
- *q='\0';
+ (void) CopyMagickString(subexpression,q+1,MagickPathExtent-1);
+ FxParseConditional(subexpression,',',p,q);
if (fabs(alpha) >= MagickEpsilon)
alpha=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,beta,
exception);
@@ -2641,27 +2608,19 @@
/*
Parse while(condition test, expression).
*/
- length=CopyMagickString(subexpression,expression+6,MagickPathExtent);
+ length=CopyMagickString(subexpression,expression+6,
+ MagickPathExtent-1);
if (length != 0)
subexpression[length-1]='\0';
- p=subexpression;
- for (q=(char *) p; (*q != ',') && (*q != '\0'); q++)
- if (*q == '(')
- for ( ; (*q != ')') && (*q != '\0'); q++);
- if (*q == '\0')
- {
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnableToParseExpression","`%s'",subexpression);
- FxReturn(0.0);
- }
- for (*q='\0'; ; )
+ FxParseConditional(subexpression,',',p,q);
+ for (alpha=0.0; ; )
{
gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans,
exception);
if (fabs(gamma) < MagickEpsilon)
break;
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,q+1,depth+1,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,q+1,depth+1,
+ beta,exception);
}
FxReturn(alpha);
}
diff --git a/MagickCore/gem-private.h b/MagickCore/gem-private.h
index e15f741..68439ca 100644
--- a/MagickCore/gem-private.h
+++ b/MagickCore/gem-private.h
@@ -69,6 +69,8 @@
double *),
ConvertRGBToHWB(const double,const double,const double,double *,double *,
double *),
+ ConvertRGBToLab(const double,const double,const double,double *,double *,
+ double *),
ConvertRGBToLCHab(const double,const double,const double,double *,double *,
double *),
ConvertRGBToLCHuv(const double,const double,const double,double *,double *,
diff --git a/MagickCore/gem.c b/MagickCore/gem.c
index 8dccbb9..5767b57 100644
--- a/MagickCore/gem.c
+++ b/MagickCore/gem.c
@@ -1273,6 +1273,45 @@
% %
% %
% %
+% C o n v e r t R G B T o L a b %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ConvertRGBToLab() transforms a (red, green, blue) to a (L, a, b) triple.
+%
+% The format of the ConvertRGBToLCHab method is:
+%
+% void ConvertRGBToLCHab(const double red,const double green,
+% const double blue,double *L,double *a,double *b)
+%
+% A description of each parameter follows:
+%
+% o red, green, blue: A Quantum value representing the red, green, and
+% blue component of a pixel.
+%
+% o L, a, b: A pointer to a double value representing a component of the
+% Lab color space.
+%
+*/
+MagickPrivate void ConvertRGBToLab(const double red,const double green,
+ const double blue,double *L,double *a,double *b)
+{
+ double
+ X,
+ Y,
+ Z;
+
+ ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
+ ConvertXYZToLab(X,Y,Z,L,a,b);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
% C o n v e r t R G B T o L C H a b %
% %
% %
diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index c422d99..1a88d6e 100644
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -1528,14 +1528,16 @@
(void) ParseGeometry(geometry,&geometry_info);
area=geometry_info.rho+sqrt(MagickEpsilon);
distance=sqrt((double) former_width*former_height);
- scale.x=(double) former_width*PerceptibleReciprocal(distance/sqrt(area));
- scale.y=(double) former_height*PerceptibleReciprocal(distance/sqrt(area));
+ scale.x=(double) former_width*PerceptibleReciprocal(distance*
+ PerceptibleReciprocal(sqrt(area)));
+ scale.y=(double) former_height*PerceptibleReciprocal(distance*
+ PerceptibleReciprocal(sqrt(area)));
if ((scale.x < (double) *width) || (scale.y < (double) *height))
{
*width=(unsigned long) (former_width*PerceptibleReciprocal(
- distance/sqrt(area)));
+ distance*PerceptibleReciprocal(sqrt(area))));
*height=(unsigned long) (former_height*PerceptibleReciprocal(
- distance/sqrt(area)));
+ distance*PerceptibleReciprocal(sqrt(area))));
}
former_width=(*width);
former_height=(*height);
diff --git a/MagickCore/image-private.h b/MagickCore/image-private.h
index 344919f..6cd48c2 100644
--- a/MagickCore/image-private.h
+++ b/MagickCore/image-private.h
@@ -22,36 +22,33 @@
extern "C" {
#endif
+#define BackgroundColor "#ffffff" /* white */
+#define BorderColor "#dfdfdf" /* gray */
+#define DefaultResolution 72.0
+#define DefaultTileFrame "15x15+3+3"
+#define DefaultTileGeometry "120x120+4+3>"
+#define DefaultTileLabel "%f\n%G\n%b"
+#define ForegroundColor "#000" /* black */
+#define LoadImagesTag "Load/Images"
+#define LoadImageTag "Load/Image"
+#define Magick2PI 6.28318530717958647692528676655900576839433879875020
#define MagickAbsoluteValue(x) ((x) < 0 ? -(x) : (x))
#define MagickMax(x,y) (((x) > (y)) ? (x) : (y))
#define MagickMin(x,y) (((x) < (y)) ? (x) : (y))
-#define Magick2PI 6.28318530717958647692528676655900576839433879875020
#define MagickPHI 1.61803398874989484820458683436563811772030917980576
-#define MagickPI 3.14159265358979323846264338327950288419716939937510
#define MagickPI2 1.57079632679489661923132169163975144209858469968755
+#define MagickPI 3.14159265358979323846264338327950288419716939937510
#define MagickSQ1_2 0.70710678118654752440084436210484903928483593768847
#define MagickSQ2 1.41421356237309504880168872420969807856967187537695
#define MagickSQ2PI 2.50662827463100024161235523934010416269302368164062
-#define UndefinedTicksPerSecond 100L
+#define MatteColor "#bdbdbd" /* gray */
+#define PSDensityGeometry "72.0x72.0"
+#define PSPageGeometry "612x792"
+#define SaveImagesTag "Save/Images"
+#define SaveImageTag "Save/Image"
+#define TransparentColor "#00000000" /* transparent black */
#define UndefinedCompressionQuality 0UL
-
-extern MagickExport const char
- AlphaColor[],
- BackgroundColor[],
- BorderColor[],
- DefaultTileFrame[],
- DefaultTileGeometry[],
- DefaultTileLabel[],
- ForegroundColor[],
- LoadImageTag[],
- LoadImagesTag[],
- PSDensityGeometry[],
- PSPageGeometry[],
- SaveImageTag[],
- SaveImagesTag[];
-
-extern MagickExport const double
- DefaultResolution;
+#define UndefinedTicksPerSecond 100L
static inline double DegreesToRadians(const double degrees)
{
diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c
index 771789e..2ac0022 100644
--- a/MagickCore/image-view.c
+++ b/MagickCore/image-view.c
@@ -668,7 +668,7 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% IsImageView() returns MagickTrue if the the parameter is verified as a image
+% IsImageView() returns MagickTrue if the parameter is verified as a image
% view object.
%
% The format of the IsImageView method is:
diff --git a/MagickCore/image.c b/MagickCore/image.c
index df05aba..2659c53 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -105,28 +105,6 @@
#include "MagickCore/xwindow-private.h"
/*
- Constant declaration.
-*/
-const char
- BackgroundColor[] = "#ffffff", /* white */
- BorderColor[] = "#dfdfdf", /* gray */
- DefaultTileFrame[] = "15x15+3+3",
- DefaultTileGeometry[] = "120x120+4+3>",
- DefaultTileLabel[] = "%f\n%G\n%b",
- ForegroundColor[] = "#000", /* black */
- LoadImageTag[] = "Load/Image",
- LoadImagesTag[] = "Load/Images",
- MatteColor[] = "#bdbdbd", /* gray */
- PSDensityGeometry[] = "72.0x72.0",
- PSPageGeometry[] = "612x792",
- SaveImageTag[] = "Save/Image",
- SaveImagesTag[] = "Save/Images",
- TransparentColor[] = "#00000000"; /* transparent black */
-
-const double
- DefaultResolution = 72.0;
-
-/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% %
@@ -2375,7 +2353,8 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelAlpha(image,alpha,q);
+ if (GetPixelWriteMask(image,q) > (QuantumRange/2))
+ SetPixelAlpha(image,alpha,q);
q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
diff --git a/MagickCore/image.h b/MagickCore/image.h
index cd4433b..6e49079 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -497,19 +497,6 @@
extern MagickExport ChannelType
SetImageChannelMask(Image *,const ChannelType);
-extern MagickExport const char
- DefaultTileGeometry[],
- DefaultTileLabel[],
- LoadImageTag[],
- LoadImagesTag[],
- PSDensityGeometry[],
- PSPageGeometry[],
- SaveImageTag[],
- SaveImagesTag[];
-
-extern MagickExport const double
- DefaultResolution;
-
extern MagickExport ExceptionType
CatchImageException(Image *);
diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index 57a9f39..4be2922 100644
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -1911,7 +1911,7 @@
% Images with negative offsets will be clipped.
%
% TrimBoundsLayer: Determine the overall bounds of all the image
-% layers just as in "MergeLayer", then adjust the the canvas
+% layers just as in "MergeLayer", then adjust the canvas
% and offsets to be relative to those bounds, without overlaying
% the images.
%
diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index fb24ffc..56d32fc 100644
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -348,7 +348,7 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetMagicPatternExtent() returns the the extent of the buffer that is
+% GetMagicPatternExtent() returns the extent of the buffer that is
% required to check all the MagickInfos. It returns zero if the list is empty.
%
% The format of the GetMagicPatternExtent method is:
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 21d71ed..3e4d9ad 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -247,10 +247,6 @@
# define __has_builtin(x) 0
#endif
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ > 201112L && !defined(__MINGW32__)
-# define MAGICKCORE_HAVE_STDC_ALIGNED_ALLOC 1
-#endif
-
#if defined(__GNUC__) && !defined(__clang__)
# define MAGICKCORE_DIAGNOSTIC_PUSH() \
_Pragma("GCC diagnostic push")
diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h
index 35b9080..759976d 100644
--- a/MagickCore/magick-type.h
+++ b/MagickCore/magick-type.h
@@ -111,7 +111,7 @@
#else
#error "MAGICKCORE_QUANTUM_DEPTH must be one of 8, 16, 32, or 64"
#endif
-#define MagickEpsilon (1.0e-12)
+#define MagickEpsilon 1.0e-12
#define MagickMaximumValue 1.79769313486231570E+308
#define MagickMinimumValue 2.22507385850720140E-308
#define MagickStringify(macro_or_string) MagickStringifyArg(macro_or_string)
diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index e79184f..190abf9 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -65,6 +65,7 @@
#include "MagickCore/monitor-private.h"
#include "MagickCore/module.h"
#include "MagickCore/module-private.h"
+#include "MagickCore/mutex.h"
#include "MagickCore/nt-base-private.h"
#include "MagickCore/nt-feature.h"
#include "MagickCore/opencl-private.h"
@@ -1089,6 +1090,7 @@
static MagickBooleanType IsMagickTreeInstantiated(ExceptionInfo *exception)
{
+ (void) exception;
if (magick_list_initialized == MagickFalse)
{
if (magick_semaphore == (SemaphoreInfo *) NULL)
@@ -1473,8 +1475,13 @@
/*
Initialize the Magick environment.
*/
+ InitializeMagickMutex();
+ LockMagickMutex();
if (magickcore_instantiated != MagickFalse)
- return;
+ {
+ UnlockMagickMutex();
+ return;
+ }
(void) SemaphoreComponentGenesis();
(void) ExceptionComponentGenesis();
(void) LogComponentGenesis();
@@ -1578,6 +1585,7 @@
(void) RegistryComponentGenesis();
(void) MonitorComponentGenesis();
magickcore_instantiated=MagickTrue;
+ UnlockMagickMutex();
}
/*
@@ -1742,7 +1750,7 @@
*/
MagickExport int SetMagickPrecision(const int precision)
{
-#define MagickPrecision 6
+#define MagickPrecision (4+MAGICKCORE_QUANTUM_DEPTH/8)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (precision > 0)
diff --git a/MagickCore/memory.c b/MagickCore/memory.c
index b5bd153..060b05e 100644
--- a/MagickCore/memory.c
+++ b/MagickCore/memory.c
@@ -247,7 +247,7 @@
% o quantum: the size (in bytes) of each object.
%
*/
-#if MAGICKCORE_HAVE_STDC_ALIGNED_ALLOC
+#if defined(MAGICKCORE_HAVE_ALIGNED_MALLOC)
#define AcquireAlignedMemory_Actual AcquireAlignedMemory_STDC
static inline void *AcquireAlignedMemory_STDC(const size_t size)
{
@@ -1087,7 +1087,7 @@
memory_methods.relinquish_aligned_memory_handler(memory);
return(NULL);
}
-#if MAGICKCORE_HAVE_STDC_ALIGNED_ALLOC || defined(MAGICKCORE_HAVE_POSIX_MEMALIGN)
+#if defined(MAGICKCORE_HAVE_ALIGNED_MALLOC) || defined(MAGICKCORE_HAVE_POSIX_MEMALIGN)
free(memory);
#elif defined(MAGICKCORE_HAVE__ALIGNED_MALLOC)
_aligned_free(memory);
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 83a9bcb..40976bd 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -3152,7 +3152,7 @@
shape. Essentually white values are decreased to the smallest
'distance from edge' it can find.
- It works by adding kernel values to the neighbourhood, and and
+ It works by adding kernel values to the neighbourhood, and
select the minimum value found. The kernel is rotated before
use, so kernel distances match resulting distances, when a user
provided asymmetric kernel is applied.
@@ -3166,7 +3166,7 @@
GrayErode: Kernel values subtracted and minimum value found No
kernel rotation used.
- Note the the Iterative Distance method is essentially a
+ Note the Iterative Distance method is essentially a
GrayErode, but with negative kernel values, and kernel rotation
applied.
*/
diff --git a/MagickCore/mutex.h b/MagickCore/mutex.h
index f267f5a..5ebdc72 100644
--- a/MagickCore/mutex.h
+++ b/MagickCore/mutex.h
@@ -1,5 +1,5 @@
/*
- Copyright 1999-2019 ImageMagick Studio LLC, a non-profit organization
+ Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization
dedicated to making software imaging solutions freely available.
You may not use this file except in compliance with the License. You may
@@ -31,6 +31,9 @@
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
+static MagickBooleanType
+ translation_unit_initialized = MagickFalse;
+
static omp_lock_t
translation_unit_mutex;
#elif defined(MAGICKCORE_THREAD_SUPPORT)
@@ -45,6 +48,7 @@
{
#if defined(MAGICKCORE_OPENMP_SUPPORT)
omp_destroy_lock(&translation_unit_mutex);
+ translation_unit_initialized=MagickFalse;
#endif
}
@@ -52,12 +56,15 @@
{
#if defined(MAGICKCORE_OPENMP_SUPPORT)
omp_init_lock(&translation_unit_mutex);
+ translation_unit_initialized=MagickTrue;
#endif
}
static inline void LockMagickMutex(void)
{
#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ if (translation_unit_initialized == MagickFalse)
+ InitializeMagickMutex();
omp_set_lock(&translation_unit_mutex);
#elif defined(MAGICKCORE_THREAD_SUPPORT)
{
diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h
index 77511f0..5044118 100644
--- a/MagickCore/nt-base-private.h
+++ b/MagickCore/nt-base-private.h
@@ -54,22 +54,6 @@
file_info;
} DIR;
-typedef struct _NTMEMORYSTATUSEX
-{
- DWORD
- dwLength,
- dwMemoryLoad;
-
- DWORDLONG
- ullTotalPhys,
- ullAvailPhys,
- ullTotalPageFile,
- ullAvailPageFile,
- ullTotalVirtual,
- ullAvailVirtual,
- ullAvailExtendedVirtual;
-} NTMEMORYSTATUSEX;
-
#if !defined(__MINGW32__)
struct timeval;
@@ -81,12 +65,6 @@
};
#endif
-typedef UINT
- (CALLBACK *LPFNDLLFUNC1)(DWORD,UINT);
-
-typedef UINT
- (CALLBACK *LPFNDLLFUNC2)(NTMEMORYSTATUSEX *);
-
#endif
#if defined(MAGICKCORE_BZLIB_DELEGATE)
@@ -132,14 +110,11 @@
NTGhostscriptLoadDLL(void),
NTInitializeLibrary(void),
NTSetSearchPath(const char *),
- NTSyncMemory(void *,size_t,int),
NTUnmapMemory(void *,size_t),
NTSystemCommand(const char *,char *);
extern MagickPrivate ssize_t
- NTGetPageSize(void),
- NTSystemConfiguration(int),
- NTTellDirectory(DIR *);
+ NTSystemConfiguration(int);
extern MagickPrivate MagickBooleanType
NTGatherRandomData(const size_t,unsigned char *),
@@ -162,7 +137,6 @@
NTInitializeWinsock(MagickBooleanType),
*NTMapMemory(char *,size_t,int,int,int,MagickOffsetType),
*NTOpenLibrary(const char *),
- NTSeekDirectory(DIR *,ssize_t),
NTWindowsGenesis(void),
NTWindowsTerminus(void);
diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index a2ea46f..0c30527 100644
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -986,15 +986,16 @@
*/
void *NTGetLibrarySymbol(void *handle,const char *name)
{
- LPFNDLLFUNC1
- lpfnDllFunc1;
+ FARPROC
+ proc_address;
- lpfnDllFunc1=(LPFNDLLFUNC1) GetProcAddress((HINSTANCE) handle,name);
- if (!lpfnDllFunc1)
+ proc_address=GetProcAddress((HMODULE) handle,(LPCSTR) name);
+ if (proc_address == (FARPROC) NULL)
return((void *) NULL);
- return((void *) lpfnDllFunc1);
+ return((void *) proc_address);
}
-
+
+
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -1045,33 +1046,6 @@
% %
% %
% %
-+ N T G e t P a g e S i z e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% NTGetPageSize() returns the memory page size under Windows.
-%
-% The format of the NTPageSize
-%
-% NTPageSize()
-%
-*/
-MagickPrivate ssize_t NTGetPageSize(void)
-{
- SYSTEM_INFO
- system_info;
-
- GetSystemInfo(&system_info);
- return((ssize_t) system_info.dwPageSize);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% N T G h o s t s c r i p t D L L %
% %
% %
@@ -2291,40 +2265,6 @@
% %
% %
% %
-% N T S e e k D i r e c t o r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% NTSeekDirectory() sets the position of the next NTReadDirectory() operation
-% on the directory stream.
-%
-% The format of the NTSeekDirectory method is:
-%
-% void NTSeekDirectory(DIR *entry,ssize_t position)
-%
-% A description of each parameter follows:
-%
-% o entry: Specifies a pointer to a DIR structure.
-%
-% o position: specifies the position associated with the directory
-% stream.
-%
-*/
-MagickPrivate void NTSeekDirectory(DIR *entry,ssize_t position)
-{
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(entry != (DIR *) NULL);
- (void) entry;
- (void) position;
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% N T S e t S e a r c h P a t h %
% %
% %
@@ -2362,40 +2302,6 @@
% %
% %
% %
-+ N T S y n c M e m o r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% NTSyncMemory() emulates the Unix method of the same name.
-%
-% The format of the NTSyncMemory method is:
-%
-% int NTSyncMemory(void *address,size_t length,int flags)
-%
-% A description of each parameter follows:
-%
-% o address: the address of the binary large object.
-%
-% o length: the length of the binary large object.
-%
-% o flags: Option flags (ignored for Windows).
-%
-*/
-MagickPrivate int NTSyncMemory(void *address,size_t length,int flags)
-{
- (void) flags;
- if (FlushViewOfFile(address,length) == MagickFalse)
- return(-1);
- return(0);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% N T S y s t e m C o m m a n d %
% %
% %
@@ -2571,7 +2477,7 @@
{
switch (name)
{
- case _SC_PAGESIZE:
+ case _SC_PAGE_SIZE:
{
SYSTEM_INFO
system_info;
@@ -2581,35 +2487,17 @@
}
case _SC_PHYS_PAGES:
{
- HMODULE
- handle;
-
- LPFNDLLFUNC2
- module;
-
- NTMEMORYSTATUSEX
+ MEMORYSTATUSEX
status;
SYSTEM_INFO
system_info;
- handle=GetModuleHandle("kernel32.dll");
- if (handle == (HMODULE) NULL)
+ status.dwLength=sizeof(status);
+ if (GlobalMemoryStatusEx(&status) == 0)
return(0L);
GetSystemInfo(&system_info);
- module=(LPFNDLLFUNC2) NTGetLibrarySymbol(handle,"GlobalMemoryStatusEx");
- if (module == (LPFNDLLFUNC2) NULL)
- {
- MEMORYSTATUS
- global_status;
-
- GlobalMemoryStatus(&global_status);
- return((ssize_t) global_status.dwTotalPhys/system_info.dwPageSize/4);
- }
- status.dwLength=sizeof(status);
- if (module(&status) == 0)
- return(0L);
- return((ssize_t) status.ullTotalPhys/system_info.dwPageSize/4);
+ return((ssize_t) status.ullTotalPhys/system_info.dwPageSize);
}
case _SC_OPEN_MAX:
return(2048);
@@ -2624,36 +2512,6 @@
% %
% %
% %
-% N T T e l l D i r e c t o r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% NTTellDirectory() returns the current location associated with the named
-% directory stream.
-%
-% The format of the NTTellDirectory method is:
-%
-% ssize_t NTTellDirectory(DIR *entry)
-%
-% A description of each parameter follows:
-%
-% o entry: Specifies a pointer to a DIR structure.
-%
-*/
-MagickPrivate ssize_t NTTellDirectory(DIR *entry)
-{
- magick_unreferenced(entry);
- assert(entry != (DIR *) NULL);
- return(0);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% N T T r u n c a t e F i l e %
% %
% %
diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index a8c84d9..fdf0194 100644
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -52,7 +52,7 @@
#define R_OK 4
#define W_OK 2
#define RW_OK 6
-#define _SC_PAGESIZE 1
+#define _SC_PAGE_SIZE 1
#define _SC_PHYS_PAGES 2
#define _SC_OPEN_MAX 3
#if !defined(SSIZE_MAX)
@@ -193,9 +193,6 @@
# define mmap(address,length,protection,access,file,offset) \
NTMapMemory(address,length,protection,access,file,offset)
#endif
-#if !defined(msync)
-# define msync(address,length,flags) NTSyncMemory(address,length,flags)
-#endif
#if !defined(munmap)
# define munmap(address,length) NTUnmapMemory(address,length)
#endif
@@ -220,9 +217,6 @@
#if !defined(readdir)
# define readdir(directory) NTReadDirectory(directory)
#endif
-#if !defined(seekdir)
-# define seekdir(directory,offset) NTSeekDirectory(directory,offset)
-#endif
#if !defined(setmode)
# define setmode _setmode
#endif
@@ -257,9 +251,6 @@
#else
# define tell _tell
#endif
-#if !defined(telldir)
-# define telldir(directory) NTTellDirectory(directory)
-#endif
#if !defined(tempnam)
# define tempnam _tempnam_s
#endif
diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index 173786a..f44e074 100644
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -2645,7 +2645,7 @@
assert(device != (MagickCLDevice) NULL);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickCoreSignature);
-
+ (void) exception;
status=MagickTrue;
if (severity != 0)
{
diff --git a/MagickCore/option.c b/MagickCore/option.c
index dba8d46..621ee6c 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -309,6 +309,7 @@
{ " colors", 0, UndefinedOptionFlag, MagickFalse },
{ " colorize", 0, UndefinedOptionFlag, MagickFalse },
{ " colorspace", 0, UndefinedOptionFlag, MagickFalse },
+ { " color-threshold", 0, UndefinedOptionFlag, MagickFalse },
{ " compose", 0, UndefinedOptionFlag, MagickFalse },
{ " contrast", 0, UndefinedOptionFlag, MagickFalse },
{ " convolve", 0, UndefinedOptionFlag, MagickFalse },
@@ -471,6 +472,7 @@
{ "HSL", HSLColorspace, UndefinedOptionFlag, MagickFalse },
{ "HSV", HSVColorspace, UndefinedOptionFlag, MagickFalse },
{ "HWB", HWBColorspace, UndefinedOptionFlag, MagickFalse },
+ { "Jzazbz", JzazbzColorspace, UndefinedOptionFlag, MagickFalse },
{ "Lab", LabColorspace, UndefinedOptionFlag, MagickFalse },
{ "LCH", LCHColorspace, UndefinedOptionFlag, MagickFalse },
{ "LCHab", LCHabColorspace, UndefinedOptionFlag, MagickFalse },
@@ -639,6 +641,8 @@
{ "-colors", 1L, SimpleOperatorFlag, MagickFalse },
{ "+colorspace", 0L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse },
{ "-colorspace", 1L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse },
+ { "+color-threshold", 0L, DeprecateOptionFlag, MagickTrue },
+ { "-color-threshold", 1L, SimpleOperatorFlag, MagickFalse },
{ "-combine", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse },
{ "+combine", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse },
{ "+comment", 0L, ImageInfoOptionFlag | NeverInterpretArgsFlag, MagickFalse },
@@ -1144,6 +1148,7 @@
ComposeOptions[] =
{
{ "Undefined", UndefinedCompositeOp, UndefinedOptionFlag, MagickTrue },
+ { "Add", ModulusAddCompositeOp, DeprecateOptionFlag, MagickTrue },
{ "Atop", AtopCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Blend", BlendCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Blur", BlurCompositeOp, UndefinedOptionFlag, MagickFalse },
@@ -1156,44 +1161,50 @@
{ "CopyAlpha", CopyAlphaCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "CopyBlack", CopyBlackCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "CopyBlue", CopyBlueCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Copy", CopyCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "CopyCyan", CopyCyanCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "CopyGreen", CopyGreenCompositeOp, UndefinedOptionFlag, MagickFalse },
- { "Copy", CopyCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "CopyMagenta", CopyMagentaCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "CopyOpacity", CopyAlphaCompositeOp, UndefinedOptionFlag, MagickTrue },
{ "CopyRed", CopyRedCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "CopyYellow", CopyYellowCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Darken", DarkenCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "DarkenIntensity", DarkenIntensityCompositeOp, UndefinedOptionFlag, MagickFalse },
- { "DivideDst", DivideDstCompositeOp, UndefinedOptionFlag, MagickFalse },
- { "DivideSrc", DivideSrcCompositeOp, UndefinedOptionFlag, MagickFalse },
- { "Dst", DstCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Difference", DifferenceCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Displace", DisplaceCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Dissolve", DissolveCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Distort", DistortCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Divide", DivideDstCompositeOp, DeprecateOptionFlag, MagickTrue },
+ { "DivideDst", DivideDstCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "DivideSrc", DivideSrcCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "DstAtop", DstAtopCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Dst", DstCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "DstIn", DstInCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "DstOut", DstOutCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "DstOver", DstOverCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Exclusion", ExclusionCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Freeze", FreezeCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "HardLight", HardLightCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "HardMix", HardMixCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Hue", HueCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "In", InCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Intensity", IntensityCompositeOp, UndefinedOptionFlag, MagickFalse },
- { "Lighten", LightenCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Interpolate", InterpolateCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "LightenIntensity", LightenIntensityCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Lighten", LightenCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "LinearBurn", LinearBurnCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "LinearDodge", LinearDodgeCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "LinearLight", LinearLightCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Luminize", LuminizeCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Mathematics", MathematicsCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "MinusDst", MinusDstCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Minus", MinusDstCompositeOp, DeprecateOptionFlag, MagickTrue },
{ "MinusSrc", MinusSrcCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Modulate", ModulateCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "ModulusAdd", ModulusAddCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "ModulusSubtract", ModulusSubtractCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Multiply", MultiplyCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Negate", NegateCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "None", NoCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Out", OutCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Overlay", OverlayCompositeOp, UndefinedOptionFlag, MagickFalse },
@@ -1201,24 +1212,24 @@
{ "PegtopLight", PegtopLightCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "PinLight", PinLightCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Plus", PlusCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Reflect", ReflectCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Replace", ReplaceCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Saturate", SaturateCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Screen", ScreenCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "SoftBurn", SoftBurnCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "SoftDodge", SoftDodgeCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "SoftLight", SoftLightCompositeOp, UndefinedOptionFlag, MagickFalse },
- { "Src", SrcCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "SrcAtop", SrcAtopCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "SrcIn", SrcInCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "SrcOut", SrcOutCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "SrcOver", SrcOverCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Src", SrcCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Stamp", StampCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Stereo", StereoCompositeOp, UndefinedOptionFlag, MagickFalse },
+ { "Subtract", ModulusSubtractCompositeOp, DeprecateOptionFlag, MagickTrue },
+ { "Threshold", ThresholdCompositeOp, DeprecateOptionFlag, MagickTrue },
{ "VividLight", VividLightCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Xor", XorCompositeOp, UndefinedOptionFlag, MagickFalse },
- { "Divide", DivideDstCompositeOp, DeprecateOptionFlag, MagickTrue },
- { "Minus", MinusDstCompositeOp, DeprecateOptionFlag, MagickTrue },
- { "Subtract", ModulusSubtractCompositeOp, DeprecateOptionFlag, MagickTrue },
- { "Add", ModulusAddCompositeOp, DeprecateOptionFlag, MagickTrue },
- { "Threshold", ThresholdCompositeOp, DeprecateOptionFlag, MagickTrue },
- { "CopyOpacity", CopyAlphaCompositeOp, UndefinedOptionFlag, MagickTrue },
{ (char *) NULL, UndefinedCompositeOp, UndefinedOptionFlag, MagickFalse }
},
CompressOptions[] =
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index f18deef..2409e17 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -218,13 +218,13 @@
*destination=(*source);
if (image->colorspace == CMYKColorspace)
{
- if (IssRGBCompatibleColorspace(destination->colorspace))
+ if (IssRGBCompatibleColorspace(destination->colorspace) != MagickFalse)
ConvertRGBToCMYK(destination);
}
else
if (destination->colorspace == CMYKColorspace)
{
- if (IssRGBCompatibleColorspace(image->colorspace))
+ if (IssRGBCompatibleColorspace(image->colorspace) != MagickFalse)
ConvertCMYKToRGB(destination);
}
if ((IsPixelInfoGray(&image->background_color) == MagickFalse) &&
@@ -5992,9 +5992,7 @@
distance*=3.0; /* rescale appropriately */
fuzz*=3.0;
pixel=GetPixelRed(source,p)-(double) GetPixelRed(destination,q);
- if ((source->colorspace == HSLColorspace) ||
- (source->colorspace == HSBColorspace) ||
- (source->colorspace == HWBColorspace))
+ if (IsHueCompatibleColorspace(source->colorspace) != MagickFalse)
{
/*
Compute an arc distance for hue. It should be a vector angle of
@@ -6118,8 +6116,7 @@
distance*=3.0; /* rescale appropriately */
fuzz*=3.0;
pixel=p->red-q->red;
- if ((p->colorspace == HSLColorspace) || (p->colorspace == HSBColorspace) ||
- (p->colorspace == HWBColorspace))
+ if (IsHueCompatibleColorspace(p->colorspace) != MagickFalse)
{
/*
This calculates a arc distance for hue-- it should be a vector
diff --git a/MagickCore/property.c b/MagickCore/property.c
index 042056e..5be95e9 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2210,6 +2210,7 @@
if (knot_count == 0)
{
TraceBezierCurve(message,last,first);
+ (void) ConcatenateString(&path,message);
in_subpath=MagickFalse;
}
break;
@@ -2865,6 +2866,19 @@
GetImageDepth(image,exception));
break;
}
+ if (LocaleCompare("bounding-box",property) == 0)
+ {
+ RectangleInfo
+ geometry;
+
+ WarnNoImageReturn("\"%%[%s]\"",property);
+ geometry=GetImageBoundingBox(image,exception);
+ (void) FormatLocaleString(value,MagickPathExtent,"%g,%g %g,%g\n",
+ (double) geometry.x,(double) geometry.y,
+ (double) geometry.x+geometry.width,
+ (double) geometry.y+geometry.height);
+ break;
+ }
break;
}
case 'c':
@@ -4159,7 +4173,7 @@
/*
Do not 'set' single letter properties - read only shorthand.
*/
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4200,7 +4214,7 @@
{
if (LocaleCompare("channels",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4269,7 +4283,7 @@
}
if (LocaleCompare("delay_units",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4311,7 +4325,7 @@
{
if (LocaleNCompare("exif:",property,5) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4322,7 +4336,7 @@
{
if (LocaleNCompare("fx:",property,3) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4355,7 +4369,7 @@
{
if (LocaleCompare("height",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4403,7 +4417,7 @@
Throwing an exception causes this setting to fail */
if (LocaleNCompare("iptc:",property,5) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4414,7 +4428,7 @@
case 'k':
if (LocaleCompare("kurtosis",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4437,7 +4451,7 @@
(LocaleCompare("min",property) == 0) ||
(LocaleCompare("min",property) == 0))
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4446,7 +4460,7 @@
case 'o':
if (LocaleCompare("opaque",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4468,7 +4482,7 @@
Throwing an exception causes this setting to fail */
if (LocaleNCompare("pixel:",property,6) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4516,7 +4530,7 @@
(LocaleCompare("scenes",property) == 0) ||
(LocaleCompare("standard-deviation",property) == 0))
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4568,7 +4582,7 @@
{
if (LocaleCompare("version",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4579,7 +4593,7 @@
{
if (LocaleCompare("width",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
@@ -4592,7 +4606,7 @@
{
if (LocaleNCompare("xmp:",property,4) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index 3d5745f..28422fe 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -653,7 +653,7 @@
/*
Monochrome image.
*/
- intensity=GetPixelInfoLuma(image->colormap+0) > QuantumRange/2.0 ? 0.0 :
+ intensity=GetPixelInfoLuma(image->colormap+0) < QuantumRange/2.0 ? 0.0 :
QuantumRange;
if (image->colors > 1)
{
@@ -790,13 +790,17 @@
Classify the first cube_info->maximum_colors colors to a tree depth of 8.
*/
SetAssociatedAlpha(image,cube_info);
- if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
- (cube_info->quantize_info->colorspace != CMYKColorspace))
- (void) TransformImageColorspace((Image *) image,
- cube_info->quantize_info->colorspace,exception);
- else
- if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
- (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
+ if (cube_info->quantize_info->colorspace != image->colorspace)
+ {
+ if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
+ (cube_info->quantize_info->colorspace != CMYKColorspace))
+ (void) TransformImageColorspace((Image *) image,
+ cube_info->quantize_info->colorspace,exception);
+ else
+ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+ (void) TransformImageColorspace((Image *) image,sRGBColorspace,
+ exception);
+ }
midpoint.red=(double) QuantumRange/2.0;
midpoint.green=(double) QuantumRange/2.0;
midpoint.blue=(double) QuantumRange/2.0;
@@ -1013,9 +1017,10 @@
break;
}
image_view=DestroyCacheView(image_view);
- if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
- (cube_info->quantize_info->colorspace != CMYKColorspace))
- (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
+ if (cube_info->quantize_info->colorspace != image->colorspace)
+ if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
+ (cube_info->quantize_info->colorspace != CMYKColorspace))
+ (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
return(y < (ssize_t) image->rows ? MagickFalse : MagickTrue);
}
@@ -2395,7 +2400,7 @@
static inline double KmeansMetric(const Image *magick_restrict image,
const Quantum *magick_restrict p,const PixelInfo *magick_restrict q)
{
- double
+ register double
gamma,
metric,
pixel;
@@ -2405,14 +2410,13 @@
if ((image->alpha_trait != UndefinedPixelTrait) ||
(q->alpha_trait != UndefinedPixelTrait))
{
- double
- que_alpha;
-
- que_alpha=q->alpha_trait != UndefinedPixelTrait ? q->alpha : OpaqueAlpha;
- pixel=QuantumScale*(GetPixelAlpha(image,p)-que_alpha);
+ pixel=GetPixelAlpha(image,p)-(q->alpha_trait != UndefinedPixelTrait ?
+ q->alpha : OpaqueAlpha);
metric+=pixel*pixel;
- gamma*=QuantumScale*GetPixelAlpha(image,p);
- gamma*=QuantumScale*que_alpha;
+ if (image->alpha_trait != UndefinedPixelTrait)
+ gamma*=QuantumScale*GetPixelAlpha(image,p);
+ if (q->alpha_trait != UndefinedPixelTrait)
+ gamma*=QuantumScale*q->alpha;
}
if (image->colorspace == CMYKColorspace)
{
@@ -2423,9 +2427,7 @@
}
metric*=3.0;
pixel=QuantumScale*(GetPixelRed(image,p)-q->red);
- if ((image->colorspace == HSLColorspace) ||
- (image->colorspace == HSBColorspace) ||
- (image->colorspace == HWBColorspace))
+ if (IsHueCompatibleColorspace(image->colorspace) != MagickFalse)
{
if (fabs((double) pixel) > 0.5)
pixel-=0.5;
@@ -2474,9 +2476,6 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickCoreSignature);
- status=AcquireImageColormap(image,number_colors,exception);
- if (status == MagickFalse)
- return(status);
colors=GetImageArtifact(image,"kmeans:seed-colors");
if (colors == (const char *) NULL)
{
@@ -2494,6 +2493,7 @@
Seed clusters from color quantization.
*/
quantize_info=AcquireQuantizeInfo((ImageInfo *) NULL);
+ quantize_info->colorspace=image->colorspace;
quantize_info->number_colors=number_colors;
quantize_info->dither_method=NoDitherMethod;
colors=number_colors;
@@ -2511,8 +2511,12 @@
{
if (cube_info->colors > cube_info->maximum_colors)
ReduceImageColors(image,cube_info);
- image->colors=0;
- status=DefineImageColormap(image,cube_info,cube_info->root);
+ status=AcquireImageColormap(image,number_colors,exception);
+ if (status != MagickFalse)
+ {
+ image->colors=0;
+ (void) DefineImageColormap(image,cube_info,cube_info->root);
+ }
}
DestroyCubeInfo(cube_info);
quantize_info=DestroyQuantizeInfo(quantize_info);
@@ -2530,6 +2534,9 @@
/*
Seed clusters from color list (e.g. red;green;blue).
*/
+ status=AcquireImageColormap(image,number_colors,exception);
+ if (status == MagickFalse)
+ return(status);
for (n=0, p=colors; n < (ssize_t) image->colors; n++)
{
register const char
diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c
index a9bb82b..0eee7d9 100644
--- a/MagickCore/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -359,6 +359,7 @@
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickCoreSignature);
+ (void) exception;
switch (quantum_info->depth)
{
case 8:
diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c
index 1079a56..8724beb 100644
--- a/MagickCore/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -158,13 +158,27 @@
return(pixels);
}
-static inline const unsigned char *PushQuantumFloatPixel(
- QuantumInfo *quantum_info,const unsigned char *magick_restrict pixels,
- float *pixel)
+static inline float ScaleFloatPixel(const QuantumInfo *quantum_info,
+ const unsigned char *quantum)
{
float
- *p;
+ pixel;
+ pixel=(*((float *) quantum));
+ pixel-=quantum_info->minimum;
+ pixel*=(float) quantum_info->scale;
+ if (pixel < FLT_MIN)
+ pixel=FLT_MIN;
+ else
+ if (pixel > FLT_MAX)
+ pixel=FLT_MAX;
+ return(pixel);
+}
+
+static inline const unsigned char *PushQuantumFloatPixel(
+ const QuantumInfo *quantum_info,const unsigned char *magick_restrict pixels,
+ float *pixel)
+{
unsigned char
quantum[4];
@@ -174,23 +188,55 @@
quantum[1]=(*pixels++);
quantum[2]=(*pixels++);
quantum[3]=(*pixels++);
- }
- else
- {
- quantum[3]=(*pixels++);
- quantum[2]=(*pixels++);
- quantum[1]=(*pixels++);
- quantum[0]=(*pixels++);
- }
- p=(float *) quantum;
- *pixel=(*p);
- *pixel-=quantum_info->minimum;
- *pixel*=(float) quantum_info->scale;
- if (*pixel < FLT_MIN)
- *pixel=FLT_MIN;
+ }
else
- if (*pixel > FLT_MAX)
- *pixel=FLT_MAX;
+ {
+ quantum[3]=(*pixels++);
+ quantum[2]=(*pixels++);
+ quantum[1]=(*pixels++);
+ quantum[0]=(*pixels++);
+ }
+ *pixel=ScaleFloatPixel(quantum_info,quantum);
+ return(pixels);
+}
+
+static inline const unsigned char *PushQuantumFloat24Pixel(
+ const QuantumInfo *quantum_info,const unsigned char *magick_restrict pixels,
+ float *pixel)
+{
+ unsigned char
+ quantum[4];
+
+ if (quantum_info->endian == LSBEndian)
+ {
+ quantum[0]=(*pixels++);
+ quantum[1]=(*pixels++);
+ quantum[2]=(*pixels++);
+ }
+ else
+ {
+ quantum[2]=(*pixels++);
+ quantum[1]=(*pixels++);
+ quantum[0]=(*pixels++);
+ }
+ if ((quantum[0] | quantum[1] | quantum[2]) == 0U)
+ quantum[3]=0;
+ else
+ {
+ unsigned char
+ exponent,
+ sign_bit;
+
+ sign_bit=(quantum[2] & 0x80);
+ exponent=(quantum[2] & 0x7F);
+ if (exponent != 0)
+ exponent=exponent-63+127;
+ quantum[3]=sign_bit | (exponent >> 1);
+ quantum[2]=((exponent & 1) << 7) | ((quantum[1] & 0xFE) >> 1);
+ quantum[1]=((quantum[1] & 0x01) << 7) | ((quantum[0] & 0xFE) >> 1);
+ quantum[0]=(quantum[0] & 0x01) << 7;
+ }
+ *pixel=ScaleFloatPixel(quantum_info,quantum);
return(pixels);
}
@@ -263,9 +309,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -310,11 +353,25 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -329,14 +386,20 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -357,6 +420,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -383,9 +449,6 @@
ssize_t
bit;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -411,6 +474,9 @@
}
case 10:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
if (quantum_info->pack == MagickFalse)
{
@@ -544,31 +610,37 @@
p++;
break;
}
- if (quantum_info->quantum == 32U)
+ else
{
+ unsigned int
+ pixel;
+
+ if (quantum_info->quantum == 32U)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
for (x=0; x < (ssize_t) number_pixels; x++)
{
- p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ p=PushQuantumPixel(quantum_info,p,&pixel);
SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
- p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ p=PushQuantumPixel(quantum_info,p,&pixel);
SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
- p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ p=PushQuantumPixel(quantum_info,p,&pixel);
SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
q+=GetPixelChannels(image);
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(quantum_info,p,&pixel);
- SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
- p=PushQuantumPixel(quantum_info,p,&pixel);
- SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
- p=PushQuantumPixel(quantum_info,p,&pixel);
- SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
- q+=GetPixelChannels(image);
- }
- break;
}
case 16:
{
@@ -606,11 +678,29 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -629,18 +719,24 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -665,6 +761,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -691,9 +790,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -720,6 +816,9 @@
}
case 10:
{
+ unsigned int
+ pixel;
+
pixel=0;
if (quantum_info->pack == MagickFalse)
{
@@ -832,11 +931,31 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -857,20 +976,26 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -897,6 +1022,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -925,9 +1053,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -954,6 +1079,9 @@
}
case 10:
{
+ unsigned int
+ pixel;
+
pixel=0;
if (quantum_info->pack == MagickFalse)
{
@@ -1066,11 +1194,31 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelOpacity(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -1091,19 +1239,25 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelOpacity(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelOpacity(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ }
break;
}
case 64:
@@ -1131,6 +1285,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -1159,9 +1316,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
if (image->colorspace != CMYKColorspace)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -1210,11 +1364,25 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -1229,14 +1397,20 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -1257,6 +1431,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -1280,9 +1457,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -1327,11 +1501,25 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -1346,14 +1534,20 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -1374,6 +1568,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -1491,9 +1688,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
if (image->colorspace != CMYKColorspace)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -1563,11 +1757,31 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -1588,20 +1802,26 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -1628,6 +1848,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -1656,9 +1879,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
if (image->colorspace != CMYKColorspace)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -1735,11 +1955,33 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -1762,22 +2004,28 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -1806,6 +2054,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -1836,9 +2087,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
if (image->colorspace != CMYKColorspace)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -1915,11 +2163,33 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelOpacity(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -1942,22 +2212,28 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelOpacity(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelOpacity(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -1986,6 +2262,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -2019,12 +2298,8 @@
ssize_t
bit;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
- pixel=0;
switch (quantum_info->depth)
{
case 1:
@@ -2033,12 +2308,12 @@
black,
white;
- black=0;
+ black=(Quantum) 0;
white=QuantumRange;
if (quantum_info->min_is_white != MagickFalse)
{
black=QuantumRange;
- white=0;
+ white=(Quantum) 0;
}
for (x=0; x < ((ssize_t) number_pixels-7); x+=8)
{
@@ -2111,6 +2386,10 @@
}
case 10:
{
+ unsigned int
+ pixel;
+
+ pixel=0;
range=GetQuantumRange(quantum_info->depth);
if (quantum_info->pack == MagickFalse)
{
@@ -2215,14 +2494,20 @@
p++;
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(quantum_info,p,&pixel);
- SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(quantum_info,p,&pixel);
+ SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 16:
{
@@ -2252,6 +2537,18 @@
}
break;
}
+ if (quantum_info->format == SignedQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(quantum_info->endian,p,&pixel);
+ pixel=(unsigned short) (((unsigned int) pixel+32768) % 65536);
+ SetPixelGray(image,ScaleShortToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(quantum_info->endian,p,&pixel);
@@ -2261,11 +2558,25 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGray(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -2280,14 +2591,20 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGray(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGray(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -2308,6 +2625,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -2334,9 +2654,6 @@
ssize_t
bit;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -2407,6 +2724,9 @@
}
case 10:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -2421,6 +2741,9 @@
}
case 12:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -2464,11 +2787,27 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGray(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -2485,16 +2824,22 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGray(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGray(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -2517,6 +2862,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -2542,9 +2890,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -2589,11 +2934,25 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -2608,14 +2967,20 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -2636,6 +3001,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -2662,9 +3030,6 @@
ssize_t
bit;
- unsigned int
- pixel;
-
if (image->storage_class != PseudoClass)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -2765,9 +3130,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(quantum_info->endian,p,&pixel);
- SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum(
- (double) QuantumRange*HalfToSinglePrecision(pixel)),
- &range_exception),q);
+ SetPixelIndex(image,PushColormapIndex(image,(size_t)
+ ClampToQuantum((double) QuantumRange*
+ HalfToSinglePrecision(pixel)),&range_exception),q);
SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
p+=quantum_info->pad;
@@ -2786,11 +3151,28 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelIndex(image,PushColormapIndex(image,(size_t)
+ ClampToQuantum(pixel),&range_exception),q);
+ SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -2799,7 +3181,24 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumFloatPixel(quantum_info,p,&pixel);
- SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum(pixel),
+ SetPixelIndex(image,PushColormapIndex(image,(size_t)
+ ClampToQuantum(pixel),&range_exception),q);
+ SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
&range_exception),q);
SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
@@ -2808,16 +3207,6 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelIndex(image,PushColormapIndex(image,pixel,&range_exception),q);
- SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
- GetPixelIndex(image,q),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
}
case 64:
{
@@ -2829,8 +3218,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(quantum_info,p,&pixel);
- SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum(pixel),
- &range_exception),q);
+ SetPixelIndex(image,PushColormapIndex(image,(size_t)
+ ClampToQuantum(pixel),&range_exception),q);
SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
p+=quantum_info->pad;
@@ -2841,6 +3230,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(quantum_info,p,&pixel);
@@ -2875,9 +3267,6 @@
ssize_t
bit;
- unsigned int
- pixel;
-
if (image->storage_class != PseudoClass)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -2969,9 +3358,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(quantum_info->endian,p,&pixel);
- SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum(
- (double) QuantumRange*HalfToSinglePrecision(pixel)),
- &range_exception),q);
+ SetPixelIndex(image,PushColormapIndex(image,(size_t)
+ ClampToQuantum((double) QuantumRange*
+ HalfToSinglePrecision(pixel)),&range_exception),q);
SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
p=PushShortPixel(quantum_info->endian,p,&pixel);
@@ -2995,11 +3384,30 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelIndex(image,PushColormapIndex(image,(size_t)
+ ClampToQuantum(pixel),&range_exception),q);
+ SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -3008,7 +3416,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumFloatPixel(quantum_info,p,&pixel);
- SetPixelIndex(image,PushColormapIndex(image,
+ SetPixelIndex(image,PushColormapIndex(image,(size_t)
ClampToQuantum(pixel),&range_exception),q);
SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
@@ -3019,18 +3427,25 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelIndex(image,PushColormapIndex(image,pixel,&range_exception),q);
- SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
- GetPixelIndex(image,q),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -3042,8 +3457,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(quantum_info,p,&pixel);
- SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum(pixel),
- &range_exception),q);
+ SetPixelIndex(image,PushColormapIndex(image,(size_t)
+ ClampToQuantum(pixel),&range_exception),q);
SetPixelViaPixelInfo(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
p=PushDoublePixel(quantum_info,p,&pixel);
@@ -3056,6 +3471,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -3086,9 +3504,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -3133,11 +3548,25 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelOpacity(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -3152,14 +3581,20 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelOpacity(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelOpacity(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -3180,6 +3615,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -3203,9 +3641,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -3250,11 +3685,25 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -3269,14 +3718,20 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -3297,6 +3752,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -3323,9 +3781,6 @@
ssize_t
bit;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -3351,6 +3806,9 @@
}
case 10:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
if (quantum_info->pack == MagickFalse)
{
@@ -3484,31 +3942,37 @@
p++;
break;
}
- if (quantum_info->quantum == 32U)
+ else
{
+ unsigned int
+ pixel;
+
+ if (quantum_info->quantum == 32U)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
for (x=0; x < (ssize_t) number_pixels; x++)
{
- p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ p=PushQuantumPixel(quantum_info,p,&pixel);
SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
- p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ p=PushQuantumPixel(quantum_info,p,&pixel);
SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
- p=PushQuantumLongPixel(quantum_info,p,&pixel);
+ p=PushQuantumPixel(quantum_info,p,&pixel);
SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
q+=GetPixelChannels(image);
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(quantum_info,p,&pixel);
- SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
- p=PushQuantumPixel(quantum_info,p,&pixel);
- SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
- p=PushQuantumPixel(quantum_info,p,&pixel);
- SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
- q+=GetPixelChannels(image);
- }
- break;
}
case 16:
{
@@ -3546,11 +4010,29 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -3569,18 +4051,24 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -3605,6 +4093,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -3631,9 +4122,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -3660,6 +4148,9 @@
}
case 10:
{
+ unsigned int
+ pixel;
+
pixel=0;
if (quantum_info->pack == MagickFalse)
{
@@ -3772,11 +4263,31 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -3797,20 +4308,26 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -3837,6 +4354,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -3865,9 +4385,6 @@
register ssize_t
x;
- unsigned int
- pixel;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
@@ -3894,6 +4411,9 @@
}
case 10:
{
+ unsigned int
+ pixel;
+
pixel=0;
if (quantum_info->pack == MagickFalse)
{
@@ -4006,11 +4526,31 @@
}
break;
}
+ case 24:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+ SetPixelOpacity(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
+ }
case 32:
{
- unsigned int
- pixel;
-
if (quantum_info->format == FloatingPointQuantumFormat)
{
float
@@ -4031,20 +4571,26 @@
}
break;
}
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelRed(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
- p=PushLongPixel(quantum_info->endian,p,&pixel);
- SetPixelOpacity(image,ScaleLongToQuantum(pixel),q);
- p+=quantum_info->pad;
- q+=GetPixelChannels(image);
- }
- break;
+ else
+ {
+ unsigned int
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(quantum_info->endian,p,&pixel);
+ SetPixelOpacity(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=GetPixelChannels(image);
+ }
+ break;
+ }
}
case 64:
{
@@ -4071,6 +4617,9 @@
}
default:
{
+ unsigned int
+ pixel;
+
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
@@ -4246,9 +4795,6 @@
Quantum
quantum;
- register Quantum
- *magick_restrict q;
-
q=GetAuthenticPixelQueue(image);
if (image_view != (CacheView *) NULL)
q=GetCacheViewAuthenticPixelQueue(image_view);
@@ -4266,9 +4812,6 @@
gamma,
Sa;
- register Quantum
- *magick_restrict q;
-
/*
Disassociate alpha.
*/
diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h
index 85b9dbe..82c2123 100644
--- a/MagickCore/quantum-private.h
+++ b/MagickCore/quantum-private.h
@@ -317,11 +317,11 @@
if (quantum > range)
return(QuantumRange);
#if !defined(MAGICKCORE_HDRI_SUPPORT)
- return((Quantum) (((double) QuantumRange*quantum)*
- PerceptibleReciprocal((double) range)+0.5));
+ return((Quantum) ((double) QuantumRange*(quantum*
+ PerceptibleReciprocal((double) range))+0.5));
#else
- return((Quantum) (((double) QuantumRange*quantum)*
- PerceptibleReciprocal((double) range)));
+ return((Quantum) ((double) QuantumRange*(quantum*
+ PerceptibleReciprocal((double) range))));
#endif
}
diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c
index d0d0f11..7f88a50 100644
--- a/MagickCore/quantum.c
+++ b/MagickCore/quantum.c
@@ -681,10 +681,13 @@
if (quantum_info->depth > 32)
quantum_info->depth=64;
else
- if (quantum_info->depth > 16)
+ if (quantum_info->depth > 24)
quantum_info->depth=32;
else
- quantum_info->depth=16;
+ if (quantum_info->depth > 16)
+ quantum_info->depth=24;
+ else
+ quantum_info->depth=16;
}
if (quantum_info->pixels != (MemoryInfo **) NULL)
DestroyQuantumPixels(quantum_info);
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index a0060a3..8f9f2fc 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -2383,7 +2383,7 @@
const int pattern3[] = { Rotated(pattern2) };
const int pattern4[] = { Rotated(pattern3) };
#undef Rotated
-
+ (void) source;
Hq2XHelper(Hq2XTable[Hq2XPatternToNumber(pattern1)],pixels,result,0,
channels,4,0,1,3,5,7);
Hq2XHelper(Hq2XTable[Hq2XPatternToNumber(pattern2)],pixels,result,1,
diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 02f0cf0..94eb56a 100644
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -1179,6 +1179,9 @@
pages=(-1);
#if defined(MAGICKCORE_HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)
pages=(ssize_t) sysconf(_SC_PHYS_PAGES);
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+ pages=pages/2;
+#endif
#endif
memory=(MagickSizeType) pages*pagesize;
if ((pagesize <= 0) || (pages <= 0))
diff --git a/MagickCore/signature.c b/MagickCore/signature.c
index e1c337b..f0f0e42 100644
--- a/MagickCore/signature.c
+++ b/MagickCore/signature.c
@@ -539,7 +539,7 @@
PixelTrait traits = GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
- pixel=(float) QuantumScale*p[i];
+ pixel=(float) (QuantumScale*p[i]);
if (signature_info->lsb_first == MagickFalse)
for (j=(ssize_t) sizeof(pixel)-1; j >= 0; j--)
*q++=(unsigned char) ((unsigned char *) &pixel)[j];
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 1ad8b2c..23ae544 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -134,7 +134,7 @@
typedef struct _PixelChannels
{
double
- channel[CompositePixelChannel];
+ channel[MaxPixelChannels];
} PixelChannels;
static PixelChannels **DestroyPixelThreadSet(const Image *images,
@@ -147,8 +147,8 @@
rows;
assert(pixels != (PixelChannels **) NULL);
- rows=MagickMax(GetImageListLength(images),
- (size_t) GetMagickResourceLimit(ThreadResource));
+ rows=MagickMax(GetImageListLength(images),(size_t)
+ GetMagickResourceLimit(ThreadResource));
for (i=0; i < (ssize_t) rows; i++)
if (pixels[i] != (PixelChannels *) NULL)
pixels[i]=(PixelChannels *) RelinquishMagickMemory(pixels[i]);
@@ -169,15 +169,16 @@
size_t
columns,
+ number_images,
rows;
- rows=MagickMax(GetImageListLength(images),
- (size_t) GetMagickResourceLimit(ThreadResource));
+ number_images=GetImageListLength(images);
+ rows=MagickMax(number_images,(size_t) GetMagickResourceLimit(ThreadResource));
pixels=(PixelChannels **) AcquireQuantumMemory(rows,sizeof(*pixels));
if (pixels == (PixelChannels **) NULL)
return((PixelChannels **) NULL);
(void) memset(pixels,0,rows*sizeof(*pixels));
- columns=MagickMax(GetImageListLength(images),MaxPixelChannels);
+ columns=MagickMax(number_images,MaxPixelChannels);
for (next=images; next != (Image *) NULL; next=next->next)
columns=MagickMax(next->columns,columns);
for (i=0; i < (ssize_t) rows; i++)
@@ -294,8 +295,8 @@
}
case GaussianNoiseEvaluateOperator:
{
- result=(double) GenerateDifferentialNoise(random_info,pixel,
- GaussianNoise,value);
+ result=(double) GenerateDifferentialNoise(random_info,pixel,GaussianNoise,
+ value);
break;
}
case ImpulseNoiseEvaluateOperator:
@@ -470,7 +471,11 @@
#define EvaluateImageTag "Evaluate/Image"
CacheView
- *evaluate_view;
+ *evaluate_view,
+ **image_view;
+
+ const Image
+ *next;
Image
*image;
@@ -491,6 +496,7 @@
number_images;
ssize_t
+ j,
y;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -521,6 +527,22 @@
ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename);
return((Image *) NULL);
}
+ image_view=(CacheView **) AcquireQuantumMemory(number_images,
+ sizeof(*image_view));
+ if (image_view == (CacheView **) NULL)
+ {
+ image=DestroyImage(image);
+ evaluate_pixels=DestroyPixelThreadSet(images,evaluate_pixels);
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename);
+ return(image);
+ }
+ next=images;
+ for (j=0; j < (ssize_t) number_images; j++)
+ {
+ image_view[j]=AcquireVirtualCacheView(next,exception);
+ next=GetNextImageInList(next);
+ }
/*
Evaluate image pixels.
*/
@@ -537,15 +559,15 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- CacheView
- *image_view;
-
const Image
*next;
const int
id = GetOpenMPThreadId();
+ const Quantum
+ **p;
+
register PixelChannels
*evaluate_pixel;
@@ -555,11 +577,30 @@
register ssize_t
x;
+ ssize_t
+ j;
+
if (status == MagickFalse)
continue;
+ p=(const Quantum **) AcquireQuantumMemory(number_images,sizeof(*p));
+ if (p == (const Quantum **) NULL)
+ {
+ status=MagickFalse;
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'",
+ images->filename);
+ continue;
+ }
+ for (j=0; j < (ssize_t) number_images; j++)
+ {
+ p[j]=GetCacheViewVirtualPixels(image_view[j],0,y,image->columns,1,
+ exception);
+ if (p[j] == (const Quantum *) NULL)
+ break;
+ }
q=QueueCacheViewAuthenticPixels(evaluate_view,0,y,image->columns,1,
exception);
- if (q == (Quantum *) NULL)
+ if ((j < (ssize_t) number_images) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
@@ -568,51 +609,43 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
register ssize_t
- j,
- k;
+ i;
- for (j=0; j < (ssize_t) number_images; j++)
- for (k=0; k < MaxPixelChannels; k++)
- evaluate_pixel[j].channel[k]=0.0;
next=images;
for (j=0; j < (ssize_t) number_images; j++)
{
- register const Quantum
- *p;
-
- register ssize_t
- i;
-
- image_view=AcquireVirtualCacheView(next,exception);
- p=GetCacheViewVirtualPixels(image_view,x,y,1,1,exception);
- if (p == (const Quantum *) NULL)
- {
- image_view=DestroyCacheView(image_view);
- break;
- }
+ for (i=0; i < MaxPixelChannels; i++)
+ evaluate_pixel[j].channel[i]=0.0;
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
PixelChannel channel = GetPixelChannelChannel(image,i);
PixelTrait traits = GetPixelChannelTraits(next,channel);
PixelTrait evaluate_traits = GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
- (evaluate_traits == UndefinedPixelTrait))
- continue;
- if ((traits & UpdatePixelTrait) == 0)
+ (evaluate_traits == UndefinedPixelTrait) ||
+ ((traits & UpdatePixelTrait) == 0))
continue;
evaluate_pixel[j].channel[i]=ApplyEvaluateOperator(
- random_info[id],GetPixelChannel(next,channel,p),op,
+ random_info[id],GetPixelChannel(next,channel,p[j]),op,
evaluate_pixel[j].channel[i]);
}
- image_view=DestroyCacheView(image_view);
+ p[j]+=GetPixelChannels(next);
next=GetNextImageInList(next);
}
qsort((void *) evaluate_pixel,number_images,sizeof(*evaluate_pixel),
IntensityCompare);
- for (k=0; k < (ssize_t) GetPixelChannels(image); k++)
- q[k]=ClampToQuantum(evaluate_pixel[j/2].channel[k]);
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ {
+ PixelChannel channel = GetPixelChannelChannel(image,i);
+ PixelTrait traits = GetPixelChannelTraits(image,channel);
+ if ((traits == UndefinedPixelTrait) ||
+ ((traits & UpdatePixelTrait) == 0))
+ continue;
+ q[i]=ClampToQuantum(evaluate_pixel[number_images/2].channel[i]);
+ }
q+=GetPixelChannels(image);
}
+ p=(const Quantum **) RelinquishMagickMemory(p);
if (SyncCacheViewAuthenticPixels(evaluate_view,exception) == MagickFalse)
status=MagickFalse;
if (images->progress_monitor != (MagickProgressMonitor) NULL)
@@ -640,15 +673,15 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- CacheView
- *image_view;
-
const Image
*next;
const int
id = GetOpenMPThreadId();
+ const Quantum
+ **p;
+
register ssize_t
i,
x;
@@ -664,9 +697,25 @@
if (status == MagickFalse)
continue;
+ p=(const Quantum **) AcquireQuantumMemory(number_images,sizeof(*p));
+ if (p == (const Quantum **) NULL)
+ {
+ status=MagickFalse;
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'",
+ images->filename);
+ continue;
+ }
+ for (j=0; j < (ssize_t) number_images; j++)
+ {
+ p[j]=GetCacheViewVirtualPixels(image_view[j],0,y,image->columns,1,
+ exception);
+ if (p[j] == (const Quantum *) NULL)
+ break;
+ }
q=QueueCacheViewAuthenticPixels(evaluate_view,0,y,image->columns,1,
exception);
- if (q == (Quantum *) NULL)
+ if ((j < (ssize_t) number_images) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
@@ -678,17 +727,6 @@
next=images;
for (j=0; j < (ssize_t) number_images; j++)
{
- register const Quantum
- *p;
-
- image_view=AcquireVirtualCacheView(next,exception);
- p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,
- exception);
- if (p == (const Quantum *) NULL)
- {
- image_view=DestroyCacheView(image_view);
- break;
- }
for (x=0; x < (ssize_t) image->columns; x++)
{
register ssize_t
@@ -705,19 +743,15 @@
if ((traits & UpdatePixelTrait) == 0)
continue;
evaluate_pixel[x].channel[i]=ApplyEvaluateOperator(
- random_info[id],GetPixelChannel(next,channel,p),j == 0 ?
+ random_info[id],GetPixelChannel(next,channel,p[j]),j == 0 ?
AddEvaluateOperator : op,evaluate_pixel[x].channel[i]);
}
- p+=GetPixelChannels(next);
+ p[j]+=GetPixelChannels(next);
}
- image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- register ssize_t
- i;
-
switch (op)
{
case MeanEvaluateOperator:
@@ -751,21 +785,18 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- register ssize_t
- i;
-
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
PixelChannel channel = GetPixelChannelChannel(image,i);
PixelTrait traits = GetPixelChannelTraits(image,channel);
- if (traits == UndefinedPixelTrait)
- continue;
- if ((traits & UpdatePixelTrait) == 0)
+ if ((traits == UndefinedPixelTrait) ||
+ ((traits & UpdatePixelTrait) == 0))
continue;
q[i]=ClampToQuantum(evaluate_pixel[x].channel[i]);
}
q+=GetPixelChannels(image);
}
+ p=(const Quantum **) RelinquishMagickMemory(p);
if (SyncCacheViewAuthenticPixels(evaluate_view,exception) == MagickFalse)
status=MagickFalse;
if (images->progress_monitor != (MagickProgressMonitor) NULL)
@@ -784,6 +815,9 @@
}
}
}
+ for (j=0; j < (ssize_t) number_images; j++)
+ image_view[j]=DestroyCacheView(image_view[j]);
+ image_view=(CacheView **) RelinquishMagickMemory(image_view);
evaluate_view=DestroyCacheView(evaluate_view);
evaluate_pixels=DestroyPixelThreadSet(images,evaluate_pixels);
random_info=DestroyRandomInfoThreadSet(random_info);
@@ -1462,16 +1496,8 @@
/*
Compute center of mass (centroid).
*/
- if (M00[channel] < MagickEpsilon)
- {
- M00[channel]+=MagickEpsilon;
- centroid[channel].x=(double) image->columns/2.0;
- centroid[channel].y=(double) image->rows/2.0;
- continue;
- }
- M00[channel]+=MagickEpsilon;
- centroid[channel].x=M10[channel]/M00[channel];
- centroid[channel].y=M01[channel]/M00[channel];
+ centroid[channel].x=M10[channel]*PerceptibleReciprocal(M00[channel]);
+ centroid[channel].y=M01[channel]*PerceptibleReciprocal(M00[channel]);
}
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -1553,50 +1579,44 @@
Compute elliptical angle, major and minor axes, eccentricity, & intensity.
*/
channel_moments[channel].centroid=centroid[channel];
- channel_moments[channel].ellipse_axis.x=sqrt((2.0/M00[channel])*
- ((M20[channel]+M02[channel])+sqrt(4.0*M11[channel]*M11[channel]+
- (M20[channel]-M02[channel])*(M20[channel]-M02[channel]))));
- channel_moments[channel].ellipse_axis.y=sqrt((2.0/M00[channel])*
- ((M20[channel]+M02[channel])-sqrt(4.0*M11[channel]*M11[channel]+
- (M20[channel]-M02[channel])*(M20[channel]-M02[channel]))));
- channel_moments[channel].ellipse_angle=RadiansToDegrees(0.5*atan(2.0*
- M11[channel]/(M20[channel]-M02[channel]+MagickEpsilon)));
- if (fabs(M11[channel]) < MagickEpsilon)
+ channel_moments[channel].ellipse_axis.x=sqrt((2.0*
+ PerceptibleReciprocal(M00[channel]))*((M20[channel]+M02[channel])+
+ sqrt(4.0*M11[channel]*M11[channel]+(M20[channel]-M02[channel])*
+ (M20[channel]-M02[channel]))));
+ channel_moments[channel].ellipse_axis.y=sqrt((2.0*
+ PerceptibleReciprocal(M00[channel]))*((M20[channel]+M02[channel])-
+ sqrt(4.0*M11[channel]*M11[channel]+(M20[channel]-M02[channel])*
+ (M20[channel]-M02[channel]))));
+ channel_moments[channel].ellipse_angle=RadiansToDegrees(1.0/2.0*atan(2.0*
+ M11[channel]*PerceptibleReciprocal(M20[channel]-M02[channel])));
+ if (fabs(M11[channel]) < 0.0)
{
- if (fabs(M20[channel]-M02[channel]) < MagickEpsilon)
- channel_moments[channel].ellipse_angle+=0.0;
- else
- if ((M20[channel]-M02[channel]) < 0.0)
- channel_moments[channel].ellipse_angle+=90.0;
- else
- channel_moments[channel].ellipse_angle+=0.0;
+ if ((fabs(M20[channel]-M02[channel]) >= 0.0) &&
+ ((M20[channel]-M02[channel]) < 0.0))
+ channel_moments[channel].ellipse_angle+=90.0;
}
else
if (M11[channel] < 0.0)
{
- if (fabs(M20[channel]-M02[channel]) < MagickEpsilon)
- channel_moments[channel].ellipse_angle+=0.0;
- else
- if ((M20[channel]-M02[channel]) < 0.0)
- channel_moments[channel].ellipse_angle+=90.0;
- else
- channel_moments[channel].ellipse_angle+=180.0;
+ if (fabs(M20[channel]-M02[channel]) >= 0.0)
+ {
+ if ((M20[channel]-M02[channel]) < 0.0)
+ channel_moments[channel].ellipse_angle+=90.0;
+ else
+ channel_moments[channel].ellipse_angle+=180.0;
+ }
}
else
- {
- if (fabs(M20[channel]-M02[channel]) < MagickEpsilon)
- channel_moments[channel].ellipse_angle+=0.0;
- else
- if ((M20[channel]-M02[channel]) < 0.0)
- channel_moments[channel].ellipse_angle+=90.0;
- else
- channel_moments[channel].ellipse_angle+=0.0;
- }
+ if ((fabs(M20[channel]-M02[channel]) >= 0.0) &&
+ ((M20[channel]-M02[channel]) < 0.0))
+ channel_moments[channel].ellipse_angle+=90.0;
channel_moments[channel].ellipse_eccentricity=sqrt(1.0-(
- channel_moments[channel].ellipse_axis.y/
- (channel_moments[channel].ellipse_axis.x+MagickEpsilon)));
- channel_moments[channel].ellipse_intensity=M00[channel]/
- (MagickPI*channel_moments[channel].ellipse_axis.x*
+ channel_moments[channel].ellipse_axis.y*
+ channel_moments[channel].ellipse_axis.y*PerceptibleReciprocal(
+ channel_moments[channel].ellipse_axis.x*
+ channel_moments[channel].ellipse_axis.x)));
+ channel_moments[channel].ellipse_intensity=M00[channel]*
+ PerceptibleReciprocal(MagickPI*channel_moments[channel].ellipse_axis.x*
channel_moments[channel].ellipse_axis.y+MagickEpsilon);
}
for (channel=0; channel <= MaxPixelChannels; channel++)
@@ -1606,14 +1626,14 @@
*/
M10[channel]=0.0;
M01[channel]=0.0;
- M11[channel]/=pow(M00[channel],1.0+(1.0+1.0)/2.0);
- M20[channel]/=pow(M00[channel],1.0+(2.0+0.0)/2.0);
- M02[channel]/=pow(M00[channel],1.0+(0.0+2.0)/2.0);
- M21[channel]/=pow(M00[channel],1.0+(2.0+1.0)/2.0);
- M12[channel]/=pow(M00[channel],1.0+(1.0+2.0)/2.0);
- M22[channel]/=pow(M00[channel],1.0+(2.0+2.0)/2.0);
- M30[channel]/=pow(M00[channel],1.0+(3.0+0.0)/2.0);
- M03[channel]/=pow(M00[channel],1.0+(0.0+3.0)/2.0);
+ M11[channel]*=PerceptibleReciprocal(pow(M00[channel],1.0+(1.0+1.0)/2.0));
+ M20[channel]*=PerceptibleReciprocal(pow(M00[channel],1.0+(2.0+0.0)/2.0));
+ M02[channel]*=PerceptibleReciprocal(pow(M00[channel],1.0+(0.0+2.0)/2.0));
+ M21[channel]*=PerceptibleReciprocal(pow(M00[channel],1.0+(2.0+1.0)/2.0));
+ M12[channel]*=PerceptibleReciprocal(pow(M00[channel],1.0+(1.0+2.0)/2.0));
+ M22[channel]*=PerceptibleReciprocal(pow(M00[channel],1.0+(2.0+2.0)/2.0));
+ M30[channel]*=PerceptibleReciprocal(pow(M00[channel],1.0+(3.0+0.0)/2.0));
+ M03[channel]*=PerceptibleReciprocal(pow(M00[channel],1.0+(0.0+3.0)/2.0));
M00[channel]=1.0;
}
image_view=DestroyCacheView(image_view);
@@ -2565,66 +2585,6 @@
} while (level-- > 0);
}
-static inline void GetMaximumPixelList(PixelList *pixel_list,Quantum *pixel)
-{
- register SkipList
- *p;
-
- size_t
- color,
- maximum;
-
- ssize_t
- count;
-
- /*
- Find the maximum value for each of the color.
- */
- p=(&pixel_list->skip_list);
- color=65536L;
- count=0;
- maximum=p->nodes[color].next[0];
- do
- {
- color=p->nodes[color].next[0];
- if (color > maximum)
- maximum=color;
- count+=p->nodes[color].count;
- } while (count < (ssize_t) pixel_list->length);
- *pixel=ScaleShortToQuantum((unsigned short) maximum);
-}
-
-static inline void GetMeanPixelList(PixelList *pixel_list,Quantum *pixel)
-{
- double
- sum;
-
- register SkipList
- *p;
-
- size_t
- color;
-
- ssize_t
- count;
-
- /*
- Find the mean value for each of the color.
- */
- p=(&pixel_list->skip_list);
- color=65536L;
- count=0;
- sum=0.0;
- do
- {
- color=p->nodes[color].next[0];
- sum+=(double) p->nodes[color].count*color;
- count+=p->nodes[color].count;
- } while (count < (ssize_t) pixel_list->length);
- sum/=pixel_list->length;
- *pixel=ScaleShortToQuantum((unsigned short) sum);
-}
-
static inline void GetMedianPixelList(PixelList *pixel_list,Quantum *pixel)
{
register SkipList
@@ -2650,35 +2610,6 @@
*pixel=ScaleShortToQuantum((unsigned short) color);
}
-static inline void GetMinimumPixelList(PixelList *pixel_list,Quantum *pixel)
-{
- register SkipList
- *p;
-
- size_t
- color,
- minimum;
-
- ssize_t
- count;
-
- /*
- Find the minimum value for each of the color.
- */
- p=(&pixel_list->skip_list);
- count=0;
- color=65536UL;
- minimum=p->nodes[color].next[0];
- do
- {
- color=p->nodes[color].next[0];
- if (color < minimum)
- minimum=color;
- count+=p->nodes[color].count;
- } while (count < (ssize_t) pixel_list->length);
- *pixel=ScaleShortToQuantum((unsigned short) minimum);
-}
-
static inline void GetModePixelList(PixelList *pixel_list,Quantum *pixel)
{
register SkipList
@@ -2748,78 +2679,6 @@
*pixel=ScaleShortToQuantum((unsigned short) color);
}
-static inline void GetRootMeanSquarePixelList(PixelList *pixel_list,
- Quantum *pixel)
-{
- double
- sum;
-
- register SkipList
- *p;
-
- size_t
- color;
-
- ssize_t
- count;
-
- /*
- Find the root mean square value for each of the color.
- */
- p=(&pixel_list->skip_list);
- color=65536L;
- count=0;
- sum=0.0;
- do
- {
- color=p->nodes[color].next[0];
- sum+=(double) (p->nodes[color].count*color*color);
- count+=p->nodes[color].count;
- } while (count < (ssize_t) pixel_list->length);
- sum/=pixel_list->length;
- *pixel=ScaleShortToQuantum((unsigned short) sqrt(sum));
-}
-
-static inline void GetStandardDeviationPixelList(PixelList *pixel_list,
- Quantum *pixel)
-{
- double
- sum,
- sum_squared;
-
- register SkipList
- *p;
-
- size_t
- color;
-
- ssize_t
- count;
-
- /*
- Find the standard-deviation value for each of the color.
- */
- p=(&pixel_list->skip_list);
- color=65536L;
- count=0;
- sum=0.0;
- sum_squared=0.0;
- do
- {
- register ssize_t
- i;
-
- color=p->nodes[color].next[0];
- sum+=(double) p->nodes[color].count*color;
- for (i=0; i < (ssize_t) p->nodes[color].count; i++)
- sum_squared+=((double) color)*((double) color);
- count+=p->nodes[color].count;
- } while (count < (ssize_t) pixel_list->length);
- sum/=pixel_list->length;
- sum_squared/=pixel_list->length;
- *pixel=ScaleShortToQuantum((unsigned short) sqrt(sum_squared-(sum*sum)));
-}
-
static inline void InsertPixelList(const Quantum pixel,PixelList *pixel_list)
{
size_t
@@ -2955,6 +2814,13 @@
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
+ double
+ area,
+ maximum,
+ minimum,
+ sum,
+ sum_squared;
+
Quantum
pixel;
@@ -2983,12 +2849,30 @@
if ((statistic_traits & UpdatePixelTrait) == 0)
continue;
pixels=p;
+ area=0.0;
+ minimum=pixels[i];
+ maximum=pixels[i];
+ sum=0.0;
+ sum_squared=0.0;
ResetPixelList(pixel_list[id]);
for (v=0; v < (ssize_t) MagickMax(height,1); v++)
{
for (u=0; u < (ssize_t) MagickMax(width,1); u++)
{
- InsertPixelList(pixels[i],pixel_list[id]);
+ if ((type == MedianStatistic) || (type == ModeStatistic) ||
+ (type == NonpeakStatistic))
+ {
+ InsertPixelList(pixels[i],pixel_list[id]);
+ pixels+=GetPixelChannels(image);
+ continue;
+ }
+ area++;
+ if (pixels[i] < minimum)
+ minimum=(double) pixels[i];
+ if (pixels[i] > maximum)
+ maximum=(double) pixels[i];
+ sum+=(double) pixels[i];
+ sum_squared+=(double) pixels[i]*pixels[i];
pixels+=GetPixelChannels(image);
}
pixels+=GetPixelChannels(image)*image->columns;
@@ -2997,36 +2881,28 @@
{
case GradientStatistic:
{
- double
- maximum,
- minimum;
-
- GetMinimumPixelList(pixel_list[id],&pixel);
- minimum=(double) pixel;
- GetMaximumPixelList(pixel_list[id],&pixel);
- maximum=(double) pixel;
pixel=ClampToQuantum(MagickAbsoluteValue(maximum-minimum));
break;
}
case MaximumStatistic:
{
- GetMaximumPixelList(pixel_list[id],&pixel);
+ pixel=ClampToQuantum(maximum);
break;
}
case MeanStatistic:
+ default:
{
- GetMeanPixelList(pixel_list[id],&pixel);
+ pixel=ClampToQuantum(sum/area);
break;
}
case MedianStatistic:
- default:
{
GetMedianPixelList(pixel_list[id],&pixel);
break;
}
case MinimumStatistic:
{
- GetMinimumPixelList(pixel_list[id],&pixel);
+ pixel=ClampToQuantum(minimum);
break;
}
case ModeStatistic:
@@ -3041,12 +2917,12 @@
}
case RootMeanSquareStatistic:
{
- GetRootMeanSquarePixelList(pixel_list[id],&pixel);
+ pixel=ClampToQuantum(sqrt(sum_squared/area));
break;
}
case StandardDeviationStatistic:
{
- GetStandardDeviationPixelList(pixel_list[id],&pixel);
+ pixel=ClampToQuantum(sqrt(sum_squared/area-(sum/area*sum/area)));
break;
}
}
diff --git a/MagickCore/string-private.h b/MagickCore/string-private.h
index f3f65f7..397cb1c 100644
--- a/MagickCore/string-private.h
+++ b/MagickCore/string-private.h
@@ -46,7 +46,7 @@
return(InterpretLocaleValue(string,sentinal));
}
-static inline char *StringLocateSubstring(const char *haystack,
+static inline const char *StringLocateSubstring(const char *haystack,
const char *needle)
{
#if defined(MAGICKCORE_HAVE_STRCASESTR)
diff --git a/MagickCore/string.c b/MagickCore/string.c
index dac8848..22ba999 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -2624,9 +2624,7 @@
(void) memmove(p+replace_extent,p+search_extent,
strlen(p+search_extent)+1);
(void) memcpy(p,replace,replace_extent);
- p+=replace_extent;
- if (replace_extent != 0)
- p--;
+ p+=replace_extent-1;
}
return(status);
}
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 5f007ec..29ba04c 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -41,7 +41,7 @@
Include declarations.
*/
#include "MagickCore/studio.h"
-#include "MagickCore/property.h"
+#include "MagickCore/artifact.h"
#include "MagickCore/blob.h"
#include "MagickCore/cache-view.h"
#include "MagickCore/color.h"
@@ -59,6 +59,7 @@
#include "MagickCore/effect.h"
#include "MagickCore/fx.h"
#include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
#include "MagickCore/geometry.h"
#include "MagickCore/image-private.h"
#include "MagickCore/list.h"
@@ -70,6 +71,7 @@
#include "MagickCore/option.h"
#include "MagickCore/pixel-accessor.h"
#include "MagickCore/pixel-private.h"
+#include "MagickCore/property.h"
#include "MagickCore/quantize.h"
#include "MagickCore/quantum.h"
#include "MagickCore/quantum-private.h"
@@ -756,6 +758,8 @@
*/
(void) FormatLocaleString(property,MagickPathExtent,"%g%%",threshold);
(void) SetImageProperty(image,"auto-threshold:threshold",property,exception);
+ if (IsStringTrue(GetImageArtifact(image,"auto-threshold:verbose")) != MagickFalse)
+ (void) FormatLocaleFile(stdout,"%.*g%%\n",GetMagickPrecision(),threshold);
return(BilevelImage(image,QuantumRange*threshold/100.0,exception));
}
@@ -1187,6 +1191,202 @@
% %
% %
% %
+% C o l o r T h r e s h o l d I m a g e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ColorThresholdImage() forces all pixels in the color range to white
+% otherwise black.
+%
+% The format of the ColorThresholdImage method is:
+%
+% MagickBooleanType ColorThresholdImage(Image *image,
+% const PixelInfo *start_color,const PixelInfo *stop_color,
+% ExceptionInfo *exception)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+% o start_color, stop_color: define the start and stop color range. Any
+% pixel within the range returns white otherwise black.
+%
+% o exception: return any errors or warnings in this structure.
+%
+*/
+MagickExport MagickBooleanType ColorThresholdImage(Image *image,
+ const PixelInfo *start_color,const PixelInfo *stop_color,
+ ExceptionInfo *exception)
+{
+#define ThresholdImageTag "Threshold/Image"
+
+ CacheView
+ *image_view;
+
+ MagickBooleanType
+ status;
+
+ MagickOffsetType
+ progress;
+
+ PixelInfo
+ start,
+ stop;
+
+ ssize_t
+ y;
+
+ /*
+ Color threshold image.
+ */
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickCoreSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ status=AcquireImageColormap(image,2,exception);
+ if (status == MagickFalse)
+ return(status);
+ start=(*start_color);
+ stop=(*stop_color);
+ switch (image->colorspace)
+ {
+ case HCLColorspace:
+ {
+ ConvertRGBToHCL(start_color->red,start_color->green,start_color->blue,
+ &start.red,&start.green,&start.blue);
+ ConvertRGBToHCL(stop_color->red,stop_color->green,stop_color->blue,
+ &stop.red,&stop.green,&stop.blue);
+ break;
+ }
+ case HSBColorspace:
+ {
+ ConvertRGBToHSB(start_color->red,start_color->green,start_color->blue,
+ &start.red,&start.green,&start.blue);
+ ConvertRGBToHSB(stop_color->red,stop_color->green,stop_color->blue,
+ &stop.red,&stop.green,&stop.blue);
+ break;
+ }
+ case HSLColorspace:
+ {
+ ConvertRGBToHSL(start_color->red,start_color->green,start_color->blue,
+ &start.red,&start.green,&start.blue);
+ ConvertRGBToHSL(stop_color->red,stop_color->green,stop_color->blue,
+ &stop.red,&stop.green,&stop.blue);
+ break;
+ }
+ case HSVColorspace:
+ {
+ ConvertRGBToHSV(start_color->red,start_color->green,start_color->blue,
+ &start.red,&start.green,&start.blue);
+ ConvertRGBToHSV(stop_color->red,stop_color->green,stop_color->blue,
+ &stop.red,&stop.green,&stop.blue);
+ break;
+ }
+ case HWBColorspace:
+ {
+ ConvertRGBToHWB(start_color->red,start_color->green,start_color->blue,
+ &start.red,&start.green,&start.blue);
+ ConvertRGBToHWB(stop_color->red,stop_color->green,stop_color->blue,
+ &stop.red,&stop.green,&stop.blue);
+ break;
+ }
+ case LabColorspace:
+ {
+ ConvertRGBToLab(start_color->red,start_color->green,start_color->blue,
+ &start.red,&start.green,&start.blue);
+ ConvertRGBToLab(stop_color->red,stop_color->green,stop_color->blue,
+ &stop.red,&stop.green,&stop.blue);
+ break;
+ }
+ default:
+ {
+ start.red*=QuantumScale;
+ start.green*=QuantumScale;
+ start.blue*=QuantumScale;
+ stop.red*=QuantumScale;
+ stop.green*=QuantumScale;
+ stop.blue*=QuantumScale;
+ break;
+ }
+ }
+ start.red*=QuantumRange;
+ start.green*=QuantumRange;
+ start.blue*=QuantumRange;
+ stop.red*=QuantumRange;
+ stop.green*=QuantumRange;
+ stop.blue*=QuantumRange;
+ progress=0;
+ image_view=AcquireAuthenticCacheView(image,exception);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(static) shared(progress,status) \
+ magick_number_threads(image,image,image->rows,1)
+#endif
+ for (y=0; y < (ssize_t) image->rows; y++)
+ {
+ register ssize_t
+ x;
+
+ register Quantum
+ *magick_restrict q;
+
+ if (status == MagickFalse)
+ continue;
+ q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
+ {
+ status=MagickFalse;
+ continue;
+ }
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
+ MagickBooleanType
+ foreground = MagickTrue;
+
+ register ssize_t
+ i;
+
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ {
+ PixelChannel channel = GetPixelChannelChannel(image,i);
+ PixelTrait traits = GetPixelChannelTraits(image,channel);
+ if ((traits & UpdatePixelTrait) == 0)
+ continue;
+ if ((q[i] < GetPixelInfoChannel(&start,channel)) ||
+ (q[i] > GetPixelInfoChannel(&stop,channel)))
+ foreground=MagickFalse;
+ }
+ SetPixelIndex(image,(Quantum) (foreground != MagickFalse ? 1 : 0),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
+ status=MagickFalse;
+ if (image->progress_monitor != (MagickProgressMonitor) NULL)
+ {
+ MagickBooleanType
+ proceed;
+
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp atomic
+#endif
+ progress++;
+ proceed=SetImageProgress(image,ThresholdImageTag,progress,
+ image->rows);
+ if (proceed == MagickFalse)
+ status=MagickFalse;
+ }
+ }
+ image_view=DestroyCacheView(image_view);
+ image->colorspace=sRGBColorspace;
+ return(SyncImage(image,exception));
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
% D e s t r o y T h r e s h o l d M a p %
% %
% %
@@ -2231,7 +2431,7 @@
if (image->channel_mask != DefaultChannels)
pixel=(double) q[i];
if (pixel < low_black)
- q[i]=0;
+ q[i]=(Quantum) 0;
else
if ((pixel >= low_black) && (pixel < low_white))
q[i]=ClampToQuantum(QuantumRange*
@@ -2245,9 +2445,9 @@
high_black-high_white)*(high_black-pixel));
else
if (pixel > high_black)
- q[i]=0;
+ q[i]=(Quantum) 0;
else
- q[i]=0;
+ q[i]=(Quantum) 0;
}
q+=GetPixelChannels(image);
}
diff --git a/MagickCore/threshold.h b/MagickCore/threshold.h
index 72bd2fc..1268888 100644
--- a/MagickCore/threshold.h
+++ b/MagickCore/threshold.h
@@ -46,6 +46,8 @@
BilevelImage(Image *,const double,ExceptionInfo *),
BlackThresholdImage(Image *,const char *,ExceptionInfo *),
ClampImage(Image *,ExceptionInfo *),
+ ColorThresholdImage(Image *,const PixelInfo *,const PixelInfo *,
+ ExceptionInfo *),
ListThresholdMaps(FILE *,ExceptionInfo *),
OrderedDitherImage(Image *,const char *,ExceptionInfo *),
PerceptibleImage(Image *,const double,ExceptionInfo *),
diff --git a/MagickCore/timer.c b/MagickCore/timer.c
index aadcfbb..6136adf 100644
--- a/MagickCore/timer.c
+++ b/MagickCore/timer.c
@@ -325,10 +325,18 @@
*/
MagickExport time_t GetMagickTime(void)
{
- char
- *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+ static const char
+ *source_date_epoch = (const char *) NULL;
- if (source_date_epoch != (char *) NULL)
+ static MagickBooleanType
+ epoch_initalized = MagickFalse;
+
+ if (epoch_initalized == MagickFalse)
+ {
+ source_date_epoch=getenv("SOURCE_DATE_EPOCH");
+ epoch_initalized=MagickTrue;
+ }
+ if (source_date_epoch != (const char *) NULL)
{
time_t
epoch;
diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 14c08b3..c93cb89 100644
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -60,6 +60,7 @@
#include "MagickCore/monitor.h"
#include "MagickCore/monitor-private.h"
#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
#include "MagickCore/resource_.h"
#include "MagickCore/resize.h"
#include "MagickCore/statistic.h"
@@ -2401,6 +2402,9 @@
*/
MagickExport Image *TrimImage(const Image *image,ExceptionInfo *exception)
{
+ char
+ bounding_box[MagickPathExtent];
+
RectangleInfo
geometry;
diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index d123f61..8594fc1 100644
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -1142,8 +1142,6 @@
page_size=(ssize_t) sysconf(_SC_PAGE_SIZE);
#elif defined(MAGICKCORE_HAVE_GETPAGESIZE)
page_size=(ssize_t) getpagesize();
-#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
- page_size=NTGetPageSize();
#endif
if (page_size <= 0)
page_size=4096;
diff --git a/MagickCore/version.c b/MagickCore/version.c
index 773a4fd..1635588 100644
--- a/MagickCore/version.c
+++ b/MagickCore/version.c
@@ -275,6 +275,9 @@
" "
#endif
#endif
+#if defined(MAGICKCORE_HAVE_TCMALLOC)
+ "TCMalloc "
+#endif
#if defined(ZERO_CONFIGURATION_SUPPORT)
"Zero-configuration "
#endif
diff --git a/MagickCore/vision.c b/MagickCore/vision.c
index 3d0085b..e85d469 100644
--- a/MagickCore/vision.c
+++ b/MagickCore/vision.c
@@ -134,8 +134,9 @@
#define ConnectedComponentsImageTag "ConnectedComponents/Image"
CacheView
+ *component_view,
*image_view,
- *component_view;
+ *object_view;
CCObjectInfo
*object;
@@ -144,10 +145,12 @@
*c;
const char
- *artifact;
+ *artifact,
+ *metrics[CCMaxMetrics];
double
- area_threshold;
+ max_threshold,
+ min_threshold;
Image
*component_image;
@@ -161,6 +164,9 @@
MatrixInfo
*equivalences;
+ RectangleInfo
+ bounding_box;
+
register ssize_t
i;
@@ -168,6 +174,11 @@
size;
ssize_t
+ background_id,
+ connect4[2][2] = { { -1, 0 }, { 0, -1 } },
+ connect8[4][2] = { { -1, -1 }, { -1, 0 }, { -1, 1 }, { 0, -1 } },
+ dx,
+ dy,
first,
last,
n,
@@ -234,16 +245,10 @@
image_view=AcquireVirtualCacheView(image,exception);
for (n=0; n < (ssize_t) (connectivity > 4 ? 4 : 2); n++)
{
- ssize_t
- connect4[2][2] = { { -1, 0 }, { 0, -1 } },
- connect8[4][2] = { { -1, -1 }, { -1, 0 }, { -1, 1 }, { 0, -1 } },
- dx,
- dy;
-
if (status == MagickFalse)
continue;
- dy=connectivity > 4 ? connect8[n][0] : connect4[n][0];
dx=connectivity > 4 ? connect8[n][1] : connect4[n][1];
+ dy=connectivity > 4 ? connect8[n][0] : connect4[n][0];
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
@@ -341,12 +346,10 @@
}
}
}
- image_view=DestroyCacheView(image_view);
/*
Label connected components.
*/
n=0;
- image_view=AcquireVirtualCacheView(image,exception);
component_view=AcquireAuthenticCacheView(component_image,exception);
for (y=0; y < (ssize_t) component_image->rows; y++)
{
@@ -433,53 +436,234 @@
component_image=DestroyImage(component_image);
ThrowImageException(ResourceLimitError,"TooManyObjects");
}
+ background_id=0;
+ min_threshold=0.0;
+ max_threshold=HUGE_VAL;
component_image->colors=(size_t) n;
for (i=0; i < (ssize_t) component_image->colors; i++)
{
object[i].bounding_box.width-=(object[i].bounding_box.x-1);
object[i].bounding_box.height-=(object[i].bounding_box.y-1);
- object[i].color.red=QuantumRange*(object[i].color.red/object[i].area);
- object[i].color.green=QuantumRange*(object[i].color.green/object[i].area);
- object[i].color.blue=QuantumRange*(object[i].color.blue/object[i].area);
+ object[i].color.red/=(object[i].area/QuantumRange);
+ object[i].color.green/=(object[i].area/QuantumRange);
+ object[i].color.blue/=(object[i].area/QuantumRange);
if (image->alpha_trait != UndefinedPixelTrait)
- object[i].color.alpha=QuantumRange*(object[i].color.alpha/object[i].area);
+ object[i].color.alpha/=(object[i].area/QuantumRange);
if (image->colorspace == CMYKColorspace)
- object[i].color.black=QuantumRange*(object[i].color.black/object[i].area);
- object[i].centroid.x=object[i].centroid.x/object[i].area;
- object[i].centroid.y=object[i].centroid.y/object[i].area;
+ object[i].color.black/=(object[i].area/QuantumRange);
+ object[i].centroid.x/=object[i].area;
+ object[i].centroid.y/=object[i].area;
+ max_threshold+=object[i].area;
+ if (object[i].area > object[background_id].area)
+ background_id=i;
}
- artifact=GetImageArtifact(image,"connected-components:area-threshold");
- area_threshold=0.0;
+ max_threshold+=MagickEpsilon;
+ n=(-1);
+ artifact=GetImageArtifact(image,"connected-components:background-id");
if (artifact != (const char *) NULL)
- area_threshold=StringToDouble(artifact,(char **) NULL);
- if (area_threshold > 0.0)
+ background_id=(ssize_t) StringToDouble(artifact,(char **) NULL);
+ artifact=GetImageArtifact(image,"connected-components:area-threshold");
+ if (artifact != (const char *) NULL)
{
/*
- Merge object below area threshold.
+ Merge any object not within the min and max area threshold.
*/
- component_view=AcquireAuthenticCacheView(component_image,exception);
+ (void) sscanf(artifact,"%lf%*[ -]%lf",&min_threshold,&max_threshold);
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (((object[i].area < min_threshold) ||
+ (object[i].area >= max_threshold)) && (i != background_id))
+ object[i].merge=MagickTrue;
+ }
+ artifact=GetImageArtifact(image,"connected-components:keep-colors");
+ if (artifact != (const char *) NULL)
+ {
+ register const char
+ *p;
+
+ /*
+ Keep selected objects based on color, merge others.
+ */
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ object[i].merge=MagickTrue;
+ for (p=artifact; ; )
+ {
+ char
+ color[MagickPathExtent];
+
+ PixelInfo
+ pixel;
+
+ register const char
+ *q;
+
+ for (q=p; *q != '\0'; q++)
+ if (*q == ';')
+ break;
+ (void) CopyMagickString(color,p,(size_t) MagickMin(q-p+1,
+ MagickPathExtent));
+ (void) QueryColorCompliance(color,AllCompliance,&pixel,exception);
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (IsFuzzyEquivalencePixelInfo(&object[i].color,&pixel) != MagickFalse)
+ object[i].merge=MagickFalse;
+ if (*q == '\0')
+ break;
+ p=q+1;
+ }
+ }
+ artifact=GetImageArtifact(image,"connected-components:keep-ids");
+ if (artifact == (const char *) NULL)
+ artifact=GetImageArtifact(image,"connected-components:keep");
+ if (artifact != (const char *) NULL)
+ {
+ /*
+ Keep selected objects based on id, merge others.
+ */
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ object[i].merge=MagickTrue;
+ for (c=(char *) artifact; *c != '\0';)
+ {
+ while ((isspace((int) ((unsigned char) *c)) != 0) || (*c == ','))
+ c++;
+ first=(ssize_t) strtol(c,&c,10);
+ if (first < 0)
+ first+=(ssize_t) component_image->colors;
+ last=first;
+ while (isspace((int) ((unsigned char) *c)) != 0)
+ c++;
+ if (*c == '-')
+ {
+ last=(ssize_t) strtol(c+1,&c,10);
+ if (last < 0)
+ last+=(ssize_t) component_image->colors;
+ }
+ step=(ssize_t) (first > last ? -1 : 1);
+ for ( ; first != (last+step); first+=step)
+ object[first].merge=MagickFalse;
+ }
+ }
+ artifact=GetImageArtifact(image,"connected-components:keep-top");
+ if (artifact != (const char *) NULL)
+ {
+ CCObjectInfo
+ *top_objects;
+
+ ssize_t
+ top_ids;
+
+ /*
+ Keep top objects.
+ */
+ top_ids=(ssize_t) StringToDouble(artifact,(char **) NULL);
+ top_objects=(CCObjectInfo *) AcquireQuantumMemory(component_image->colors,
+ sizeof(*top_objects));
+ if (top_objects == (CCObjectInfo *) NULL)
+ {
+ object=(CCObjectInfo *) RelinquishMagickMemory(object);
+ component_image=DestroyImage(component_image);
+ ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
+ }
+ (void) memcpy(top_objects,object,component_image->colors*sizeof(*object));
+ qsort((void *) top_objects,component_image->colors,sizeof(*top_objects),
+ CCObjectInfoCompare);
+ for (i=top_ids+1; i < (ssize_t) component_image->colors; i++)
+ object[top_objects[i].id].merge=MagickTrue;
+ top_objects=(CCObjectInfo *) RelinquishMagickMemory(top_objects);
+ }
+ artifact=GetImageArtifact(image,"connected-components:remove-colors");
+ if (artifact != (const char *) NULL)
+ {
+ register const char
+ *p;
+
+ /*
+ Remove selected objects based on color, keep others.
+ */
+ for (p=artifact; ; )
+ {
+ char
+ color[MagickPathExtent];
+
+ PixelInfo
+ pixel;
+
+ register const char
+ *q;
+
+ for (q=p; *q != '\0'; q++)
+ if (*q == ';')
+ break;
+ (void) CopyMagickString(color,p,(size_t) MagickMin(q-p+1,
+ MagickPathExtent));
+ (void) QueryColorCompliance(color,AllCompliance,&pixel,exception);
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (IsFuzzyEquivalencePixelInfo(&object[i].color,&pixel) != MagickFalse)
+ object[i].merge=MagickTrue;
+ if (*q == '\0')
+ break;
+ p=q+1;
+ }
+ }
+ artifact=GetImageArtifact(image,"connected-components:remove-ids");
+ if (artifact == (const char *) NULL)
+ artifact=GetImageArtifact(image,"connected-components:remove");
+ if (artifact != (const char *) NULL)
+ for (c=(char *) artifact; *c != '\0';)
+ {
+ /*
+ Remove selected objects based on id, keep others.
+ */
+ while ((isspace((int) ((unsigned char) *c)) != 0) || (*c == ','))
+ c++;
+ first=(ssize_t) strtol(c,&c,10);
+ if (first < 0)
+ first+=(ssize_t) component_image->colors;
+ last=first;
+ while (isspace((int) ((unsigned char) *c)) != 0)
+ c++;
+ if (*c == '-')
+ {
+ last=(ssize_t) strtol(c+1,&c,10);
+ if (last < 0)
+ last+=(ssize_t) component_image->colors;
+ }
+ step=(ssize_t) (first > last ? -1 : 1);
+ for ( ; first != (last+step); first+=step)
+ object[first].merge=MagickTrue;
+ }
+ artifact=GetImageArtifact(image,"connected-components:perimeter-threshold");
+ if (artifact != (const char *) NULL)
+ {
+ /*
+ Merge any object not within the min and max perimeter threshold.
+ */
+ (void) sscanf(artifact,"%lf%*[ -]%lf",&min_threshold,&max_threshold);
+ metrics[++n]="perimeter";
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(dynamic) shared(status) \
+ magick_number_threads(component_image,component_image,component_image->colors,1)
+#endif
for (i=0; i < (ssize_t) component_image->colors; i++)
{
- double
- census;
+ CacheView
+ *component_view;
RectangleInfo
bounding_box;
- register ssize_t
- j;
-
size_t
- id;
+ pattern[4] = { 1, 0, 0, 0 };
+ ssize_t
+ y;
+
+ /*
+ Compute perimeter of each object.
+ */
if (status == MagickFalse)
continue;
- if ((double) object[i].area >= area_threshold)
- continue;
- for (j=0; j < (ssize_t) component_image->colors; j++)
- object[j].census=0;
+ component_view=AcquireAuthenticCacheView(component_image,exception);
bounding_box=object[i].bounding_box;
- for (y=0; y < (ssize_t) bounding_box.height+2; y++)
+ for (y=(-1); y < (ssize_t) bounding_box.height+1; y++)
{
register const Quantum
*magick_restrict p;
@@ -490,59 +674,750 @@
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(component_view,bounding_box.x-1,
- bounding_box.y+y-1,bounding_box.width+2,1,exception);
+ bounding_box.y+y,bounding_box.width+2,2,exception);
if (p == (const Quantum *) NULL)
{
status=MagickFalse;
- continue;
+ break;
}
- for (x=0; x < (ssize_t) bounding_box.width+2; x++)
+ for (x=(-1); x < (ssize_t) bounding_box.width+1; x++)
{
- j=(ssize_t) GetPixelIndex(component_image,p);
- if (j != i)
- object[j].census++;
+ Quantum
+ pixels[4];
+
+ register ssize_t
+ v;
+
+ size_t
+ foreground;
+
+ /*
+ An Algorithm for Calculating Objects’ Shape Features in Binary
+ Images, Lifeng He, Yuyan Chao.
+ */
+ foreground=0;
+ for (v=0; v < 2; v++)
+ {
+ register ssize_t
+ u;
+
+ for (u=0; u < 2; u++)
+ {
+ ssize_t
+ offset;
+
+ offset=v*(bounding_box.width+2)*
+ GetPixelChannels(component_image)+u*
+ GetPixelChannels(component_image);
+ pixels[2*v+u]=GetPixelIndex(component_image,p+offset);
+ if ((ssize_t) pixels[2*v+u] == i)
+ foreground++;
+ }
+ }
+ if (foreground == 1)
+ pattern[1]++;
+ else
+ if (foreground == 2)
+ {
+ if ((((ssize_t) pixels[0] == i) &&
+ ((ssize_t) pixels[3] == i)) ||
+ (((ssize_t) pixels[1] == i) &&
+ ((ssize_t) pixels[2] == i)))
+ pattern[0]++; /* diagonal */
+ else
+ pattern[2]++;
+ }
+ else
+ if (foreground == 3)
+ pattern[3]++;
p+=GetPixelChannels(component_image);
}
}
- census=0;
- id=0;
- for (j=0; j < (ssize_t) component_image->colors; j++)
- if (census < object[j].census)
- {
- census=object[j].census;
- id=(size_t) j;
- }
- object[id].area+=object[i].area;
- for (y=0; y < (ssize_t) bounding_box.height; y++)
+ component_view=DestroyCacheView(component_view);
+ object[i].metric[n]=ceil(MagickSQ1_2*pattern[1]+1.0*pattern[2]+
+ MagickSQ1_2*pattern[3]+MagickSQ2*pattern[0]-0.5);
+ }
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (((object[i].metric[n] < min_threshold) ||
+ (object[i].metric[n] >= max_threshold)) && (i != background_id))
+ object[i].merge=MagickTrue;
+ }
+ artifact=GetImageArtifact(image,"connected-components:circularity-threshold");
+ if (artifact != (const char *) NULL)
+ {
+ /*
+ Merge any object not within the min and max circularity threshold.
+ */
+ (void) sscanf(artifact,"%lf%*[ -]%lf",&min_threshold,&max_threshold);
+ metrics[++n]="circularity";
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(dynamic) shared(status) \
+ magick_number_threads(component_image,component_image,component_image->colors,1)
+#endif
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ {
+ CacheView
+ *component_view;
+
+ RectangleInfo
+ bounding_box;
+
+ size_t
+ pattern[4] = { 1, 0, 0, 0 };
+
+ ssize_t
+ y;
+
+ /*
+ Compute perimeter of each object.
+ */
+ if (status == MagickFalse)
+ continue;
+ component_view=AcquireAuthenticCacheView(component_image,exception);
+ bounding_box=object[i].bounding_box;
+ for (y=(-1); y < (ssize_t) bounding_box.height; y++)
{
- register Quantum
- *magick_restrict q;
+ register const Quantum
+ *magick_restrict p;
register ssize_t
x;
if (status == MagickFalse)
continue;
- q=GetCacheViewAuthenticPixels(component_view,bounding_box.x,
- bounding_box.y+y,bounding_box.width,1,exception);
- if (q == (Quantum *) NULL)
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x-1,
+ bounding_box.y+y,bounding_box.width+2,2,exception);
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
- continue;
+ break;
+ }
+ for (x=(-1); x < (ssize_t) bounding_box.width; x++)
+ {
+ Quantum
+ pixels[4];
+
+ register ssize_t
+ v;
+
+ size_t
+ foreground;
+
+ /*
+ An Algorithm for Calculating Objects’ Shape Features in Binary
+ Images, Lifeng He, Yuyan Chao.
+ */
+ foreground=0;
+ for (v=0; v < 2; v++)
+ {
+ register ssize_t
+ u;
+
+ for (u=0; u < 2; u++)
+ {
+ ssize_t
+ offset;
+
+ offset=v*(bounding_box.width+2)*
+ GetPixelChannels(component_image)+u*
+ GetPixelChannels(component_image);
+ pixels[2*v+u]=GetPixelIndex(component_image,p+offset);
+ if ((ssize_t) pixels[2*v+u] == i)
+ foreground++;
+ }
+ }
+ if (foreground == 1)
+ pattern[1]++;
+ else
+ if (foreground == 2)
+ {
+ if ((((ssize_t) pixels[0] == i) &&
+ ((ssize_t) pixels[3] == i)) ||
+ (((ssize_t) pixels[1] == i) &&
+ ((ssize_t) pixels[2] == i)))
+ pattern[0]++; /* diagonal */
+ else
+ pattern[2]++;
+ }
+ else
+ if (foreground == 3)
+ pattern[3]++;
+ p+=GetPixelChannels(component_image);
+ }
+ }
+ component_view=DestroyCacheView(component_view);
+ object[i].metric[n]=ceil(MagickSQ1_2*pattern[1]+1.0*pattern[2]+
+ MagickSQ1_2*pattern[3]+MagickSQ2*pattern[0]-0.5);
+ object[i].metric[n]=4.0*MagickPI*object[i].area/(object[i].metric[n]*
+ object[i].metric[n]);
+ }
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (((object[i].metric[n] < min_threshold) ||
+ (object[i].metric[n] >= max_threshold)) && (i != background_id))
+ object[i].merge=MagickTrue;
+ }
+ artifact=GetImageArtifact(image,"connected-components:diameter-threshold");
+ if (artifact != (const char *) NULL)
+ {
+ /*
+ Merge any object not within the min and max diameter threshold.
+ */
+ (void) sscanf(artifact,"%lf%*[ -]%lf",&min_threshold,&max_threshold);
+ metrics[++n]="diameter";
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ {
+ object[i].metric[n]=ceil(sqrt(4.0*object[i].area/MagickPI)-0.5);
+ if (((object[i].metric[n] < min_threshold) ||
+ (object[i].metric[n] >= max_threshold)) && (i != background_id))
+ object[i].merge=MagickTrue;
+ }
+ }
+ artifact=GetImageArtifact(image,"connected-components:major-axis-threshold");
+ if (artifact != (const char *) NULL)
+ {
+ /*
+ Merge any object not within the min and max ellipse major threshold.
+ */
+ (void) sscanf(artifact,"%lf%*[ -]%lf",&min_threshold,&max_threshold);
+ metrics[++n]="major-axis";
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(dynamic) shared(status) \
+ magick_number_threads(component_image,component_image,component_image->colors,1)
+#endif
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ {
+ CacheView
+ *component_view;
+
+ double
+ M00 = 0.0,
+ M01 = 0.0,
+ M02 = 0.0,
+ M10 = 0.0,
+ M11 = 0.0,
+ M20 = 0.0;
+
+ PointInfo
+ centroid = { 0.0, 0.0 };
+
+ RectangleInfo
+ bounding_box;
+
+ register const Quantum
+ *magick_restrict p;
+
+ register ssize_t
+ x;
+
+ ssize_t
+ y;
+
+ /*
+ Compute ellipse major axis of each object.
+ */
+ if (status == MagickFalse)
+ continue;
+ component_view=AcquireAuthenticCacheView(component_image,exception);
+ bounding_box=object[i].bounding_box;
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
}
for (x=0; x < (ssize_t) bounding_box.width; x++)
{
- if ((ssize_t) GetPixelIndex(component_image,q) == i)
- SetPixelIndex(component_image,(Quantum) id,q);
- q+=GetPixelChannels(component_image);
+ if ((ssize_t) GetPixelIndex(component_image,p) == i)
+ {
+ M00++;
+ M10+=x;
+ M01+=y;
+ }
+ p+=GetPixelChannels(component_image);
}
- if (SyncCacheViewAuthenticPixels(component_view,exception) == MagickFalse)
- status=MagickFalse;
}
+ centroid.x=M10*PerceptibleReciprocal(M00);
+ centroid.y=M01*PerceptibleReciprocal(M00);
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ for (x=0; x < (ssize_t) bounding_box.width; x++)
+ {
+ if ((ssize_t) GetPixelIndex(component_image,p) == i)
+ {
+ M11+=(x-centroid.x)*(y-centroid.y);
+ M20+=(x-centroid.x)*(x-centroid.x);
+ M02+=(y-centroid.y)*(y-centroid.y);
+ }
+ p+=GetPixelChannels(component_image);
+ }
+ }
+ component_view=DestroyCacheView(component_view);
+ object[i].metric[n]=sqrt((2.0*PerceptibleReciprocal(M00))*((M20+M02)+
+ sqrt(4.0*M11*M11+(M20-M02)*(M20-M02))));
}
- component_view=DestroyCacheView(component_view);
- (void) SyncImage(component_image,exception);
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (((object[i].metric[n] < min_threshold) ||
+ (object[i].metric[n] >= max_threshold)) && (i != background_id))
+ object[i].merge=MagickTrue;
}
+ artifact=GetImageArtifact(image,"connected-components:minor-axis-threshold");
+ if (artifact != (const char *) NULL)
+ {
+ /*
+ Merge any object not within the min and max ellipse minor threshold.
+ */
+ (void) sscanf(artifact,"%lf%*[ -]%lf",&min_threshold,&max_threshold);
+ metrics[++n]="minor-axis";
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(dynamic) shared(status) \
+ magick_number_threads(component_image,component_image,component_image->colors,1)
+#endif
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ {
+ CacheView
+ *component_view;
+
+ double
+ M00 = 0.0,
+ M01 = 0.0,
+ M02 = 0.0,
+ M10 = 0.0,
+ M11 = 0.0,
+ M20 = 0.0;
+
+ PointInfo
+ centroid = { 0.0, 0.0 };
+
+ RectangleInfo
+ bounding_box;
+
+ register const Quantum
+ *magick_restrict p;
+
+ register ssize_t
+ x;
+
+ ssize_t
+ y;
+
+ /*
+ Compute ellipse major axis of each object.
+ */
+ if (status == MagickFalse)
+ continue;
+ component_view=AcquireAuthenticCacheView(component_image,exception);
+ bounding_box=object[i].bounding_box;
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ for (x=0; x < (ssize_t) bounding_box.width; x++)
+ {
+ if ((ssize_t) GetPixelIndex(component_image,p) == i)
+ {
+ M00++;
+ M10+=x;
+ M01+=y;
+ }
+ p+=GetPixelChannels(component_image);
+ }
+ }
+ centroid.x=M10*PerceptibleReciprocal(M00);
+ centroid.y=M01*PerceptibleReciprocal(M00);
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ for (x=0; x < (ssize_t) bounding_box.width; x++)
+ {
+ if ((ssize_t) GetPixelIndex(component_image,p) == i)
+ {
+ M11+=(x-centroid.x)*(y-centroid.y);
+ M20+=(x-centroid.x)*(x-centroid.x);
+ M02+=(y-centroid.y)*(y-centroid.y);
+ }
+ p+=GetPixelChannels(component_image);
+ }
+ }
+ component_view=DestroyCacheView(component_view);
+ object[i].metric[n]=sqrt((2.0*PerceptibleReciprocal(M00))*((M20+M02)-
+ sqrt(4.0*M11*M11+(M20-M02)*(M20-M02))));
+ }
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (((object[i].metric[n] < min_threshold) ||
+ (object[i].metric[n] >= max_threshold)) && (i != background_id))
+ object[i].merge=MagickTrue;
+ }
+ artifact=GetImageArtifact(image,
+ "connected-components:eccentricity-threshold");
+ if (artifact != (const char *) NULL)
+ {
+ /*
+ Merge any object not within the min and max eccentricity threshold.
+ */
+ (void) sscanf(artifact,"%lf%*[ -]%lf",&min_threshold,&max_threshold);
+ metrics[++n]="eccentricy";
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(dynamic) shared(status) \
+ magick_number_threads(component_image,component_image,component_image->colors,1)
+#endif
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ {
+ CacheView
+ *component_view;
+
+ double
+ M00 = 0.0,
+ M01 = 0.0,
+ M02 = 0.0,
+ M10 = 0.0,
+ M11 = 0.0,
+ M20 = 0.0;
+
+ PointInfo
+ centroid = { 0.0, 0.0 },
+ ellipse_axis = { 0.0, 0.0 };
+
+ RectangleInfo
+ bounding_box;
+
+ register const Quantum
+ *magick_restrict p;
+
+ register ssize_t
+ x;
+
+ ssize_t
+ y;
+
+ /*
+ Compute eccentricity of each object.
+ */
+ if (status == MagickFalse)
+ continue;
+ component_view=AcquireAuthenticCacheView(component_image,exception);
+ bounding_box=object[i].bounding_box;
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ for (x=0; x < (ssize_t) bounding_box.width; x++)
+ {
+ if ((ssize_t) GetPixelIndex(component_image,p) == i)
+ {
+ M00++;
+ M10+=x;
+ M01+=y;
+ }
+ p+=GetPixelChannels(component_image);
+ }
+ }
+ centroid.x=M10*PerceptibleReciprocal(M00);
+ centroid.y=M01*PerceptibleReciprocal(M00);
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ for (x=0; x < (ssize_t) bounding_box.width; x++)
+ {
+ if ((ssize_t) GetPixelIndex(component_image,p) == i)
+ {
+ M11+=(x-centroid.x)*(y-centroid.y);
+ M20+=(x-centroid.x)*(x-centroid.x);
+ M02+=(y-centroid.y)*(y-centroid.y);
+ }
+ p+=GetPixelChannels(component_image);
+ }
+ }
+ component_view=DestroyCacheView(component_view);
+ ellipse_axis.x=sqrt((2.0*PerceptibleReciprocal(M00))*((M20+M02)+
+ sqrt(4.0*M11*M11+(M20-M02)*(M20-M02))));
+ ellipse_axis.y=sqrt((2.0*PerceptibleReciprocal(M00))*((M20+M02)-
+ sqrt(4.0*M11*M11+(M20-M02)*(M20-M02))));
+ object[i].metric[n]=sqrt(1.0-(ellipse_axis.y*ellipse_axis.y*
+ PerceptibleReciprocal(ellipse_axis.x*ellipse_axis.x)));
+ }
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (((object[i].metric[n] < min_threshold) ||
+ (object[i].metric[n] >= max_threshold)) && (i != background_id))
+ object[i].merge=MagickTrue;
+ }
+ artifact=GetImageArtifact(image,"connected-components:angle-threshold");
+ if (artifact != (const char *) NULL)
+ {
+ /*
+ Merge any object not within the min and max ellipse angle threshold.
+ */
+ (void) sscanf(artifact,"%lf%*[ -]%lf",&min_threshold,&max_threshold);
+ metrics[++n]="angle";
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(dynamic) shared(status) \
+ magick_number_threads(component_image,component_image,component_image->colors,1)
+#endif
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ {
+ CacheView
+ *component_view;
+
+ double
+ M00 = 0.0,
+ M01 = 0.0,
+ M02 = 0.0,
+ M10 = 0.0,
+ M11 = 0.0,
+ M20 = 0.0;
+
+ PointInfo
+ centroid = { 0.0, 0.0 };
+
+ RectangleInfo
+ bounding_box;
+
+ register const Quantum
+ *magick_restrict p;
+
+ register ssize_t
+ x;
+
+ ssize_t
+ y;
+
+ /*
+ Compute ellipse angle of each object.
+ */
+ if (status == MagickFalse)
+ continue;
+ component_view=AcquireAuthenticCacheView(component_image,exception);
+ bounding_box=object[i].bounding_box;
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ for (x=0; x < (ssize_t) bounding_box.width; x++)
+ {
+ if ((ssize_t) GetPixelIndex(component_image,p) == i)
+ {
+ M00++;
+ M10+=x;
+ M01+=y;
+ }
+ p+=GetPixelChannels(component_image);
+ }
+ }
+ centroid.x=M10*PerceptibleReciprocal(M00);
+ centroid.y=M01*PerceptibleReciprocal(M00);
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ for (x=0; x < (ssize_t) bounding_box.width; x++)
+ {
+ if ((ssize_t) GetPixelIndex(component_image,p) == i)
+ {
+ M11+=(x-centroid.x)*(y-centroid.y);
+ M20+=(x-centroid.x)*(x-centroid.x);
+ M02+=(y-centroid.y)*(y-centroid.y);
+ }
+ p+=GetPixelChannels(component_image);
+ }
+ }
+ component_view=DestroyCacheView(component_view);
+ object[i].metric[n]=RadiansToDegrees(1.0/2.0*atan(2.0*M11*
+ PerceptibleReciprocal(M20-M02)));
+ if (fabs(M11) < 0.0)
+ {
+ if ((fabs(M20-M02) >= 0.0) && ((M20-M02) < 0.0))
+ object[i].metric[n]+=90.0;
+ }
+ else
+ if (M11 < 0.0)
+ {
+ if (fabs(M20-M02) >= 0.0)
+ {
+ if ((M20-M02) < 0.0)
+ object[i].metric[n]+=90.0;
+ else
+ object[i].metric[n]+=180.0;
+ }
+ }
+ else
+ if ((fabs(M20-M02) >= 0.0) && ((M20-M02) < 0.0))
+ object[i].metric[n]+=90.0;
+ }
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (((object[i].metric[n] < min_threshold) ||
+ (object[i].metric[n] >= max_threshold)) && (i != background_id))
+ object[i].merge=MagickTrue;
+ }
+ /*
+ Merge any object not within the min and max area threshold.
+ */
+ component_view=AcquireAuthenticCacheView(component_image,exception);
+ object_view=AcquireVirtualCacheView(component_image,exception);
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ {
+ register ssize_t
+ j;
+
+ size_t
+ id;
+
+ if (status == MagickFalse)
+ continue;
+ if ((object[i].merge == MagickFalse) || (i == background_id))
+ continue; /* keep object */
+ /*
+ Merge this object.
+ */
+ for (j=0; j < (ssize_t) component_image->colors; j++)
+ object[j].census=0;
+ bounding_box=object[i].bounding_box;
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ register const Quantum
+ *magick_restrict p;
+
+ register ssize_t
+ x;
+
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ continue;
+ }
+ for (x=0; x < (ssize_t) bounding_box.width; x++)
+ {
+ register ssize_t
+ n;
+
+ if (status == MagickFalse)
+ continue;
+ j=(ssize_t) GetPixelIndex(component_image,p);
+ if (j == i)
+ for (n=0; n < (ssize_t) (connectivity > 4 ? 4 : 2); n++)
+ {
+ register const Quantum
+ *p;
+
+ /*
+ Compute area of adjacent objects.
+ */
+ if (status == MagickFalse)
+ continue;
+ dx=connectivity > 4 ? connect8[n][1] : connect4[n][1];
+ dy=connectivity > 4 ? connect8[n][0] : connect4[n][0];
+ p=GetCacheViewVirtualPixels(object_view,bounding_box.x+x+dx,
+ bounding_box.y+y+dy,1,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ j=(ssize_t) GetPixelIndex(component_image,p);
+ if (j != i)
+ object[j].census++;
+ }
+ p+=GetPixelChannels(component_image);
+ }
+ }
+ /*
+ Merge with object of greatest adjacent area.
+ */
+ id=0;
+ for (j=1; j < (ssize_t) component_image->colors; j++)
+ if (object[j].census > object[id].census)
+ id=(size_t) j;
+ object[id].area+=object[i].area;
+ object[i].area=0.0;
+ for (y=0; y < (ssize_t) bounding_box.height; y++)
+ {
+ register Quantum
+ *magick_restrict q;
+
+ register ssize_t
+ x;
+
+ if (status == MagickFalse)
+ continue;
+ q=GetCacheViewAuthenticPixels(component_view,bounding_box.x,
+ bounding_box.y+y,bounding_box.width,1,exception);
+ if (q == (Quantum *) NULL)
+ {
+ status=MagickFalse;
+ continue;
+ }
+ for (x=0; x < (ssize_t) bounding_box.width; x++)
+ {
+ if ((ssize_t) GetPixelIndex(component_image,q) == i)
+ SetPixelIndex(component_image,(Quantum) id,q);
+ q+=GetPixelChannels(component_image);
+ }
+ if (SyncCacheViewAuthenticPixels(component_view,exception) == MagickFalse)
+ status=MagickFalse;
+ }
+ }
+ object_view=DestroyCacheView(object_view);
+ component_view=DestroyCacheView(component_view);
artifact=GetImageArtifact(image,"connected-components:mean-color");
if (IsStringTrue(artifact) != MagickFalse)
{
@@ -552,82 +1427,13 @@
for (i=0; i < (ssize_t) component_image->colors; i++)
component_image->colormap[i]=object[i].color;
}
- artifact=GetImageArtifact(image,"connected-components:keep");
- if (artifact != (const char *) NULL)
- {
- /*
- Keep these object (make others transparent).
- */
- for (i=0; i < (ssize_t) component_image->colors; i++)
- object[i].census=0;
- for (c=(char *) artifact; *c != '\0';)
- {
- while ((isspace((int) ((unsigned char) *c)) != 0) || (*c == ','))
- c++;
- first=(ssize_t) strtol(c,&c,10);
- if (first < 0)
- first+=(ssize_t) component_image->colors;
- last=first;
- while (isspace((int) ((unsigned char) *c)) != 0)
- c++;
- if (*c == '-')
- {
- last=(ssize_t) strtol(c+1,&c,10);
- if (last < 0)
- last+=(ssize_t) component_image->colors;
- }
- step=(ssize_t) (first > last ? -1 : 1);
- for ( ; first != (last+step); first+=step)
- object[first].census++;
- }
- for (i=0; i < (ssize_t) component_image->colors; i++)
- {
- if (object[i].census != 0)
- continue;
- component_image->alpha_trait=BlendPixelTrait;
- component_image->colormap[i].alpha_trait=BlendPixelTrait;
- component_image->colormap[i].alpha=(MagickRealType) TransparentAlpha;
- }
- }
- artifact=GetImageArtifact(image,"connected-components:remove");
- if (artifact != (const char *) NULL)
- {
- /*
- Remove these object (make them transparent).
- */
- for (c=(char *) artifact; *c != '\0';)
- {
- while ((isspace((int) ((unsigned char) *c)) != 0) || (*c == ','))
- c++;
- first=(ssize_t) strtol(c,&c,10);
- if (first < 0)
- first+=(ssize_t) component_image->colors;
- last=first;
- while (isspace((int) ((unsigned char) *c)) != 0)
- c++;
- if (*c == '-')
- {
- last=(ssize_t) strtol(c+1,&c,10);
- if (last < 0)
- last+=(ssize_t) component_image->colors;
- }
- step=(ssize_t) (first > last ? -1 : 1);
- for ( ; first != (last+step); first+=step)
- {
- component_image->alpha_trait=BlendPixelTrait;
- component_image->colormap[first].alpha_trait=BlendPixelTrait;
- component_image->colormap[first].alpha=(MagickRealType)
- TransparentAlpha;
- }
- }
- }
(void) SyncImage(component_image,exception);
artifact=GetImageArtifact(image,"connected-components:verbose");
if ((IsStringTrue(artifact) != MagickFalse) ||
(objects != (CCObjectInfo **) NULL))
{
/*
- Report statistics on unique object.
+ Report statistics on each unique object.
*/
for (i=0; i < (ssize_t) component_image->colors; i++)
{
@@ -637,6 +1443,7 @@
object[i].bounding_box.y=(ssize_t) component_image->rows;
object[i].centroid.x=0;
object[i].centroid.y=0;
+ object[i].census=object[i].area == 0.0 ? 0.0 : 1.0;
object[i].area=0;
}
component_view=AcquireVirtualCacheView(component_image,exception);
@@ -662,7 +1469,7 @@
size_t
id;
- id=GetPixelIndex(component_image,p);
+ id=(size_t) GetPixelIndex(component_image,p);
if (x < object[id].bounding_box.x)
object[id].bounding_box.x=x;
if (x > (ssize_t) object[id].bounding_box.width)
@@ -689,26 +1496,39 @@
CCObjectInfoCompare);
if (objects == (CCObjectInfo **) NULL)
{
- (void) fprintf(stdout,
- "Objects (id: bounding-box centroid area mean-color):\n");
- for (i=0; i < (ssize_t) component_image->colors; i++)
- {
- char
- mean_color[MagickPathExtent];
+ register ssize_t
+ j;
- if (status == MagickFalse)
- break;
- if (object[i].area <= area_threshold)
- continue;
- GetColorTuple(&object[i].color,MagickFalse,mean_color);
- (void) fprintf(stdout,
- " %.20g: %.20gx%.20g%+.20g%+.20g %.1f,%.1f %.20g %s\n",(double)
- object[i].id,(double) object[i].bounding_box.width,(double)
- object[i].bounding_box.height,(double) object[i].bounding_box.x,
- (double) object[i].bounding_box.y,object[i].centroid.x,
- object[i].centroid.y,(double) object[i].area,mean_color);
+ artifact=GetImageArtifact(image,
+ "connected-components:exclude-header");
+ if (IsStringTrue(artifact) == MagickFalse)
+ {
+ (void) fprintf(stdout,
+ "Objects (id: bounding-box centroid area mean-color");
+ for (j=0; j <= n; j++)
+ (void) fprintf(stdout," %s",metrics[j]);
+ (void) fprintf(stdout,"):\n");
+ }
+ for (i=0; i < (ssize_t) component_image->colors; i++)
+ if (object[i].census > 0.0)
+ {
+ char
+ mean_color[MagickPathExtent];
+
+ GetColorTuple(&object[i].color,MagickFalse,mean_color);
+ (void) fprintf(stdout,
+ " %.20g: %.20gx%.20g%+.20g%+.20g %.1f,%.1f %.*g %s",
+ (double) object[i].id,(double) object[i].bounding_box.width,
+ (double) object[i].bounding_box.height,(double)
+ object[i].bounding_box.x,(double) object[i].bounding_box.y,
+ object[i].centroid.x,object[i].centroid.y,
+ GetMagickPrecision(),(double) object[i].area,mean_color);
+ for (j=0; j <= n; j++)
+ (void) fprintf(stdout," %.*g",GetMagickPrecision(),
+ object[i].metric[j]);
+ (void) fprintf(stdout,"\n");
+ }
}
- }
}
if (objects == (CCObjectInfo **) NULL)
object=(CCObjectInfo *) RelinquishMagickMemory(object);
diff --git a/MagickCore/vision.h b/MagickCore/vision.h
index 2b1faff..cf660ec 100644
--- a/MagickCore/vision.h
+++ b/MagickCore/vision.h
@@ -1,12 +1,12 @@
/*
Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization
dedicated to making software imaging solutions freely available.
-
+
You may not use this file except in compliance with the License. You may
obtain a copy of the License at
-
+
https://imagemagick.org/script/license.php
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,6 +22,8 @@
extern "C" {
#endif
+#define CCMaxMetrics 16
+
typedef struct _CCObjectInfo
{
ssize_t
@@ -39,6 +41,12 @@
double
area,
census;
+
+ MagickBooleanType
+ merge;
+
+ double
+ metric[CCMaxMetrics];
} CCObjectInfo;
extern MagickExport Image
diff --git a/MagickCore/visual-effects.c b/MagickCore/visual-effects.c
index 223110b..71f8d11 100644
--- a/MagickCore/visual-effects.c
+++ b/MagickCore/visual-effects.c
@@ -1398,7 +1398,7 @@
double
plasma;
- MagickBooleanType
+ MagickStatusType
status;
register const Quantum
@@ -1452,7 +1452,7 @@
local_info.y1=(double) y_mid;
status&=PlasmaImageProxy(image,image_view,u_view,v_view,random_info,
&local_info,attenuate,depth,exception);
- return(status);
+ return(status == 0 ? MagickFalse : MagickTrue);
}
x_mid=(ssize_t) ceil((segment->x1+segment->x2)/2-0.5);
y_mid=(ssize_t) ceil((segment->y1+segment->y2)/2-0.5);
@@ -1596,7 +1596,7 @@
}
if ((fabs(segment->x2-segment->x1) < 3.0) &&
(fabs(segment->y2-segment->y1) < 3.0))
- return(status);
+ return(status == 0 ? MagickFalse : MagickTrue);
return(MagickFalse);
}
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index cc186d6..88c83dc 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -3032,10 +3032,6 @@
Colormap
colormap;
- extern const char
- BorderColor[],
- ForegroundColor[];
-
register ssize_t
i;
@@ -3456,10 +3452,6 @@
*directory,
*resource_value;
- extern const char
- BorderColor[],
- ForegroundColor[];
-
/*
Initialize resource info fields.
*/
diff --git a/MagickWand/MagickWand-config b/MagickWand/MagickWand-config
index bd42e88..a38ebfd 100755
--- a/MagickWand/MagickWand-config
+++ b/MagickWand/MagickWand-config
@@ -35,7 +35,7 @@
echo $exec_prefix
;;
--version)
- echo '7.0.9 Q16 HDRI'
+ echo '7.0.10 Q16 HDRI'
;;
--cflags)
/usr/bin/pkg-config --cflags MagickWand
diff --git a/MagickWand/convert.c b/MagickWand/convert.c
index 267d917..f124031 100644
--- a/MagickWand/convert.c
+++ b/MagickWand/convert.c
@@ -1071,6 +1071,15 @@
argv[i]);
break;
}
+ if (LocaleCompare("color-threshold",option+1) == 0)
+ {
+ if (*option == '+')
+ break;
+ i++;
+ if (i == (ssize_t) argc)
+ ThrowConvertException(OptionError,"MissingArgument",option);
+ break;
+ }
if (LocaleCompare("combine",option+1) == 0)
break;
if (LocaleCompare("comment",option+1) == 0)
diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 5eac17a..6f48466 100644
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -1785,6 +1785,52 @@
% %
% %
% %
+% M a g i c k C o l o r T h r e s h o l d I m a g e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% MagickColorThresholdImage() forces all pixels in the color range to white
+% otherwise black.
+%
+% The format of the MagickWhiteThresholdImage method is:
+%
+% MagickBooleanType MagickWhiteThresholdImage(MagickWand *wand,
+% const PixelWand *start_color,const PixelWand *stop_color)
+%
+% A description of each parameter follows:
+%
+% o wand: the magick wand.
+%
+% o start-color: the start color pixel wand.
+%
+% o stop-color: the stop color pixel wand.
+%
+*/
+WandExport MagickBooleanType MagickColorThresholdImage(MagickWand *wand,
+ const PixelWand *start_color,const PixelWand *stop_color)
+{
+ PixelInfo
+ start,
+ stop;
+
+ assert(wand != (MagickWand *) NULL);
+ assert(wand->signature == MagickWandSignature);
+ if (wand->debug != MagickFalse)
+ (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
+ if (wand->images == (Image *) NULL)
+ ThrowWandException(WandError,"ContainsNoImages",wand->name);
+ PixelGetMagickColor(start_color,&start);
+ PixelGetMagickColor(stop_color,&stop);
+ return(ColorThresholdImage(wand->images,&start,&stop,wand->exception));
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
% M a g i c k C o m b i n e I m a g e s %
% %
% %
diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index 7b2024f..9d31ef5 100644
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -113,6 +113,7 @@
MagickColorDecisionListImage(MagickWand *,const char *),
MagickColorizeImage(MagickWand *,const PixelWand *,const PixelWand *),
MagickColorMatrixImage(MagickWand *,const KernelInfo *),
+ MagickColorThresholdImage(MagickWand *,const PixelWand *,const PixelWand *),
MagickCommentImage(MagickWand *,const char *),
MagickCompositeImage(MagickWand *,const MagickWand *,const CompositeOperator,
const MagickBooleanType,const ssize_t,const ssize_t),
diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index dca9156..0cb7fbb 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -49,6 +49,7 @@
#include "MagickWand/magick-wand-private.h"
#include "MagickWand/mogrify-private.h"
#include "MagickCore/blob-private.h"
+#include "MagickCore/color-private.h"
#include "MagickCore/composite-private.h"
#include "MagickCore/image-private.h"
#include "MagickCore/monitor-private.h"
@@ -1193,6 +1194,23 @@
(void) TransformImageColorspace(*image,colorspace,exception);
break;
}
+ if (LocaleCompare("color-threshold",option+1) == 0)
+ {
+ PixelInfo
+ start,
+ stop;
+
+ /*
+ Color threshold image.
+ */
+ (void) SyncImageSettings(mogrify_info,*image,exception);
+ if (*option == '+')
+ (void) GetColorRange("white-black",&start,&stop,exception);
+ else
+ (void) GetColorRange(argv[i+1],&start,&stop,exception);
+ (void) ColorThresholdImage(*image,&start,&stop,exception);
+ break;
+ }
if (LocaleCompare("compose",option+1) == 0)
{
(void) SyncImageSettings(mogrify_info,*image,exception);
@@ -3502,6 +3520,8 @@
" -colorize value colorize the image with the fill color\n"
" -color-matrix matrix apply color correction to the image\n"
" -colors value preferred number of colors in the image\n"
+ " -color-threshold start_color-stop_color\n"
+ " force all pixels in the color range to white otherwise black\n"
" -connected-components connectivity\n"
" connected-components uniquely labeled\n"
" -contrast enhance or reduce the image contrast\n"
@@ -4419,6 +4439,15 @@
argv[i]);
break;
}
+ if (LocaleCompare("color-threshold",option+1) == 0)
+ {
+ if (*option == '+')
+ break;
+ i++;
+ if (i == (ssize_t) argc)
+ ThrowMogrifyException(OptionError,"MissingArgument",option);
+ break;
+ }
if (LocaleCompare("combine",option+1) == 0)
{
ssize_t
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 6125de6..b5ce1ba 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -55,6 +55,7 @@
#include "MagickWand/wand.h"
#include "MagickWand/wandcli.h"
#include "MagickWand/wandcli-private.h"
+#include "MagickCore/color-private.h"
#include "MagickCore/composite-private.h"
#include "MagickCore/image-private.h"
#include "MagickCore/monitor-private.h"
@@ -2065,6 +2066,22 @@
_exception);
break;
}
+ if (LocaleCompare("color-threshold",option+1) == 0)
+ {
+ PixelInfo
+ start,
+ stop;
+
+ /*
+ Color threshold image.
+ */
+ if (*option == '+')
+ (void) GetColorRange("white-black",&start,&stop,_exception);
+ else
+ (void) GetColorRange(arg1,&start,&stop,_exception);
+ (void) ColorThresholdImage(_image,&start,&stop,_exception);
+ break;
+ }
if (LocaleCompare("connected-components",option+1) == 0)
{
if (IsGeometry(arg1) == MagickFalse)
@@ -2094,7 +2111,8 @@
black_point=geometry_info.rho;
white_point=(flags & SigmaValue) != 0 ? geometry_info.sigma :
black_point;
- if ((flags & PercentValue) != 0) {
+ if ((flags & PercentValue) != 0)
+ {
black_point*=(double) _image->columns*_image->rows/100.0;
white_point*=(double) _image->columns*_image->rows/100.0;
}
diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c
index ee23eac..b113d52 100644
--- a/MagickWand/wand-view.c
+++ b/MagickWand/wand-view.c
@@ -665,7 +665,7 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% IsWandView() returns MagickTrue if the the parameter is verified as a wand
+% IsWandView() returns MagickTrue if the parameter is verified as a wand
% view object.
%
% The format of the IsWandView method is:
diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
index 3187f66..7a0aa98 100644
--- a/PerlMagick/Magick.pm
+++ b/PerlMagick/Magick.pm
@@ -44,7 +44,7 @@
ConfigureError FatalErrorException
);
-$VERSION = '7.0.8';
+$VERSION = '7.0.10';
sub AUTOLOAD {
# This AUTOLOAD is used to 'autoload' constants from the constant()
diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 7217706..793cf21 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -440,7 +440,7 @@
{"sigma", RealReference}, {"x", IntegerReference},
{"y", IntegerReference} } },
{ "Identify", { {"file", FileReference}, {"features", StringReference},
- {"unique", MagickBooleanOptions} } },
+ {"moments", MagickBooleanOptions}, {"unique", MagickBooleanOptions} } },
{ "SepiaTone", { {"threshold", RealReference} } },
{ "SigmoidalContrast", { {"geometry", StringReference},
{"contrast", RealReference}, {"mid-point", RealReference},
@@ -577,6 +577,8 @@
{"clip-limit", RealReference} } },
{ "Kmeans", { {"geometry", StringReference}, {"colors", IntegerReference},
{"iterations", IntegerReference}, {"tolerance", RealReference} } },
+ { "ColorThreshold", { {"start-color", StringReference},
+ {"stop-color", StringReference}, {"channel", MagickChannelOptions} } },
};
static SplayTreeInfo
@@ -1922,6 +1924,11 @@
}
break;
}
+ if (LocaleCompare(attribute,"precision") == 0)
+ {
+ (void) SetMagickPrecision(SvIV(sval));
+ break;
+ }
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
@@ -5557,6 +5564,12 @@
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
}
+ if (LocaleCompare(attribute,"precision") == 0)
+ {
+ s=newSViv((ssize_t) GetMagickPrecision());
+ PUSHs(s ? sv_2mortal(s) : &sv_undef);
+ continue;
+ }
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
attribute);
break;
@@ -7651,6 +7664,8 @@
CLAHEImage = 298
Kmeans = 299
KMeansImage = 300
+ ColorThreshold = 301
+ ColorThresholdImage= 302
MogrifyRegion = 666
PPCODE:
{
@@ -10102,9 +10117,6 @@
{
if (attribute_flag[0] == 0)
argument_list[0].file_reference=(FILE *) NULL;
- if (attribute_flag[1] != 0)
- (void) SetImageArtifact(image,"identify:features",
- argument_list[1].string_reference);
(void) IdentifyImage(image,argument_list[0].file_reference,
MagickTrue,exception);
break;
@@ -10116,7 +10128,7 @@
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
channel_mask=SetImageChannelMask(image,channel);
- BlackThresholdImage(image,argument_list[0].string_reference,
+ (void) BlackThresholdImage(image,argument_list[0].string_reference,
exception);
(void) SetImageChannelMask(image,channel_mask);
break;
@@ -10259,6 +10271,9 @@
argument_list[1].string_reference);
if ((attribute_flag[2] != 0) &&
(argument_list[2].integer_reference != 0))
+ (void) SetImageArtifact(image,"identify:moments","true");
+ if ((attribute_flag[3] != 0) &&
+ (argument_list[3].integer_reference != 0))
(void) SetImageArtifact(image,"identify:unique","true");
(void) IdentifyImage(image,argument_list[0].file_reference,
MagickTrue,exception);
@@ -11526,6 +11541,27 @@
geometry_info.xi,exception);
break;
}
+ case 151: /* ColorThreshold */
+ {
+ PixelInfo
+ start_color,
+ stop_color;
+
+ (void) QueryColorCompliance("black",AllCompliance,&start_color,
+ exception);
+ (void) QueryColorCompliance("white",AllCompliance,&stop_color,
+ exception);
+ if (attribute_flag[0] != 0)
+ (void) QueryColorCompliance(argument_list[0].string_reference,
+ AllCompliance,&start_color,exception);
+ if (attribute_flag[1] != 0)
+ (void) QueryColorCompliance(argument_list[1].string_reference,
+ AllCompliance,&stop_color,exception);
+ channel_mask=SetImageChannelMask(image,channel);
+ (void) ColorThresholdImage(image,&start_color,&stop_color,exception);
+ (void) SetImageChannelMask(image,channel_mask);
+ break;
+ }
}
if (next != (Image *) NULL)
(void) CatchImageException(next);
diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm
index ed7cbb7..c48dd29 100644
--- a/PerlMagick/quantum/quantum.pm
+++ b/PerlMagick/quantum/quantum.pm
@@ -43,7 +43,7 @@
ConfigureError FatalErrorException
);
-$VERSION = '7.0.9';
+$VERSION = '7.0.10';
sub AUTOLOAD {
# This AUTOLOAD is used to 'autoload' constants from the constant()
diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in
index 3588d0f..1430a18 100644
--- a/PerlMagick/quantum/quantum.xs.in
+++ b/PerlMagick/quantum/quantum.xs.in
@@ -440,7 +440,7 @@
{"sigma", RealReference}, {"x", IntegerReference},
{"y", IntegerReference} } },
{ "Identify", { {"file", FileReference}, {"features", StringReference},
- {"unique", MagickBooleanOptions} } },
+ {"moments", MagickBooleanOptions}, {"unique", MagickBooleanOptions} } },
{ "SepiaTone", { {"threshold", RealReference} } },
{ "SigmoidalContrast", { {"geometry", StringReference},
{"contrast", RealReference}, {"mid-point", RealReference},
@@ -577,6 +577,8 @@
{"clip-limit", RealReference} } },
{ "Kmeans", { {"geometry", StringReference}, {"colors", IntegerReference},
{"iterations", IntegerReference}, {"tolerance", RealReference} } },
+ { "ColorThreshold", { {"start-color", StringReference},
+ {"stop-color", StringReference}, {"channel", MagickChannelOptions} } },
};
static SplayTreeInfo
@@ -1919,6 +1921,11 @@
}
break;
}
+ if (LocaleCompare(attribute,"precision") == 0)
+ {
+ (void) SetMagickPrecision(SvIV(sval));
+ break;
+ }
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
@@ -5556,6 +5563,12 @@
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
}
+ if (LocaleCompare(attribute,"precision") == 0)
+ {
+ s=newSViv((ssize_t) GetMagickPrecision());
+ PUSHs(s ? sv_2mortal(s) : &sv_undef);
+ continue;
+ }
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
attribute);
break;
@@ -7650,6 +7663,8 @@
CLAHEImage = 298
Kmeans = 299
KMeansImage = 300
+ ColorThreshold = 301
+ ColorThresholdImage= 302
MogrifyRegion = 666
PPCODE:
{
@@ -10112,9 +10127,6 @@
{
if (attribute_flag[0] == 0)
argument_list[0].file_reference=(FILE *) NULL;
- if (attribute_flag[1] != 0)
- (void) SetImageArtifact(image,"identify:features",
- argument_list[1].string_reference);
(void) IdentifyImage(image,argument_list[0].file_reference,
MagickTrue,exception);
break;
@@ -10126,7 +10138,7 @@
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
channel_mask=SetImageChannelMask(image,channel);
- BlackThresholdImage(image,argument_list[0].string_reference,
+ (void) BlackThresholdImage(image,argument_list[0].string_reference,
exception);
(void) SetImageChannelMask(image,channel_mask);
break;
@@ -10267,6 +10279,9 @@
argument_list[1].string_reference);
if ((attribute_flag[2] != 0) &&
(argument_list[2].integer_reference != 0))
+ (void) SetImageArtifact(image,"identify:moments","true");
+ if ((attribute_flag[3] != 0) &&
+ (argument_list[3].integer_reference != 0))
(void) SetImageArtifact(image,"identify:unique","true");
(void) IdentifyImage(image,argument_list[0].file_reference,
MagickTrue,exception);
@@ -11532,6 +11547,27 @@
geometry_info.xi,exception);
break;
}
+ case 151: /* ColorThreshold */
+ {
+ PixelInfo
+ start_color,
+ stop_color;
+
+ (void) QueryColorCompliance("black",AllCompliance,&start_color,
+ exception);
+ (void) QueryColorCompliance("white",AllCompliance,&stop_color,
+ exception);
+ if (attribute_flag[0] != 0)
+ (void) QueryColorCompliance(argument_list[0].string_reference,
+ AllCompliance,&start_color,exception);
+ if (attribute_flag[1] != 0)
+ (void) QueryColorCompliance(argument_list[1].string_reference,
+ AllCompliance,&stop_color,exception);
+ channel_mask=SetImageChannelMask(image,channel);
+ (void) ColorThresholdImage(image,&start_color,&stop_color,exception);
+ (void) SetImageChannelMask(image,channel_mask);
+ break;
+ }
}
if (next != (Image *) NULL)
(void) CatchImageException(next);
diff --git a/PerlMagick/t/blob.t b/PerlMagick/t/blob.t
index 5e5ec13..58a078a 100644
--- a/PerlMagick/t/blob.t
+++ b/PerlMagick/t/blob.t
@@ -31,7 +31,7 @@
$image->BlobToImage( @blob );
if ($image->Get('signature') ne
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e')
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52')
{ print "not ok $test\n"; }
else
{ print "ok $test\n"; }
diff --git a/PerlMagick/t/bzlib/read.t b/PerlMagick/t/bzlib/read.t
index e722898..0a0f556 100644
--- a/PerlMagick/t/bzlib/read.t
+++ b/PerlMagick/t/bzlib/read.t
@@ -18,7 +18,7 @@
# Test reading BZip compressed MIFF
#
testRead( 'input.miff',
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e' );
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52' );
#
# 2) Test reading BZip stream-compressed MIFF (.bz2 extension)
@@ -26,5 +26,5 @@
print("Reading BZip stream-compressed MIFF (.bz2 extension) ...\n");
++$test;
testRead( 'input.miff.bz2',
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e' );
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52' );
diff --git a/PerlMagick/t/bzlib/write.t b/PerlMagick/t/bzlib/write.t
index 59606b6..60aa578 100644
--- a/PerlMagick/t/bzlib/write.t
+++ b/PerlMagick/t/bzlib/write.t
@@ -21,7 +21,7 @@
testReadWrite( 'input.miff',
'output.miff',
q/compression=>'BZip'/,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e' );
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52' );
$test = 0; # Quench PERL compliaint
diff --git a/PerlMagick/t/getattribute.t b/PerlMagick/t/getattribute.t
index 358565e..6e61d97 100644
--- a/PerlMagick/t/getattribute.t
+++ b/PerlMagick/t/getattribute.t
@@ -77,7 +77,7 @@
++$test;
testGetAttribute('input.miff','signature',
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
++$test;
testGetAttribute('input.miff','texture',undef);
diff --git a/PerlMagick/t/montage.t b/PerlMagick/t/montage.t
index 6e3f86e..62aed2c 100644
--- a/PerlMagick/t/montage.t
+++ b/PerlMagick/t/montage.t
@@ -29,7 +29,7 @@
#
testMontage( q//,
q/background=>'#696e7e'/,
- 'ad77fef2815f06678757ba79d14f752cfb639f078b32b54122714e25ede2bc5e');
+ '6f8304c88f6dae4ade2a09fb7b4562cf2c09978cb30b025afaf9bd5805a4e75e');
#
# 2) Test Center gravity
@@ -38,7 +38,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', geometry=>'90x80+5+5>', gravity=>'Center'/,
- '030de7b70860f11a66d7081df97a96d311641fc69f48aafdbde27da53ac61277');
+ '4fa94e68dc41fa0fda3469e6b8ebc4c07be6ef656405a1ea8f9ed8b00aa07552');
#
# 3) Test NorthWest gravity
@@ -47,7 +47,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', geometry=>'90x80+5+5>', gravity=>'NorthWest'/,
- 'd139d942510d9ca5762799acad940b7539e56f9610ab57a26e22c18fe35a01b5');
+ '24adcfa00f2c69d10fda815c9572bd7f621adb93a58a9c3c85657060929da4d0');
#
# 4) Test North gravity
@@ -56,7 +56,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', geometry=>'90x80+5+5>', gravity=>'North'/,
- '5f02d04d24bfbeb2dc82a056cf595ec8ef1601a0e68aaae541c116cc7c627916');
+ '70bb1be5bad21d5dd545ffe62eeb90052a037fcc1613aaa3f3b3c4d4c6138e8a');
#
# 5) Test NorthEast gravity
@@ -65,7 +65,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', geometry=>'90x80+5+5>', gravity=>'NorthEast'/,
- 'd1e9ee7a612ef19b360c923795a0f0c7bc819983475adf6787e39ee8167f75f1');
+ '116668aedcc616527dabac2c07ea597d5cc26e3aaf33db14d8ce796892bc1f1c');
#
# 6) Test West gravity
@@ -74,7 +74,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', geometry=>'90x80+5+5>', gravity=>'West'/,
- '084e12bf9e3325140d8df2fb52ac481aff408bb3ed1940d379c14d1e07b58599');
+ 'abb3104224d07ba50235e750c8009b231a0e6aaa596fb2ec3703b2061a59abc3');
#
# 7) Test East gravity
@@ -83,7 +83,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', geometry=>'90x80+5+5>', gravity=>'East'/,
- 'ff8cee733142654135e8baebaf5e036eaf5de1d419476c0d0a8bee9c88370066');
+ '8723423ac9151136571b6e8f053fc60b09a8ec18d94e4fbc29c492de032c9a7d');
#
# 8) Test SouthWest gravity
@@ -92,7 +92,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', geometry=>'90x80+5+5>', gravity=>'SouthWest'/,
- 'e7109f6f3291cb0d576a79cb70e7b3db6dde851f1cfc6e5d63fbbf96100264bb');
+ 'abc713cef6d9923859854c164b83ed7b92f6c15ae6924207bb8a38063395650b');
#
# 9) Test South gravity
@@ -101,7 +101,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', geometry=>'90x80+5+5>', gravity=>'South'/,
- '287fc09873957d91ef2a29cf09c7d20a477aaab2104c3ba9fd6046ea0ee633de');
+ '9992d5631703aa64d4fb87c71881df39aeff1cc821320d0a43f00897e7cd6a17');
#
# 10) Test SouthEast gravity
@@ -110,7 +110,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', geometry=>'90x80+5+5>', gravity=>'SouthEast'/,
- '7f2745dfeb6b94f059e521601cd41cda2d548b7fff5eabd4781b102c2581c4f4');
+ 'ae4322daebfbd3fe448afffe33aa599be518eaebb3515793e1efe6dc33939383');
#
# 11) Test Framed Montage
@@ -122,8 +122,9 @@
testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+3+3>', frame=>'8x10',
borderwidth=>'0', gravity=>'Center', background=>'gray'/,
- 'd65a3fcf9119a59414d52b6b11c0d131579341dbae03e4f18776dc8a01da2931',
- '2aa66c8d3eb0c3b3e765df6ffc5977c026dd65f7839b763a48192cdd45d27474');
+ '40835871b13232243ba4d2bcb244d06958556a24a9624e793f5c4c291d64f322',
+ '531d0d485d55a5b585cab3f64b37da81a109fbaa91aa44a038fa916421780f14',
+ '40835871b13232243ba4d2bcb244d06958556a24a9624e793f5c4c291d64f322');
#
# 12) Test Framed Montage with drop-shadows
@@ -132,8 +133,9 @@
testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
borderwidth=>'0', gravity=>'Center', shadow=>'True',background=>'gray'/,
- 'ff43a8c5dd980438c10436a71b47afc538ae3839ba57251768fa07add1229d8a',
- '885d043b63810d030697104629d79f2141fab28cb561cf84b4f323209cee4f42');
+ 'c11aad0132d57f84ec42aad600f2c9f3fdb9ad5a64235cb08a296c0f1a509f6d',
+ '51b8db221299cea2bea84b11247bfa4b41a0cc3a9af27ff4c20f9c23ee7f2117',
+ '7b8d2dbf3ee22440fd5df36090922bb599ab6b4df216282cc51bb4328d03a211');
#
# 13) Test Framed Montage with drop-shadows and background texture
@@ -142,8 +144,9 @@
testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/,
- '0de019cb1e17fb9d3e60e6ae3931c6d384859613c3fc930cfef46720cae8237e',
- '4774caea304139483a3f50a8b94690c7503ccbea89c0ae698e8bb8996d0cfda8');
+ '292b115e08fcef4888ee3f386c6c3aff1c0ed008e34697435c1e4116a75149ed',
+ 'e2fe0b56decf6fd791813e99d7b0f40646a479589e7519d97e2f92969dd17a1e',
+ '2c6bc96010beb38d123cc712ded96ecbbef40265a80e9638e9ea9034d64227f3');
#
# 14) Test Un-bordered, Un-framed Montage
@@ -152,7 +155,7 @@
testMontage( q//,
q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', mode=>'Unframe',
borderwidth=>'0', gravity=>'Center', background=>'gray'/,
- '1ac572b14256896360176430b0e571dd53bfa083214a0ef35069b7a4a1e56b2d');
+ 'b9df49be9b056ed8fd4c4eb7621aa073df65740e4aaebc038c294cb3731f334f');
#
# 15) Test Bordered, Un-framed Montage (mode=>'Unframe')
@@ -161,7 +164,7 @@
testMontage( q/bordercolor=>'red'/,
q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', mode=>'Unframe',
borderwidth=>'5', gravity=>'Center', background=>'gray'/,
- '08ce60c0e00ab7415c181a3fefcf2cb7e42d81aa4c630559d11073a4bcb95cad');
+ '9d7d0f1886ef8d48f680567163d3a4583897d114c7abbb9da6a98f96fb629ebb');
#
# 16) Test Bordered, Un-framed Montage (mode=>'UnFrame')
@@ -170,7 +173,7 @@
testMontage( q/bordercolor=>'red'/,
q/ tile=>'4x4', geometry=>'90x80+6+6>', mode=>'UnFrame',
borderwidth=>'5', gravity=>'Center', background=>'gray'/,
- '08ce60c0e00ab7415c181a3fefcf2cb7e42d81aa4c630559d11073a4bcb95cad');
+ '9d7d0f1886ef8d48f680567163d3a4583897d114c7abbb9da6a98f96fb629ebb');
#
# 17) Test Un-bordered, Un-framed Montage with 16x1 tile
@@ -179,7 +182,7 @@
testMontage( q//,
q/background=>'#696e7e', tile=>'16x1', geometry=>'90x80+0+0>', mode=>'Unframe',
borderwidth=>'0', gravity=>'Center', background=>'gray'/,
- '6de83e358b3b0939d0a0cb196514de31f4ded673f867e155b63f03c7e04e8170');
+ '9f6f0c7ff76283b0f8747c1e12bd810bda0c47ab8cf78a4ae584556a64c88213');
#
# 18) Test concatenated thumbnail Montage (concatenated via special Concatenate mode)
@@ -188,7 +191,7 @@
++$test;
testMontage( q//,
q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80>', mode=>'Concatenate'/,
- '8d857590f8f13bd4a893bbee811c3e801a97a6f6a98e8735b97c6812f1e35b11');
+ 'dfede51035a4ce942e3ba9909f85eb497c134a60bb8363afded0ae81f73f0e46');
#
# 19) Test concatenated thumbnail Montage (concatentated by setting params to zero)
# Thumbnails should be compacted tightly together in a grid
@@ -197,4 +200,4 @@
testMontage( q//,
q/background=>'#696e7e', tile=>'4x4', geometry=>'+0+0', mode=>'Unframe', shadow=>'False',
borderwidth=>'0', background=>'gray'/,
- '8d857590f8f13bd4a893bbee811c3e801a97a6f6a98e8735b97c6812f1e35b11');
+ 'dfede51035a4ce942e3ba9909f85eb497c134a60bb8363afded0ae81f73f0e46');
diff --git a/PerlMagick/t/png/read-16.t b/PerlMagick/t/png/read-16.t
index ec58f1c..1344fe0 100644
--- a/PerlMagick/t/png/read-16.t
+++ b/PerlMagick/t/png/read-16.t
@@ -25,27 +25,27 @@
#
++$test;
testRead( 'input_256.png',
- 'e3930ba2c0d7813f21e9ac16b058c10904470853dc6a59f9f3b3f1f47da7dc2c' );
+ '5798b9623e5922d3f6c0e87ae76ccc5a69568258e557613f20934f2de6ee2d35' );
#
# 3) Test TrueColor PNG
#
++$test;
testRead( 'input_truecolor.png',
- '7d40e88aa651fd6234780c61a6cef9f34ae8f579975240cf5d33c86217a348c9' );
+ 'eb9adaa26f3cda80273f436ddb92805da2cb88dd032d24380cd48cf05432a326' );
#
# 4) Test Multiple-image Network Graphics
#
++$test;
testRead( 'input.mng',
- '0cd7b340ab0c0bceac4e95a4248b12987446a9d2df07bcb6e7e7ecd4ddc44b13' );
+ '65c0eacf6e060b9fb8467eaa0f74e2dcc3ef72d06577f06a506bd0546b01fb61' );
#
# 5) Test 16-bit Portable Network Graphics
#
++$test;
testRead( 'input_16.png',
- 'd4bed86abb1849f69f1a5afb7c5cf8798e8192ba228357f189c277198c14f5a0',
+ '6418d8dd1206c3566bac92a883196d448b4d3cc7c19581d95d43bda4f0b7e495',
'2d30a8bed1ae8bd19c8320e861f3140dfc7497ca8a05d249734ab41c71272f08');
diff --git a/PerlMagick/t/png/read.t b/PerlMagick/t/png/read.t
index 0b5ae3f..324ee81 100644
--- a/PerlMagick/t/png/read.t
+++ b/PerlMagick/t/png/read.t
@@ -35,7 +35,7 @@
++$test;
print( "16-bit grayscale PNG ...\n" );
testRead( 'input_16.png',
- 'd4bed86abb1849f69f1a5afb7c5cf8798e8192ba228357f189c277198c14f5a0',
+ '6418d8dd1206c3566bac92a883196d448b4d3cc7c19581d95d43bda4f0b7e495',
'2d30a8bed1ae8bd19c8320e861f3140dfc7497ca8a05d249734ab41c71272f08' );
#
# 4) Test 256 color pseudocolor PNG
@@ -43,7 +43,7 @@
++$test;
print( "8-bit indexed-color PNG ...\n" );
testRead( 'input_256.png',
- 'e3930ba2c0d7813f21e9ac16b058c10904470853dc6a59f9f3b3f1f47da7dc2c' );
+ '5798b9623e5922d3f6c0e87ae76ccc5a69568258e557613f20934f2de6ee2d35' );
#
# 5) Test TrueColor PNG
@@ -51,7 +51,7 @@
++$test;
print( "24-bit Truecolor PNG ...\n" );
testRead( 'input_truecolor.png',
- '7d40e88aa651fd6234780c61a6cef9f34ae8f579975240cf5d33c86217a348c9' );
+ 'eb9adaa26f3cda80273f436ddb92805da2cb88dd032d24380cd48cf05432a326' );
#
# 6) Test Multiple-image Network Graphics
@@ -59,5 +59,5 @@
++$test;
print( "MNG with 24-bit Truecolor PNGs...\n" );
testRead( 'input.mng',
- '0cd7b340ab0c0bceac4e95a4248b12987446a9d2df07bcb6e7e7ecd4ddc44b13' );
+ '65c0eacf6e060b9fb8467eaa0f74e2dcc3ef72d06577f06a506bd0546b01fb61' );
diff --git a/PerlMagick/t/png/write-16.t b/PerlMagick/t/png/write-16.t
index 144a6c7..28d1664 100644
--- a/PerlMagick/t/png/write-16.t
+++ b/PerlMagick/t/png/write-16.t
@@ -20,7 +20,7 @@
testReadWrite( 'input_256.png',
'output_256.png',
q/quality=>54/,
- 'e3930ba2c0d7813f21e9ac16b058c10904470853dc6a59f9f3b3f1f47da7dc2c' );
+ '5798b9623e5922d3f6c0e87ae76ccc5a69568258e557613f20934f2de6ee2d35' );
#
# 2) Test truecolor image
@@ -29,7 +29,7 @@
testReadWrite( 'input_truecolor.png',
'output_truecolor.png',
q/quality=>55/,
- '7d40e88aa651fd6234780c61a6cef9f34ae8f579975240cf5d33c86217a348c9' );
+ 'eb9adaa26f3cda80273f436ddb92805da2cb88dd032d24380cd48cf05432a326' );
#
# 3) Test monochrome image
@@ -46,7 +46,7 @@
testReadWrite( 'input.mng',
'output.mng',
q/quality=>55/,
- '0cd7b340ab0c0bceac4e95a4248b12987446a9d2df07bcb6e7e7ecd4ddc44b13' );
+ '65c0eacf6e060b9fb8467eaa0f74e2dcc3ef72d06577f06a506bd0546b01fb61' );
#
# 5) Test 16-bit Portable Network Graphics
@@ -55,7 +55,7 @@
testReadWrite( 'input_16.png',
'output_16.png',
q/quality=>55/,
- 'd4bed86abb1849f69f1a5afb7c5cf8798e8192ba228357f189c277198c14f5a0',
+ '593d0b64579cbeb07a2f4d5fcc3ab77a320204580442a8b6a95ef141030427de',
'2d30a8bed1ae8bd19c8320e861f3140dfc7497ca8a05d249734ab41c71272f08');
diff --git a/PerlMagick/t/png/write.t b/PerlMagick/t/png/write.t
index b724aa2..3ef6183 100644
--- a/PerlMagick/t/png/write.t
+++ b/PerlMagick/t/png/write.t
@@ -37,7 +37,7 @@
testReadWrite( 'input_16.png',
'output_16.png',
q/quality=>55/,
- 'd4bed86abb1849f69f1a5afb7c5cf8798e8192ba228357f189c277198c14f5a0',
+ '593d0b64579cbeb07a2f4d5fcc3ab77a320204580442a8b6a95ef141030427de',
'2d30a8bed1ae8bd19c8320e861f3140dfc7497ca8a05d249734ab41c71272f08' );
#
# 4) Test pseudocolor image
@@ -47,7 +47,7 @@
testReadWrite( 'input_256.png',
'output_256.png',
q/quality=>54/,
- 'e3930ba2c0d7813f21e9ac16b058c10904470853dc6a59f9f3b3f1f47da7dc2c' );
+ '5798b9623e5922d3f6c0e87ae76ccc5a69568258e557613f20934f2de6ee2d35' );
#
# 5) Test truecolor image
#
@@ -56,7 +56,7 @@
testReadWrite( 'input_truecolor.png',
'output_truecolor.png',
q/quality=>55/,
- '7d40e88aa651fd6234780c61a6cef9f34ae8f579975240cf5d33c86217a348c9' );
+ 'eb9adaa26f3cda80273f436ddb92805da2cb88dd032d24380cd48cf05432a326' );
#
# 6) Test Multiple-image Network Graphics
#
@@ -65,4 +65,4 @@
testReadWrite( 'input.mng',
'output.mng',
q/quality=>55/,
- '0cd7b340ab0c0bceac4e95a4248b12987446a9d2df07bcb6e7e7ecd4ddc44b13' );
+ '65c0eacf6e060b9fb8467eaa0f74e2dcc3ef72d06577f06a506bd0546b01fb61' );
diff --git a/PerlMagick/t/subroutines.pl b/PerlMagick/t/subroutines.pl
index 7ea44b7..ad30560 100644
--- a/PerlMagick/t/subroutines.pl
+++ b/PerlMagick/t/subroutines.pl
@@ -45,6 +45,8 @@
$errorinfo='';
$status='';
+ $normalized_mean_error_max+=1.0e-12;
+ $normalized_maximum_error_max+=1.0e-12;
#print( $filter, " ...\n" );
@@ -291,6 +293,8 @@
my($srcimage, $refimage, $normalized_mean_error, $normalized_maximum_error);
$errorinfo='';
+ $normalized_mean_error_max+=1.0e-12;
+ $normalized_maximum_error_max+=1.0e-12;
# Create images
$srcimage=Image::Magick->new;
@@ -567,6 +571,8 @@
$normalized_maximum_error);
$errorinfo='';
+ $normalized_mean_error_max+=1.0e-12;
+ $normalized_maximum_error_max+=1.0e-12;
$image=Image::Magick->new;
$refimage=Image::Magick->new;
@@ -956,7 +962,7 @@
# [, expected REF_16] );
#
sub testMontage {
- my( $imageOptions, $montageOptions, $ref_8, $ref_16, $ref_32 ) = @_;
+ my( $imageOptions, $montageOptions, $ref_8, $ref_16, $ref_32, $ref_32_hdri ) = @_;
my($image,$ref_signature);
@@ -1011,6 +1017,7 @@
#print "Montage Options: $montageOptions\n";
print("\$montage=\$images->Montage( $montageOptions )\n");
eval "\$montage=\$images->Montage( $montageOptions ) ;";
+ #$montage->Clamp();
if( $@ ) {
print "$@";
print "not ok $test\n";
@@ -1024,7 +1031,7 @@
# $montage->Display();
$signature=$montage->GetAttribute('signature');
if ( defined( $signature ) ) {
- if ( $signature ne $ref_8 && $signature ne $ref_16 && $signature ne $ref_32 ) {
+ if ( $signature ne $ref_8 && $signature ne $ref_16 && $signature ne $ref_32 && $signature ne $ref_32_hdri) {
print "ReadImage()\n";
print "Test $test, signatures do not match.\n";
print " Expected: $ref_8\n";
@@ -1144,6 +1151,8 @@
$errorinfo='';
$status='';
+ $normalized_mean_error_max+=1.0e-12;
+ $normalized_maximum_error_max+=1.0e-12;
#print( $filter, " ...\n" );
diff --git a/PerlMagick/t/tiff/read.t b/PerlMagick/t/tiff/read.t
index cc15447..4d3b528 100644
--- a/PerlMagick/t/tiff/read.t
+++ b/PerlMagick/t/tiff/read.t
@@ -51,7 +51,7 @@
++$test;
print("PseudoColor (256 color + matte channel) ...\n");
testRead( 'input_256_matte.tiff',
- '24fc9ae8a8c00a01ba44a4f902230ca1a5841e283a5ec35e81815c194a344954' );
+ 'c8e5089f89ed3b7d067222e187ccd95da0a586f3a7f669876188fe8bfa04e6d9' );
#
# 6) Test reading PseudoColor using contiguous planar packing
@@ -75,7 +75,7 @@
++$test;
print("TrueColor (8-bit) image ...\n");
testRead( 'input_truecolor.tiff',
- 'ab90f892242d254e4c50dee17a7c8981bc7d46c9534bbb838cf5653c287886c8' );
+ 'f72b63be472e5e730ee2635463c6643d11057d251709ffe1f2027f69b57449df' );
#
# 9) Test Reading TrueColor (16-bit)
@@ -83,7 +83,8 @@
++$test;
print("TrueColor (16-bit) image ...\n");
testRead( 'input_truecolor_16.tiff',
- '562a32f51f620139402c1cc2336fb03f655da47dedf9fdbccfd4d23df55dd3b6' );
+ '7de73152fd38276a12bd4e137854b9dd27ae89dcd597e8789442e4d44df31e61',
+ '81def436d1dea0ee118164ff4f017c62ad7a5a37bf97a820244a4e2c86c338ab' );
#
# 10) Test Reading 8-bit TrueColor Tiled (32x32 tiles)
@@ -91,7 +92,7 @@
++$test;
print("TrueColor (8-bit) tiled image, 32x32 tiles ...\n");
testRead( 'input_truecolor_tiled32x32.tiff',
- 'ab90f892242d254e4c50dee17a7c8981bc7d46c9534bbb838cf5653c287886c8' );
+ 'f72b63be472e5e730ee2635463c6643d11057d251709ffe1f2027f69b57449df' );
#
# 11) Test Reading 8-bit TrueColor Tiled (8 rows per strip)
@@ -99,7 +100,7 @@
++$test;
print("TrueColor (8-bit) stripped, image, 8 rows per strip ...\n");
testRead( 'input_truecolor_stripped.tiff',
- 'ab90f892242d254e4c50dee17a7c8981bc7d46c9534bbb838cf5653c287886c8' );
+ 'f72b63be472e5e730ee2635463c6643d11057d251709ffe1f2027f69b57449df' );
#
# 12) Test Reading Grayscale 4-bit
@@ -115,7 +116,7 @@
++$test;
print("Grayscale (8-bit) ...\n");
testRead( 'input_gray_8bit.tiff',
- 'cdeea215166c095ef42557d63da3d037d16f4e7884e94b7db21e18e241d84f86');
+ 'b51e862fcc24d439870da413c664dfefc36cea1260d807b3208d6f091566263c');
#
# 14) Test Reading Grayscale 8-bit + matte
@@ -123,7 +124,7 @@
++$test;
print("Grayscale (8-bit + matte) ...\n");
testRead( 'input_gray_8bit_matte.tiff',
- 'fd4bf0cae6a978c301452178ae645a08cbd115659296a3fcfd5e07421bbaeb19' );
+ '6002e57537cd54733551f8c4269e8104f2b14f8fcc58a07eda61f5911eb11c80' );
#
# 15) Test Reading Grayscale 12-bit
@@ -131,7 +132,8 @@
++$test;
print("Grayscale (12-bit) ...\n");
testRead( 'input_gray_12bit.tiff',
- '638d5287bb0e6b585525334332ac348ab54903ad0104b789f9335413a8c59276');
+ 'f343adc420b5fc7353cddecf48e6836d8ab8a91a6c78e316e903aec2d3f7293a',
+ '638d5287bb0e6b585525334332ac348ab54903ad0104b789f9335413a8c59276' );
#
# 16) Test Reading Grayscale 16-bit
@@ -139,4 +141,5 @@
++$test;
print("Grayscale (16-bit) ...\n");
testRead( 'input_gray_16bit.tiff',
- '0cde228a8b2385f005fce6e3f027195a140971d2db9d122e0530e9e1fa75ea81');
+ '5d7d94a836efc6be6dc6a84be6017b19a0a5486cc9311b86462cd5e75abb9398',
+ '9acab3f8b02e461149decd6dbb99d4b91be81a129e5f4cafc229e2f393173819' );
diff --git a/PerlMagick/t/tiff/write.t b/PerlMagick/t/tiff/write.t
index e7cafaa..c245af7 100644
--- a/PerlMagick/t/tiff/write.t
+++ b/PerlMagick/t/tiff/write.t
@@ -51,7 +51,7 @@
testReadWrite( 'input_256_matte.tiff',
'output_256_matte.tiff',
q//,
- '24fc9ae8a8c00a01ba44a4f902230ca1a5841e283a5ec35e81815c194a344954' );
+ 'c8e5089f89ed3b7d067222e187ccd95da0a586f3a7f669876188fe8bfa04e6d9' );
#
# 5) Test truecolor image
@@ -61,7 +61,7 @@
testReadWrite( 'input_truecolor.tiff',
'output_truecolor.tiff',
q/quality=>55/,
- 'ab90f892242d254e4c50dee17a7c8981bc7d46c9534bbb838cf5653c287886c8' );
+ 'f72b63be472e5e730ee2635463c6643d11057d251709ffe1f2027f69b57449df' );
#
# 6) Test monochrome image
@@ -91,7 +91,7 @@
testReadWrite( 'input_gray_8bit.tiff',
'output_gray_8bit.tiff',
q//,
- 'cdeea215166c095ef42557d63da3d037d16f4e7884e94b7db21e18e241d84f86' );
+ 'b51e862fcc24d439870da413c664dfefc36cea1260d807b3208d6f091566263c' );
#
# 9) Test gray 4 bit image (with matte channel)
@@ -111,4 +111,4 @@
testReadWrite( 'input_gray_8bit_matte.tiff',
'output_gray_8bit_matte.tiff',
q//,
- 'fd4bf0cae6a978c301452178ae645a08cbd115659296a3fcfd5e07421bbaeb19' );
+ '6002e57537cd54733551f8c4269e8104f2b14f8fcc58a07eda61f5911eb11c80' );
diff --git a/PerlMagick/t/write.t b/PerlMagick/t/write.t
index 1681280..74da704 100644
--- a/PerlMagick/t/write.t
+++ b/PerlMagick/t/write.t
@@ -29,70 +29,70 @@
testReadWrite( 'AVS:input.avs',
'AVS:output.avs',
q//,
- 'cc6cd392e791804b817e825d48a37bc811f880f29e6d28e0ace3815eec687091');
+ '74136c90d3e699ea5bcbf4aa733aff0dc822b6af72fce00f0c7647bcb0d49f66');
print("Microsoft Windows bitmap image file ...\n");
++$test;
testReadWrite( 'BMP:input.bmp',
'BMP:output.bmp',
q//,
- 'a8e92cecc7ca058cb432a030f070793cb5be8cd09e74d07f963c81cc472af910');
+ 'd7324c919f04f4c118da68061a5dbb3f07ebab76b471ecfb0ac822453f677983');
print("Microsoft Windows 24-bit bitmap image file ...\n");
++$test;
testReadWrite( 'BMP:input.bmp24',
'BMP:output.bmp24',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("ZSoft IBM PC multi-page Paintbrush file ...\n");
++$test;
testReadWrite( 'DCX:input.dcx',
'DCX:output.dcx',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("Microsoft Windows 3.X DIB file ...\n");
++$test;
testReadWrite( 'DIB:input.dib',
'DIB:output.dib',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("Flexible Image Transport System ...\n");
++$test;
testReadWrite( 'FITS:input.fits',
'FITS:output.fits',
q//,
- '71f12148af77bf65bc7e0ff5fbe82b5d38416cd99c11470074436cfe42448b41' );
+ '1c773aeac90d47c684c5170fcee16e0c8d4b399f76809c97bcd92ea7e47b1ab4' );
print("CompuServe graphics interchange format ...\n");
++$test;
testReadWrite( 'GIF:input.gif',
'GIF:output.gif',
q//,
- 'a8e92cecc7ca058cb432a030f070793cb5be8cd09e74d07f963c81cc472af910');
+ 'd7324c919f04f4c118da68061a5dbb3f07ebab76b471ecfb0ac822453f677983');
print("CompuServe graphics interchange format (1987) ...\n");
++$test;
testReadWrite( 'GIF87:input.gif87',
'GIF87:output.gif87',
q//,
- '6ca156130053dcfd5515c531a2d43b5d166bb65ec9988bfbfd359f25b0a13f7e');
+ '153b1c806e673a635edc645a92c60d565b58a2aec2417cee1f2e507d8ede27e4');
print("Magick image file format ...\n");
++$test;
testReadWrite( 'MIFF:input.miff',
'MIFF:output.miff',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("MTV Raytracing image format ...\n");
++$test;
testReadWrite( 'MTV:input.mtv',
'MTV:output.mtv',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("Portable bitmap format (black and white), ASCII format ...\n");
++$test;
@@ -113,56 +113,56 @@
testReadWrite( 'PCX:input.pcx',
'PCX:output.pcx',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("Portable graymap format (gray scale), ASCII format ...\n");
++$test;
testReadWrite( 'PGM:input_p2.pgm',
'PGM:output_p2.pgm',
q/compression=>'None'/,
- '4385fd336eb1883fa41ad9b7f44a31c1a2923ae47b3d9650d395b9229b5e9198');
+ 'f345fd06540c055028fd51b1d97a2144065dda8036ff23234313ed66f0b87254');
print("Apple Macintosh QuickDraw/PICT file ...\n");
++$test;
testReadWrite( 'PICT:input.pict',
'PICT:output.pict',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("Portable pixmap format (color), ASCII format ...\n");
++$test;
testReadWrite( 'PPM:input_p3.ppm',
'PPM:output_p3.ppm',
q/compression=>'None'/,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("Portable graymap format (gray scale), binary format ...\n");
++$test;
testReadWrite( 'PGM:input_p5.pgm',
'PGM:output_p5.pgm',
q//,
- '4385fd336eb1883fa41ad9b7f44a31c1a2923ae47b3d9650d395b9229b5e9198');
+ 'f345fd06540c055028fd51b1d97a2144065dda8036ff23234313ed66f0b87254');
print("Portable pixmap format (color), binary format ...\n");
++$test;
testReadWrite( 'PPM:input_p6.ppm',
'PPM:output_p6.ppm',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("Adobe Photoshop bitmap file ...\n");
++$test;
testReadWrite( 'PSD:input.psd',
'PSD:output.psd',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e' );
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52' );
print("Irix RGB image file ...\n");
++$test;
testReadWrite( 'SGI:input.sgi',
'SGI:output.sgi',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("SUN 1-bit Rasterfile ...\n");
++$test;
@@ -176,28 +176,28 @@
testReadWrite( 'SUN:input.im8',
'SUN:output.im8',
q//,
- '0249e226dd79884d3552aa50951c2689859e4c0c5f708da05fff9c6c93e66cb2');
+ '8ac3392ac643d8a852a4ac23dbf25f2124cb13627dbc60bf887b76ecb89cbb20');
print("SUN True-Color Rasterfile ...\n");
++$test;
testReadWrite( 'SUN:input.im24',
'SUN:output.im24',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("Truevision Targa image file ...\n");
++$test;
testReadWrite( 'TGA:input.tga',
'TGA:output.tga',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
print("Khoros Visualization image file ...\n");
++$test;
testReadWrite( 'VIFF:input.viff',
'VIFF:output.viff',
q//,
- 'cc0595eb4b8096cf76f84ff0c03607f5112fbab9d4fb32ef9305f5ce4545d00a');
+ 'b9ff3e1dbb1a4cd376e95645c0f0f950e3ae73973780bb1dfbc849b211fc3925');
print("WBMP (Wireless Bitmap (level 0) image) ...\n");
++$test;
@@ -218,7 +218,7 @@
testReadWrite( 'XPM:input.xpm',
'XPM:output.xpm',
q//,
- '0249e226dd79884d3552aa50951c2689859e4c0c5f708da05fff9c6c93e66cb2');
+ '8ac3392ac643d8a852a4ac23dbf25f2124cb13627dbc60bf887b76ecb89cbb20');
print("CMYK format ...\n");
++$test;
@@ -227,7 +227,7 @@
'70x46',
8,
q//,
- '243b587fb295eb5c17b54a8b6768da139dd09b98bafcef569778ab941c6114ec');
+ '215166c965254211b75dcaadbb587b4c2947d7cb3de1420b13b6539cd815a90d');
print("GRAY format ...\n");
++$test;
@@ -236,7 +236,7 @@
'70x46',
8,
q//,
- 'f03c7a969bf0d9f32821b0fa33895929b47f1994d6428822ae544d1a72c6a397' );
+ '2f3d94bebb0feec1a2f0dcc295cbcf074ceb58e7e59262c3d23f0f26fd5e6267' );
print("RGB format ...\n");
++$test;
@@ -245,7 +245,7 @@
'70x46',
8,
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e' );
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52' );
print("RGBA format ...\n");
++$test;
@@ -254,6 +254,6 @@
'70x46',
8,
q//,
- 'cc6cd392e791804b817e825d48a37bc811f880f29e6d28e0ace3815eec687091' );
+ '74136c90d3e699ea5bcbf4aa733aff0dc822b6af72fce00f0c7647bcb0d49f66' );
1;
diff --git a/PerlMagick/t/x11/write.t b/PerlMagick/t/x11/write.t
index 7c6d0bd..f30acdf 100644
--- a/PerlMagick/t/x11/write.t
+++ b/PerlMagick/t/x11/write.t
@@ -42,4 +42,4 @@
testReadWrite( 'XWD:input.xwd',
'XWD:output.xwd',
q//,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52');
diff --git a/PerlMagick/t/zlib/read.t b/PerlMagick/t/zlib/read.t
index a7626ba..5fd1d96 100644
--- a/PerlMagick/t/zlib/read.t
+++ b/PerlMagick/t/zlib/read.t
@@ -20,7 +20,7 @@
# 1) Test reading Zip compressed MIFF
#
testRead( 'input.miff',
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e' );
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52' );
#
# 3) Test reading Zip stream-compressed MIFF (.gz extension)
@@ -28,4 +28,4 @@
print("Reading Zip stream-compressed MIFF (.gz extension) ...\n");
++$test;
testRead( 'input.miff.gz',
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e' );
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52' );
diff --git a/PerlMagick/t/zlib/write.t b/PerlMagick/t/zlib/write.t
index 4afcefb..721d1e4 100644
--- a/PerlMagick/t/zlib/write.t
+++ b/PerlMagick/t/zlib/write.t
@@ -21,7 +21,7 @@
testReadWrite( 'input.miff',
'output.miff',
q/compression=>'Zip'/,
- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e' );
+ 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52' );
$test = 0; # Quench PERL compliaint
diff --git a/coders/bmp.c b/coders/bmp.c
index 6ea9bc1..673cd04 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -2312,33 +2312,63 @@
(void) WriteBlobLSBLong(image,0x4D424544U); /* PROFILE_EMBEDDED */
else
(void) WriteBlobLSBLong(image,0x73524742U); /* sRGB */
+
+ // bounds check, assign .0 if invalid value
+ if (isgreater(image->chromaticity.red_primary.x, 1.0) ||
+ !isgreater(image->chromaticity.red_primary.x, 0.0))
+ image->chromaticity.red_primary.x = 0.0;
+ if (isgreater(image->chromaticity.red_primary.y, 1.0) ||
+ !isgreater(image->chromaticity.red_primary.y, 0.0))
+ image->chromaticity.red_primary.y = 0.0;
+ if (isgreater(image->chromaticity.green_primary.x, 1.0) ||
+ !isgreater(image->chromaticity.green_primary.x, 0.0))
+ image->chromaticity.green_primary.x = 0.0;
+ if (isgreater(image->chromaticity.green_primary.y, 1.0) ||
+ !isgreater(image->chromaticity.green_primary.y, 0.0))
+ image->chromaticity.green_primary.y = 0.0;
+ if (isgreater(image->chromaticity.blue_primary.x, 1.0) ||
+ !isgreater(image->chromaticity.blue_primary.x, 0.0))
+ image->chromaticity.blue_primary.x = 0.0;
+ if (isgreater(image->chromaticity.blue_primary.y, 1.0) ||
+ !isgreater(image->chromaticity.blue_primary.y, 0.0))
+ image->chromaticity.blue_primary.y = 0.0;
+ if (isgreater(bmp_info.gamma_scale.x, 1.0) ||
+ !isgreater(bmp_info.gamma_scale.x, 0.0))
+ bmp_info.gamma_scale.x = 0.0;
+ if (isgreater(bmp_info.gamma_scale.y, 1.0) ||
+ !isgreater(bmp_info.gamma_scale.y, 0.0))
+ bmp_info.gamma_scale.y = 0.0;
+ if (isgreater(bmp_info.gamma_scale.z, 1.0) ||
+ !isgreater(bmp_info.gamma_scale.z, 0.0))
+ bmp_info.gamma_scale.z = 0.0;
+
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) image->chromaticity.red_primary.x*0x40000000));
+ (image->chromaticity.red_primary.x*0x40000000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) image->chromaticity.red_primary.y*0x40000000));
+ (image->chromaticity.red_primary.y*0x40000000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) (1.000f-(image->chromaticity.red_primary.x+
+ ((1.000f-(image->chromaticity.red_primary.x+
image->chromaticity.red_primary.y))*0x40000000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) image->chromaticity.green_primary.x*0x40000000));
+ (image->chromaticity.green_primary.x*0x40000000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) image->chromaticity.green_primary.y*0x40000000));
+ (image->chromaticity.green_primary.y*0x40000000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) (1.000f-(image->chromaticity.green_primary.x+
+ ((1.000f-(image->chromaticity.green_primary.x+
image->chromaticity.green_primary.y))*0x40000000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) image->chromaticity.blue_primary.x*0x40000000));
+ (image->chromaticity.blue_primary.x*0x40000000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) image->chromaticity.blue_primary.y*0x40000000));
+ (image->chromaticity.blue_primary.y*0x40000000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) (1.000f-(image->chromaticity.blue_primary.x+
+ ((1.000f-(image->chromaticity.blue_primary.x+
image->chromaticity.blue_primary.y))*0x40000000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) bmp_info.gamma_scale.x*0x10000));
+ (bmp_info.gamma_scale.x*0x10000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) bmp_info.gamma_scale.y*0x10000));
+ (bmp_info.gamma_scale.y*0x10000));
(void) WriteBlobLSBLong(image,(unsigned int)
- ((ssize_t) bmp_info.gamma_scale.z*0x10000));
+ (bmp_info.gamma_scale.z*0x10000));
if ((image->rendering_intent != UndefinedIntent) ||
(profile != (StringInfo *) NULL))
{
diff --git a/coders/bytebuffer-private.h b/coders/bytebuffer-private.h
index 38cf741..08887d7 100644
--- a/coders/bytebuffer-private.h
+++ b/coders/bytebuffer-private.h
@@ -98,4 +98,20 @@
buffer->offset+=length;
}
+static inline MagickBooleanType SkipMagickByteBufferUntil(
+ MagickByteBuffer *buffer,const int p)
+{
+ int
+ c;
+
+ c=ReadMagickByteBuffer(buffer);
+ while (c != p)
+ {
+ c=ReadMagickByteBuffer(buffer);
+ if (c == EOF)
+ return(MagickFalse);
+ }
+ return(MagickTrue);
+}
+
#endif
diff --git a/coders/cube.c b/coders/cube.c
index d67d904..42d4afb 100644
--- a/coders/cube.c
+++ b/coders/cube.c
@@ -96,7 +96,8 @@
static Image *ReadCUBEImage(const ImageInfo *image_info,
ExceptionInfo *exception)
{
-#define FlattenCube(level,b,g,r) ((ssize_t) ((b)*(level)*(level)+(g)*(level)+(r)))
+#define FlattenCube(level,b,g,r) \
+ ((ssize_t) ((b)*(level)*(level)+(g)*(level)+(r)))
typedef struct _CubePixel
{
@@ -224,7 +225,7 @@
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
}
/*
- Write HALD image.
+ Convert CUBE image to HALD.
*/
status=MagickTrue;
hald_level=image_info->scene;
diff --git a/coders/dds.c b/coders/dds.c
index d133636..8e47c14 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -2793,13 +2793,14 @@
(void) TransformImageColorspace(image,sRGBColorspace,exception);
pixelFormat=DDPF_FOURCC;
compression=FOURCC_DXT5;
-
if (image->alpha_trait == UndefinedPixelTrait)
compression=FOURCC_DXT1;
-
if (LocaleCompare(image_info->magick,"dxt1") == 0)
compression=FOURCC_DXT1;
-
+ if (image_info->compression == DXT1Compression)
+ compression=FOURCC_DXT1;
+ else if (image_info->compression == NoCompression)
+ pixelFormat=DDPF_RGB;
option=GetImageOption(image_info,"dds:compression");
if (option != (char *) NULL)
{
@@ -2808,10 +2809,8 @@
if (LocaleCompare(option,"none") == 0)
pixelFormat=DDPF_RGB;
}
-
clusterFit=MagickFalse;
weightByAlpha=MagickFalse;
-
if (pixelFormat == DDPF_FOURCC)
{
option=GetImageOption(image_info,"dds:cluster-fit");
@@ -2826,7 +2825,6 @@
}
}
}
-
mipmaps=0;
fromlist=MagickFalse;
option=GetImageOption(image_info,"dds:mipmaps");
@@ -2846,7 +2844,6 @@
}
}
}
-
if ((mipmaps == 0) &&
((image->columns & (image->columns - 1)) == 0) &&
((image->rows & (image->rows - 1)) == 0))
@@ -2867,20 +2864,16 @@
}
}
}
-
option=GetImageOption(image_info,"dds:raw");
if (IsStringTrue(option) == MagickFalse)
WriteDDSInfo(image,pixelFormat,compression,mipmaps);
else
mipmaps=0;
-
WriteImageData(image,pixelFormat,compression,clusterFit,weightByAlpha,
exception);
-
if ((mipmaps > 0) && (WriteMipmaps(image,image_info,pixelFormat,compression,
mipmaps,fromlist,clusterFit,weightByAlpha,exception) == MagickFalse))
return(MagickFalse);
-
(void) CloseBlob(image);
return(MagickTrue);
}
diff --git a/coders/emf.c b/coders/emf.c
index 16c2738..7ae6c19 100644
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -48,10 +48,8 @@
# include <wingdi.h>
# endif
# else
-#pragma warning(disable: 4457)
#pragma warning(disable: 4458)
# include <gdiplus.h>
-#pragma warning(default: 4457)
#pragma warning(default: 4458)
# pragma comment(lib, "gdiplus.lib")
# endif
diff --git a/coders/gradient.c b/coders/gradient.c
index 4a10fcf..f8eaefa 100644
--- a/coders/gradient.c
+++ b/coders/gradient.c
@@ -167,7 +167,8 @@
ExceptionInfo *exception)
{
char
- colorname[MagickPathExtent+4];
+ start_color[MagickPathExtent],
+ stop_color[MagickPathExtent];
Image
*image;
@@ -176,14 +177,13 @@
*read_info;
MagickBooleanType
- icc_color,
status;
StopInfo
*stops;
/*
- Initialize Image structure.
+ Identify start and stop gradient colors.
*/
assert(image_info != (const ImageInfo *) NULL);
assert(image_info->signature == MagickCoreSignature);
@@ -192,32 +192,49 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickCoreSignature);
+ (void) CopyMagickString(start_color,"white",MagickPathExtent);
+ (void) CopyMagickString(stop_color,"black",MagickPathExtent);
+ if (*image_info->filename != '\0')
+ {
+ register char
+ *p;
+
+ (void) CopyMagickString(start_color,image_info->filename,
+ MagickPathExtent);
+ for (p=start_color; (*p != '-') && (*p != '\0'); p++)
+ if (*p == '(')
+ {
+ for (p++; (*p != ')') && (*p != '\0'); p++);
+ if (*p == '\0')
+ break;
+ }
+ if (*p == '-')
+ (void) CopyMagickString(stop_color,p+1,MagickPathExtent);
+ *p='\0';
+ }
+ /*
+ Create base gradient image from start color.
+ */
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) CopyMagickString(colorname,image_info->filename,MagickPathExtent);
- (void) sscanf(image_info->filename,"%[^-]",colorname);
- (void) CopyMagickString(read_info->filename,colorname,MagickPathExtent);
+ (void) CopyMagickString(read_info->filename,start_color,MagickPathExtent);
image=ReadXCImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
if (image == (Image *) NULL)
return((Image *) NULL);
- (void) SetImageAlpha(image,(Quantum) TransparentAlpha,exception);
- (void) CopyMagickString(image->filename,image_info->filename,
- MagickPathExtent);
- icc_color=MagickFalse;
- if (LocaleCompare(colorname,"icc") == 0)
- {
- (void) ConcatenateMagickString(colorname,"-",MagickPathExtent);
- (void) sscanf(image_info->filename,"%*[^-]-%[^-]",colorname+4);
- icc_color=MagickTrue;
- }
+ /*
+ Create gradient stops.
+ */
stops=(StopInfo *) AcquireQuantumMemory(2,sizeof(*stops));
if (stops == (StopInfo *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
stops[0].offset=0.0;
stops[1].offset=1.0;
- status=QueryColorCompliance(colorname,AllCompliance,&stops[0].color,
+ status=QueryColorCompliance(start_color,AllCompliance,&stops[0].color,
exception);
+ if (status != MagickFalse)
+ status=QueryColorCompliance(stop_color,AllCompliance,&stops[1].color,
+ exception);
if (status == MagickFalse)
{
stops=(StopInfo *) RelinquishMagickMemory(stops);
@@ -225,24 +242,12 @@
return((Image *) NULL);
}
(void) SetImageColorspace(image,stops[0].color.colorspace,exception);
- (void) CopyMagickString(colorname,"white",MagickPathExtent);
- if (GetPixelInfoIntensity(image,&stops[0].color) > (QuantumRange/2.0))
- (void) CopyMagickString(colorname,"black",MagickPathExtent);
- if (icc_color == MagickFalse)
- (void) sscanf(image_info->filename,"%*[^-]-%[^-]",colorname);
- else
- (void) sscanf(image_info->filename,"%*[^-]-%*[^-]-%[^-]",colorname);
- status=QueryColorCompliance(colorname,AllCompliance,&stops[1].color,
- exception);
- if (status == MagickFalse)
- {
- stops=(StopInfo *) RelinquishMagickMemory(stops);
- image=DestroyImage(image);
- return((Image *) NULL);
- }
- image->alpha_trait=stops[0].color.alpha_trait;
- if (stops[1].color.alpha_trait != UndefinedPixelTrait)
- image->alpha_trait=stops[1].color.alpha_trait;
+ if ((stops[0].color.alpha_trait != UndefinedPixelTrait) ||
+ (stops[1].color.alpha_trait != UndefinedPixelTrait))
+ SetImageAlpha(image,TransparentAlpha,exception);
+ /*
+ Paint gradient.
+ */
status=GradientImage(image,LocaleCompare(image_info->magick,"GRADIENT") == 0 ?
LinearGradient : RadialGradient,PadSpread,stops,2,exception);
stops=(StopInfo *) RelinquishMagickMemory(stops);
diff --git a/coders/heic.c b/coders/heic.c
index f5db596..6aee9b3 100644
--- a/coders/heic.c
+++ b/coders/heic.c
@@ -340,26 +340,24 @@
(void) SetImageProperty(image,"exif:Orientation","1",exception);
error=heif_decode_image(image_handle,&heif_image,heif_colorspace_YCbCr,
heif_chroma_420,decode_options);
+ if (decode_options != (struct heif_decoding_options *) NULL)
+ heif_decoding_options_free(decode_options);
if (IsHeifSuccess(&error,image,exception) == MagickFalse)
{
heif_image_handle_release(image_handle);
return(MagickFalse);
}
- if (decode_options != (struct heif_decoding_options *) NULL)
+ /*
+ Correct the width and height of the image.
+ */
+ image->columns=(size_t) heif_image_get_width(heif_image,heif_channel_Y);
+ image->rows=(size_t) heif_image_get_height(heif_image,heif_channel_Y);
+ status=SetImageExtent(image,image->columns,image->rows,exception);
+ if (status == MagickFalse)
{
- /*
- Correct the width and height of the image.
- */
- image->columns=(size_t) heif_image_get_width(heif_image,heif_channel_Y);
- image->rows=(size_t) heif_image_get_height(heif_image,heif_channel_Y);
- status=SetImageExtent(image,image->columns,image->rows,exception);
- heif_decoding_options_free(decode_options);
- if (status == MagickFalse)
- {
- heif_image_release(heif_image);
- heif_image_handle_release(image_handle);
- return(MagickFalse);
- }
+ heif_image_release(heif_image);
+ heif_image_handle_release(image_handle);
+ return(MagickFalse);
}
p_y=heif_image_get_plane_readonly(heif_image,heif_channel_Y,&stride_y);
p_cb=heif_image_get_plane_readonly(heif_image,heif_channel_Cb,&stride_cb);
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 7918eec..d860706 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -17,7 +17,7 @@
% July 1992 %
% %
% %
-% Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
@@ -413,6 +413,18 @@
static boolean ReadComment(j_decompress_ptr jpeg_info)
{
+#define GetProfileLength(jpeg_info,length) \
+{ \
+ int \
+ c[2]; \
+\
+ length=0; \
+ c[0]=GetCharacter(jpeg_info); \
+ c[1]=GetCharacter(jpeg_info); \
+ if ((c[0] >= 0) && (c[1] >= 0)) \
+ length=(size_t) ((c[0] << 8) | c[1]); \
+}
+
ErrorManager
*error_manager;
@@ -440,8 +452,7 @@
error_manager=(ErrorManager *) jpeg_info->client_data;
exception=error_manager->exception;
image=error_manager->image;
- length=(size_t) ((size_t) GetCharacter(jpeg_info) << 8);
- length+=GetCharacter(jpeg_info);
+ GetProfileLength(jpeg_info,length);
if (length <= 2)
return(TRUE);
length-=2;
@@ -486,7 +497,7 @@
static boolean ReadICCProfile(j_decompress_ptr jpeg_info)
{
char
- magick[12];
+ magick[13];
ErrorManager
*error_manager;
@@ -516,8 +527,9 @@
/*
Read color profile.
*/
- length=(size_t) ((size_t) GetCharacter(jpeg_info) << 8);
- length+=(size_t) GetCharacter(jpeg_info);
+ GetProfileLength(jpeg_info,length);
+ if (length <= 2)
+ return(TRUE);
length-=2;
if (length <= 14)
{
@@ -528,6 +540,7 @@
}
for (i=0; i < 12; i++)
magick[i]=(char) GetCharacter(jpeg_info);
+ magick[i]='\0';
if (LocaleCompare(magick,ICC_PROFILE) != 0)
{
/*
@@ -628,8 +641,9 @@
/*
Determine length of binary data stored here.
*/
- length=(size_t) ((size_t) GetCharacter(jpeg_info) << 8);
- length+=(size_t) GetCharacter(jpeg_info);
+ GetProfileLength(jpeg_info,length);
+ if (length <= 2)
+ return(TRUE);
length-=2;
if (length <= 14)
{
@@ -761,8 +775,7 @@
/*
Read generic profile.
*/
- length=(size_t) ((size_t) GetCharacter(jpeg_info) << 8);
- length+=(size_t) GetCharacter(jpeg_info);
+ GetProfileLength(jpeg_info,length);
if (length <= 2)
return(TRUE);
length-=2;
@@ -1100,8 +1113,8 @@
sampling_factor);
}
-static Image *ReadJPEGImage(const ImageInfo *image_info,
- ExceptionInfo *exception)
+static Image *ReadJPEGImage_(const ImageInfo *image_info,
+ struct jpeg_decompress_struct *jpeg_info,ExceptionInfo *exception)
{
char
value[MagickPathExtent];
@@ -1138,9 +1151,6 @@
register ssize_t
i;
- struct jpeg_decompress_struct
- jpeg_info;
-
struct jpeg_error_mgr
jpeg_error;
@@ -1184,18 +1194,18 @@
Initialize JPEG parameters.
*/
(void) memset(&error_manager,0,sizeof(error_manager));
- (void) memset(&jpeg_info,0,sizeof(jpeg_info));
+ (void) memset(jpeg_info,0,sizeof(*jpeg_info));
(void) memset(&jpeg_error,0,sizeof(jpeg_error));
(void) memset(&jpeg_progress,0,sizeof(jpeg_progress));
- jpeg_info.err=jpeg_std_error(&jpeg_error);
- jpeg_info.err->emit_message=(void (*)(j_common_ptr,int)) JPEGWarningHandler;
- jpeg_info.err->error_exit=(void (*)(j_common_ptr)) JPEGErrorHandler;
+ jpeg_info->err=jpeg_std_error(&jpeg_error);
+ jpeg_info->err->emit_message=(void (*)(j_common_ptr,int)) JPEGWarningHandler;
+ jpeg_info->err->error_exit=(void (*)(j_common_ptr)) JPEGErrorHandler;
memory_info=(MemoryInfo *) NULL;
error_manager.exception=exception;
error_manager.image=image;
if (setjmp(error_manager.error_recovery) != 0)
{
- jpeg_destroy_decompress(&jpeg_info);
+ jpeg_destroy_decompress(jpeg_info);
if (error_manager.profile != (StringInfo *) NULL)
error_manager.profile=DestroyStringInfo(error_manager.profile);
(void) CloseBlob(image);
@@ -1204,38 +1214,38 @@
return(GetFirstImageInList(image));
return(DestroyImage(image));
}
- jpeg_info.client_data=(void *) &error_manager;
- jpeg_create_decompress(&jpeg_info);
+ jpeg_info->client_data=(void *) &error_manager;
+ jpeg_create_decompress(jpeg_info);
if (GetMaxMemoryRequest() != ~0UL)
- jpeg_info.mem->max_memory_to_use=(long) GetMaxMemoryRequest();
+ jpeg_info->mem->max_memory_to_use=(long) GetMaxMemoryRequest();
jpeg_progress.progress_monitor=(void (*)(j_common_ptr)) JPEGProgressHandler;
- jpeg_info.progress=(&jpeg_progress);
- JPEGSourceManager(&jpeg_info,image);
- jpeg_set_marker_processor(&jpeg_info,JPEG_COM,ReadComment);
+ jpeg_info->progress=(&jpeg_progress);
+ JPEGSourceManager(jpeg_info,image);
+ jpeg_set_marker_processor(jpeg_info,JPEG_COM,ReadComment);
option=GetImageOption(image_info,"profile:skip");
if (IsOptionMember("ICC",option) == MagickFalse)
- jpeg_set_marker_processor(&jpeg_info,ICC_MARKER,ReadICCProfile);
+ jpeg_set_marker_processor(jpeg_info,ICC_MARKER,ReadICCProfile);
if (IsOptionMember("IPTC",option) == MagickFalse)
- jpeg_set_marker_processor(&jpeg_info,IPTC_MARKER,ReadIPTCProfile);
+ jpeg_set_marker_processor(jpeg_info,IPTC_MARKER,ReadIPTCProfile);
for (i=1; i < 16; i++)
if ((i != 2) && (i != 13) && (i != 14))
if (IsOptionMember("APP",option) == MagickFalse)
- jpeg_set_marker_processor(&jpeg_info,(int) (JPEG_APP0+i),ReadProfile);
- i=(ssize_t) jpeg_read_header(&jpeg_info,TRUE);
+ jpeg_set_marker_processor(jpeg_info,(int) (JPEG_APP0+i),ReadProfile);
+ i=(ssize_t) jpeg_read_header(jpeg_info,TRUE);
if ((image_info->colorspace == YCbCrColorspace) ||
(image_info->colorspace == Rec601YCbCrColorspace) ||
(image_info->colorspace == Rec709YCbCrColorspace))
- jpeg_info.out_color_space=JCS_YCbCr;
+ jpeg_info->out_color_space=JCS_YCbCr;
/*
Set image resolution.
*/
units=0;
- if ((jpeg_info.saw_JFIF_marker != 0) && (jpeg_info.X_density != 1) &&
- (jpeg_info.Y_density != 1))
+ if ((jpeg_info->saw_JFIF_marker != 0) && (jpeg_info->X_density != 1) &&
+ (jpeg_info->Y_density != 1))
{
- image->resolution.x=(double) jpeg_info.X_density;
- image->resolution.y=(double) jpeg_info.Y_density;
- units=(size_t) jpeg_info.density_unit;
+ image->resolution.x=(double) jpeg_info->X_density;
+ image->resolution.y=(double) jpeg_info->Y_density;
+ units=(size_t) jpeg_info->density_unit;
}
if (units == 1)
image->units=PixelsPerInchResolution;
@@ -1244,7 +1254,7 @@
number_pixels=(MagickSizeType) image->columns*image->rows;
option=GetImageOption(image_info,"jpeg:size");
if ((option != (const char *) NULL) &&
- (jpeg_info.out_color_space != JCS_YCbCr))
+ (jpeg_info->out_color_space != JCS_YCbCr))
{
double
scale_factor;
@@ -1261,36 +1271,36 @@
flags=ParseGeometry(option,&geometry_info);
if ((flags & SigmaValue) == 0)
geometry_info.sigma=geometry_info.rho;
- jpeg_calc_output_dimensions(&jpeg_info);
- image->magick_columns=jpeg_info.output_width;
- image->magick_rows=jpeg_info.output_height;
+ jpeg_calc_output_dimensions(jpeg_info);
+ image->magick_columns=jpeg_info->output_width;
+ image->magick_rows=jpeg_info->output_height;
scale_factor=1.0;
if (geometry_info.rho != 0.0)
- scale_factor=jpeg_info.output_width/geometry_info.rho;
+ scale_factor=jpeg_info->output_width/geometry_info.rho;
if ((geometry_info.sigma != 0.0) &&
- (scale_factor > (jpeg_info.output_height/geometry_info.sigma)))
- scale_factor=jpeg_info.output_height/geometry_info.sigma;
- jpeg_info.scale_num=1U;
- jpeg_info.scale_denom=(unsigned int) scale_factor;
- jpeg_calc_output_dimensions(&jpeg_info);
+ (scale_factor > (jpeg_info->output_height/geometry_info.sigma)))
+ scale_factor=jpeg_info->output_height/geometry_info.sigma;
+ jpeg_info->scale_num=1U;
+ jpeg_info->scale_denom=(unsigned int) scale_factor;
+ jpeg_calc_output_dimensions(jpeg_info);
if (image->debug != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Scale factor: %.20g",(double) scale_factor);
}
#if (JPEG_LIB_VERSION >= 61) && defined(D_PROGRESSIVE_SUPPORTED)
#if defined(D_LOSSLESS_SUPPORTED)
- image->interlace=jpeg_info.process == JPROC_PROGRESSIVE ?
+ image->interlace=jpeg_info->process == JPROC_PROGRESSIVE ?
JPEGInterlace : NoInterlace;
- image->compression=jpeg_info.process == JPROC_LOSSLESS ?
+ image->compression=jpeg_info->process == JPROC_LOSSLESS ?
LosslessJPEGCompression : JPEGCompression;
- if (jpeg_info.data_precision > 8)
+ if (jpeg_info->data_precision > 8)
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
"12-bit JPEG not supported. Reducing pixel data to 8 bits","`%s'",
image->filename);
- if (jpeg_info.data_precision == 16)
- jpeg_info.data_precision=12;
+ if (jpeg_info->data_precision == 16)
+ jpeg_info->data_precision=12;
#else
- image->interlace=jpeg_info.progressive_mode != 0 ? JPEGInterlace :
+ image->interlace=jpeg_info->progressive_mode != 0 ? JPEGInterlace :
NoInterlace;
image->compression=JPEGCompression;
#endif
@@ -1304,12 +1314,12 @@
/*
Let the JPEG library quantize the image.
*/
- jpeg_info.quantize_colors=TRUE;
- jpeg_info.desired_number_of_colors=(int) StringToUnsignedLong(option);
+ jpeg_info->quantize_colors=TRUE;
+ jpeg_info->desired_number_of_colors=(int) StringToUnsignedLong(option);
}
option=GetImageOption(image_info,"jpeg:block-smoothing");
if (option != (const char *) NULL)
- jpeg_info.do_block_smoothing=IsStringTrue(option) != MagickFalse ? TRUE :
+ jpeg_info->do_block_smoothing=IsStringTrue(option) != MagickFalse ? TRUE :
FALSE;
dct_method=GetImageOption(image_info,"jpeg:dct-method");
if (dct_method != (const char *) NULL)
@@ -1319,37 +1329,37 @@
case 'd':
{
if (LocaleCompare(dct_method,"default") == 0)
- jpeg_info.dct_method=JDCT_DEFAULT;
+ jpeg_info->dct_method=JDCT_DEFAULT;
break;
}
case 'F':
case 'f':
{
if (LocaleCompare(dct_method,"fastest") == 0)
- jpeg_info.dct_method=JDCT_FASTEST;
+ jpeg_info->dct_method=JDCT_FASTEST;
if (LocaleCompare(dct_method,"float") == 0)
- jpeg_info.dct_method=JDCT_FLOAT;
+ jpeg_info->dct_method=JDCT_FLOAT;
break;
}
case 'I':
case 'i':
{
if (LocaleCompare(dct_method,"ifast") == 0)
- jpeg_info.dct_method=JDCT_IFAST;
+ jpeg_info->dct_method=JDCT_IFAST;
if (LocaleCompare(dct_method,"islow") == 0)
- jpeg_info.dct_method=JDCT_ISLOW;
+ jpeg_info->dct_method=JDCT_ISLOW;
break;
}
}
option=GetImageOption(image_info,"jpeg:fancy-upsampling");
if (option != (const char *) NULL)
- jpeg_info.do_fancy_upsampling=IsStringTrue(option) != MagickFalse ? TRUE :
+ jpeg_info->do_fancy_upsampling=IsStringTrue(option) != MagickFalse ? TRUE :
FALSE;
- jpeg_calc_output_dimensions(&jpeg_info);
- image->columns=jpeg_info.output_width;
- image->rows=jpeg_info.output_height;
- image->depth=(size_t) jpeg_info.data_precision;
- switch (jpeg_info.out_color_space)
+ jpeg_calc_output_dimensions(jpeg_info);
+ image->columns=jpeg_info->output_width;
+ image->rows=jpeg_info->output_height;
+ image->depth=(size_t) jpeg_info->data_precision;
+ switch (jpeg_info->out_color_space)
{
case JCS_RGB:
default:
@@ -1376,16 +1386,16 @@
if (IsITUFaxImage(image) != MagickFalse)
{
(void) SetImageColorspace(image,LabColorspace,exception);
- jpeg_info.out_color_space=JCS_YCbCr;
+ jpeg_info->out_color_space=JCS_YCbCr;
}
option=GetImageOption(image_info,"jpeg:colors");
if (option != (const char *) NULL)
if (AcquireImageColormap(image,StringToUnsignedLong(option),exception) == MagickFalse)
{
- jpeg_destroy_decompress(&jpeg_info);
+ jpeg_destroy_decompress(jpeg_info);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
}
- if ((jpeg_info.output_components == 1) && (jpeg_info.quantize_colors == 0))
+ if ((jpeg_info->output_components == 1) && (jpeg_info->quantize_colors == 0))
{
size_t
colors;
@@ -1393,7 +1403,7 @@
colors=(size_t) GetQuantumRange(image->depth)+1;
if (AcquireImageColormap(image,colors,exception) == MagickFalse)
{
- jpeg_destroy_decompress(&jpeg_info);
+ jpeg_destroy_decompress(jpeg_info);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
}
}
@@ -1406,48 +1416,48 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Interlace: nonprogressive");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Data precision: %d",
- (int) jpeg_info.data_precision);
+ (int) jpeg_info->data_precision);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Geometry: %dx%d",
- (int) jpeg_info.output_width,(int) jpeg_info.output_height);
+ (int) jpeg_info->output_width,(int) jpeg_info->output_height);
}
- JPEGSetImageQuality(&jpeg_info,image);
- JPEGSetImageSamplingFactor(&jpeg_info,image,exception);
+ JPEGSetImageQuality(jpeg_info,image);
+ JPEGSetImageSamplingFactor(jpeg_info,image,exception);
(void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
- jpeg_info.out_color_space);
+ jpeg_info->out_color_space);
(void) SetImageProperty(image,"jpeg:colorspace",value,exception);
#if defined(D_ARITH_CODING_SUPPORTED)
- if (jpeg_info.arith_code == TRUE)
+ if (jpeg_info->arith_code == TRUE)
(void) SetImageProperty(image,"jpeg:coding","arithmetic",exception);
#endif
if (image_info->ping != MagickFalse)
{
- jpeg_destroy_decompress(&jpeg_info);
+ jpeg_destroy_decompress(jpeg_info);
(void) CloseBlob(image);
return(GetFirstImageInList(image));
}
status=SetImageExtent(image,image->columns,image->rows,exception);
if (status == MagickFalse)
{
- jpeg_destroy_decompress(&jpeg_info);
+ jpeg_destroy_decompress(jpeg_info);
return(DestroyImageList(image));
}
- (void) jpeg_start_decompress(&jpeg_info);
- if ((jpeg_info.output_components != 1) &&
- (jpeg_info.output_components != 3) && (jpeg_info.output_components != 4))
+ (void) jpeg_start_decompress(jpeg_info);
+ if ((jpeg_info->output_components != 1) &&
+ (jpeg_info->output_components != 3) && (jpeg_info->output_components != 4))
{
- jpeg_destroy_decompress(&jpeg_info);
+ jpeg_destroy_decompress(jpeg_info);
ThrowReaderException(CorruptImageError,"ImageTypeNotSupported");
}
memory_info=AcquireVirtualMemory((size_t) image->columns,
- jpeg_info.output_components*sizeof(*jpeg_pixels));
+ jpeg_info->output_components*sizeof(*jpeg_pixels));
if (memory_info == (MemoryInfo *) NULL)
{
- jpeg_destroy_decompress(&jpeg_info);
+ jpeg_destroy_decompress(jpeg_info);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
}
jpeg_pixels=(JSAMPLE *) GetVirtualMemoryBlob(memory_info);
(void) memset(jpeg_pixels,0,image->columns*
- jpeg_info.output_components*sizeof(*jpeg_pixels));
+ jpeg_info->output_components*sizeof(*jpeg_pixels));
/*
Convert JPEG pixels to pixel packets.
*/
@@ -1455,21 +1465,21 @@
{
if (memory_info != (MemoryInfo *) NULL)
memory_info=RelinquishVirtualMemory(memory_info);
- jpeg_destroy_decompress(&jpeg_info);
+ jpeg_destroy_decompress(jpeg_info);
(void) CloseBlob(image);
number_pixels=(MagickSizeType) image->columns*image->rows;
if (number_pixels != 0)
return(GetFirstImageInList(image));
return(DestroyImage(image));
}
- if (jpeg_info.quantize_colors != 0)
+ if (jpeg_info->quantize_colors != 0)
{
- image->colors=(size_t) jpeg_info.actual_number_of_colors;
- if (jpeg_info.out_color_space == JCS_GRAYSCALE)
+ image->colors=(size_t) jpeg_info->actual_number_of_colors;
+ if (jpeg_info->out_color_space == JCS_GRAYSCALE)
for (i=0; i < (ssize_t) image->colors; i++)
{
image->colormap[i].red=(double) ScaleCharToQuantum(
- jpeg_info.colormap[0][i]);
+ jpeg_info->colormap[0][i]);
image->colormap[i].green=image->colormap[i].red;
image->colormap[i].blue=image->colormap[i].red;
image->colormap[i].alpha=(MagickRealType) OpaqueAlpha;
@@ -1478,11 +1488,11 @@
for (i=0; i < (ssize_t) image->colors; i++)
{
image->colormap[i].red=(double) ScaleCharToQuantum(
- jpeg_info.colormap[0][i]);
+ jpeg_info->colormap[0][i]);
image->colormap[i].green=(double) ScaleCharToQuantum(
- jpeg_info.colormap[1][i]);
+ jpeg_info->colormap[1][i]);
image->colormap[i].blue=(double) ScaleCharToQuantum(
- jpeg_info.colormap[2][i]);
+ jpeg_info->colormap[2][i]);
image->colormap[i].alpha=(MagickRealType) OpaqueAlpha;
}
}
@@ -1495,7 +1505,7 @@
register Quantum
*magick_restrict q;
- if (jpeg_read_scanlines(&jpeg_info,scanline,1) != 1)
+ if (jpeg_read_scanlines(jpeg_info,scanline,1) != 1)
{
(void) ThrowMagickException(exception,GetMagickModule(),
CorruptImageWarning,"SkipToSyncByte","`%s'",image->filename);
@@ -1505,14 +1515,14 @@
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
break;
- if (jpeg_info.data_precision > 8)
+ if (jpeg_info->data_precision > 8)
{
unsigned short
scale;
scale=65535/(unsigned short) GetQuantumRange((size_t)
- jpeg_info.data_precision);
- if (jpeg_info.output_components == 1)
+ jpeg_info->data_precision);
+ if (jpeg_info->output_components == 1)
for (x=0; x < (ssize_t) image->columns; x++)
{
ssize_t
@@ -1554,7 +1564,7 @@
}
}
else
- if (jpeg_info.output_components == 1)
+ if (jpeg_info->output_components == 1)
for (x=0; x < (ssize_t) image->columns; x++)
{
ssize_t
@@ -1600,7 +1610,7 @@
image->rows);
if (status == MagickFalse)
{
- jpeg_abort_decompress(&jpeg_info);
+ jpeg_abort_decompress(jpeg_info);
break;
}
}
@@ -1608,16 +1618,25 @@
{
error_manager.finished=MagickTrue;
if (setjmp(error_manager.error_recovery) == 0)
- (void) jpeg_finish_decompress(&jpeg_info);
+ (void) jpeg_finish_decompress(jpeg_info);
}
/*
Free jpeg resources.
*/
- jpeg_destroy_decompress(&jpeg_info);
+ jpeg_destroy_decompress(jpeg_info);
memory_info=RelinquishVirtualMemory(memory_info);
(void) CloseBlob(image);
return(GetFirstImageInList(image));
}
+
+static Image *ReadJPEGImage(const ImageInfo *image_info,
+ ExceptionInfo *exception)
+{
+ struct jpeg_decompress_struct
+ jpeg_info;
+
+ return(ReadJPEGImage_(image_info,&jpeg_info,exception));
+}
#endif
/*
@@ -2254,8 +2273,8 @@
return(textlist);
}
-static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
- Image *image,ExceptionInfo *exception)
+static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info,
+ Image *image,struct jpeg_compress_struct *jpeg_info,ExceptionInfo *exception)
{
const char
*dct_method,
@@ -2294,9 +2313,6 @@
ssize_t
y;
- struct jpeg_compress_struct
- jpeg_info;
-
struct jpeg_error_mgr
jpeg_error;
@@ -2324,46 +2340,46 @@
Initialize JPEG parameters.
*/
(void) memset(&error_manager,0,sizeof(error_manager));
- (void) memset(&jpeg_info,0,sizeof(jpeg_info));
+ (void) memset(jpeg_info,0,sizeof(*jpeg_info));
(void) memset(&jpeg_error,0,sizeof(jpeg_error));
volatile_image=image;
- jpeg_info.client_data=(void *) volatile_image;
- jpeg_info.err=jpeg_std_error(&jpeg_error);
- jpeg_info.err->emit_message=(void (*)(j_common_ptr,int)) JPEGWarningHandler;
- jpeg_info.err->error_exit=(void (*)(j_common_ptr)) JPEGErrorHandler;
+ jpeg_info->client_data=(void *) volatile_image;
+ jpeg_info->err=jpeg_std_error(&jpeg_error);
+ jpeg_info->err->emit_message=(void (*)(j_common_ptr,int)) JPEGWarningHandler;
+ jpeg_info->err->error_exit=(void (*)(j_common_ptr)) JPEGErrorHandler;
error_manager.exception=exception;
error_manager.image=volatile_image;
memory_info=(MemoryInfo *) NULL;
if (setjmp(error_manager.error_recovery) != 0)
{
- jpeg_destroy_compress(&jpeg_info);
+ jpeg_destroy_compress(jpeg_info);
(void) CloseBlob(volatile_image);
return(MagickFalse);
}
- jpeg_info.client_data=(void *) &error_manager;
- jpeg_create_compress(&jpeg_info);
- JPEGDestinationManager(&jpeg_info,image);
+ jpeg_info->client_data=(void *) &error_manager;
+ jpeg_create_compress(jpeg_info);
+ JPEGDestinationManager(jpeg_info,image);
if ((image->columns != (unsigned int) image->columns) ||
(image->rows != (unsigned int) image->rows))
ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
- jpeg_info.image_width=(unsigned int) image->columns;
- jpeg_info.image_height=(unsigned int) image->rows;
- jpeg_info.input_components=3;
- jpeg_info.data_precision=8;
- jpeg_info.in_color_space=JCS_RGB;
+ jpeg_info->image_width=(unsigned int) image->columns;
+ jpeg_info->image_height=(unsigned int) image->rows;
+ jpeg_info->input_components=3;
+ jpeg_info->data_precision=8;
+ jpeg_info->in_color_space=JCS_RGB;
switch (image->colorspace)
{
case CMYKColorspace:
{
- jpeg_info.input_components=4;
- jpeg_info.in_color_space=JCS_CMYK;
+ jpeg_info->input_components=4;
+ jpeg_info->in_color_space=JCS_CMYK;
break;
}
case YCbCrColorspace:
case Rec601YCbCrColorspace:
case Rec709YCbCrColorspace:
{
- jpeg_info.in_color_space=JCS_YCbCr;
+ jpeg_info->in_color_space=JCS_YCbCr;
break;
}
case LinearGRAYColorspace:
@@ -2371,8 +2387,8 @@
{
if (image_info->type == TrueColorType)
break;
- jpeg_info.input_components=1;
- jpeg_info.in_color_space=JCS_GRAYSCALE;
+ jpeg_info->input_components=1;
+ jpeg_info->in_color_space=JCS_GRAYSCALE;
break;
}
default:
@@ -2382,19 +2398,19 @@
break;
if (SetImageGray(image,exception) != MagickFalse)
{
- jpeg_info.input_components=1;
- jpeg_info.in_color_space=JCS_GRAYSCALE;
+ jpeg_info->input_components=1;
+ jpeg_info->in_color_space=JCS_GRAYSCALE;
}
break;
}
}
- jpeg_set_defaults(&jpeg_info);
- if (jpeg_info.in_color_space == JCS_CMYK)
- jpeg_set_colorspace(&jpeg_info,JCS_YCCK);
- if ((jpeg_info.data_precision != 12) && (image->depth <= 8))
- jpeg_info.data_precision=8;
+ jpeg_set_defaults(jpeg_info);
+ if (jpeg_info->in_color_space == JCS_CMYK)
+ jpeg_set_colorspace(jpeg_info,JCS_YCCK);
+ if ((jpeg_info->data_precision != 12) && (image->depth <= 8))
+ jpeg_info->data_precision=8;
else
- jpeg_info.data_precision=BITS_IN_JSAMPLE;
+ jpeg_info->data_precision=BITS_IN_JSAMPLE;
if (image->debug != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Image resolution: %.20g,%.20g",image->resolution.x,image->resolution.y);
@@ -2403,16 +2419,16 @@
/*
Set image resolution.
*/
- jpeg_info.write_JFIF_header=TRUE;
- jpeg_info.X_density=(UINT16) image->resolution.x;
- jpeg_info.Y_density=(UINT16) image->resolution.y;
+ jpeg_info->write_JFIF_header=TRUE;
+ jpeg_info->X_density=(UINT16) image->resolution.x;
+ jpeg_info->Y_density=(UINT16) image->resolution.y;
/*
Set image resolution units.
*/
if (image->units == PixelsPerInchResolution)
- jpeg_info.density_unit=(UINT8) 1;
+ jpeg_info->density_unit=(UINT8) 1;
if (image->units == PixelsPerCentimeterResolution)
- jpeg_info.density_unit=(UINT8) 2;
+ jpeg_info->density_unit=(UINT8) 2;
}
dct_method=GetImageOption(image_info,"jpeg:dct-method");
if (dct_method != (const char *) NULL)
@@ -2422,38 +2438,38 @@
case 'd':
{
if (LocaleCompare(dct_method,"default") == 0)
- jpeg_info.dct_method=JDCT_DEFAULT;
+ jpeg_info->dct_method=JDCT_DEFAULT;
break;
}
case 'F':
case 'f':
{
if (LocaleCompare(dct_method,"fastest") == 0)
- jpeg_info.dct_method=JDCT_FASTEST;
+ jpeg_info->dct_method=JDCT_FASTEST;
if (LocaleCompare(dct_method,"float") == 0)
- jpeg_info.dct_method=JDCT_FLOAT;
+ jpeg_info->dct_method=JDCT_FLOAT;
break;
}
case 'I':
case 'i':
{
if (LocaleCompare(dct_method,"ifast") == 0)
- jpeg_info.dct_method=JDCT_IFAST;
+ jpeg_info->dct_method=JDCT_IFAST;
if (LocaleCompare(dct_method,"islow") == 0)
- jpeg_info.dct_method=JDCT_ISLOW;
+ jpeg_info->dct_method=JDCT_ISLOW;
break;
}
}
option=GetImageOption(image_info,"jpeg:optimize-coding");
if (option != (const char *) NULL)
- jpeg_info.optimize_coding=IsStringTrue(option) != MagickFalse ? TRUE :
+ jpeg_info->optimize_coding=IsStringTrue(option) != MagickFalse ? TRUE :
FALSE;
else
{
MagickSizeType
length;
- length=(MagickSizeType) jpeg_info.input_components*image->columns*
+ length=(MagickSizeType) jpeg_info->input_components*image->columns*
image->rows*sizeof(JSAMPLE);
if (length == (MagickSizeType) ((size_t) length))
{
@@ -2463,15 +2479,15 @@
status=AcquireMagickResource(MemoryResource,length);
if (status != MagickFalse)
RelinquishMagickResource(MemoryResource,length);
- jpeg_info.optimize_coding=status == MagickFalse ? FALSE : TRUE;
+ jpeg_info->optimize_coding=status == MagickFalse ? FALSE : TRUE;
}
}
#if defined(C_ARITH_CODING_SUPPORTED)
option=GetImageOption(image_info,"jpeg:arithmetic-coding");
if (IsStringTrue(option) != MagickFalse)
{
- jpeg_info.arith_code=TRUE;
- jpeg_info.optimize_coding=FALSE; // Not supported.
+ jpeg_info->arith_code=TRUE;
+ jpeg_info->optimize_coding=FALSE; // Not supported.
}
#endif
#if (JPEG_LIB_VERSION >= 61) && defined(C_PROGRESSIVE_SUPPORTED)
@@ -2481,7 +2497,7 @@
if (image->debug != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Interlace: progressive");
- jpeg_simple_progression(&jpeg_info);
+ jpeg_simple_progression(jpeg_info);
}
else
if (image->debug != MagickFalse)
@@ -2520,7 +2536,7 @@
predictor=image->quality/100; /* range 1-7 */
point_transform=image->quality % 20; /* range 0-15 */
- jpeg_simple_lossless(&jpeg_info,predictor,point_transform);
+ jpeg_simple_lossless(jpeg_info,predictor,point_transform);
if (image->debug != MagickFalse)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -2580,9 +2596,9 @@
}
extent_info=DestroyImageInfo(extent_info);
}
- jpeg_set_quality(&jpeg_info,quality,TRUE);
+ jpeg_set_quality(jpeg_info,quality,TRUE);
if ((dct_method == (const char *) NULL) && (quality <= 90))
- jpeg_info.dct_method=JDCT_IFAST;
+ jpeg_info->dct_method=JDCT_IFAST;
#if (JPEG_LIB_VERSION >= 70)
option=GetImageOption(image_info,"quality");
if (option != (const char *) NULL)
@@ -2599,22 +2615,22 @@
flags=ParseGeometry(option,&geometry_info);
if (((flags & RhoValue) != 0) && ((flags & SigmaValue) != 0))
{
- jpeg_info.q_scale_factor[0]=jpeg_quality_scaling((int)
+ jpeg_info->q_scale_factor[0]=jpeg_quality_scaling((int)
(geometry_info.rho+0.5));
- jpeg_info.q_scale_factor[1]=jpeg_quality_scaling((int)
+ jpeg_info->q_scale_factor[1]=jpeg_quality_scaling((int)
(geometry_info.sigma+0.5));
- jpeg_default_qtables(&jpeg_info,TRUE);
+ jpeg_default_qtables(jpeg_info,TRUE);
}
}
#endif
- colorspace=jpeg_info.in_color_space;
+ colorspace=jpeg_info->in_color_space;
value=GetImageOption(image_info,"jpeg:colorspace");
if (value == (char *) NULL)
value=GetImageProperty(image,"jpeg:colorspace",exception);
if (value != (char *) NULL)
colorspace=StringToInteger(value);
sampling_factor=(const char *) NULL;
- if ((J_COLOR_SPACE) colorspace == jpeg_info.in_color_space)
+ if ((J_COLOR_SPACE) colorspace == jpeg_info->in_color_space)
{
value=GetImageOption(image_info,"jpeg:sampling-factor");
if (value == (char *) NULL)
@@ -2635,8 +2651,8 @@
if (quality >= 90)
for (i=0; i < MAX_COMPONENTS; i++)
{
- jpeg_info.comp_info[i].h_samp_factor=1;
- jpeg_info.comp_info[i].v_samp_factor=1;
+ jpeg_info->comp_info[i].h_samp_factor=1;
+ jpeg_info->comp_info[i].v_samp_factor=1;
}
}
else
@@ -2664,16 +2680,16 @@
flags=ParseGeometry(factors[i],&geometry_info);
if ((flags & SigmaValue) == 0)
geometry_info.sigma=geometry_info.rho;
- jpeg_info.comp_info[i].h_samp_factor=(int) geometry_info.rho;
- jpeg_info.comp_info[i].v_samp_factor=(int) geometry_info.sigma;
+ jpeg_info->comp_info[i].h_samp_factor=(int) geometry_info.rho;
+ jpeg_info->comp_info[i].v_samp_factor=(int) geometry_info.sigma;
factors[i]=(char *) RelinquishMagickMemory(factors[i]);
}
factors=(char **) RelinquishMagickMemory(factors);
}
for ( ; i < MAX_COMPONENTS; i++)
{
- jpeg_info.comp_info[i].h_samp_factor=1;
- jpeg_info.comp_info[i].v_samp_factor=1;
+ jpeg_info->comp_info[i].h_samp_factor=1;
+ jpeg_info->comp_info[i].v_samp_factor=1;
}
}
option=GetImageOption(image_info,"jpeg:q-table");
@@ -2689,8 +2705,8 @@
if (table != (QuantizationTable *) NULL)
{
for (i=0; i < MAX_COMPONENTS; i++)
- jpeg_info.comp_info[i].quant_tbl_no=0;
- jpeg_add_quant_table(&jpeg_info,0,table->levels,
+ jpeg_info->comp_info[i].quant_tbl_no=0;
+ jpeg_add_quant_table(jpeg_info,0,table->levels,
jpeg_quality_scaling(quality),0);
table=DestroyQuantizationTable(table);
}
@@ -2698,8 +2714,8 @@
if (table != (QuantizationTable *) NULL)
{
for (i=1; i < MAX_COMPONENTS; i++)
- jpeg_info.comp_info[i].quant_tbl_no=1;
- jpeg_add_quant_table(&jpeg_info,1,table->levels,
+ jpeg_info->comp_info[i].quant_tbl_no=1;
+ jpeg_add_quant_table(jpeg_info,1,table->levels,
jpeg_quality_scaling(quality),0);
table=DestroyQuantizationTable(table);
}
@@ -2707,8 +2723,8 @@
if (table != (QuantizationTable *) NULL)
{
for (i=2; i < MAX_COMPONENTS; i++)
- jpeg_info.comp_info[i].quant_tbl_no=2;
- jpeg_add_quant_table(&jpeg_info,2,table->levels,
+ jpeg_info->comp_info[i].quant_tbl_no=2;
+ jpeg_add_quant_table(jpeg_info,2,table->levels,
jpeg_quality_scaling(quality),0);
table=DestroyQuantizationTable(table);
}
@@ -2716,13 +2732,13 @@
if (table != (QuantizationTable *) NULL)
{
for (i=3; i < MAX_COMPONENTS; i++)
- jpeg_info.comp_info[i].quant_tbl_no=3;
- jpeg_add_quant_table(&jpeg_info,3,table->levels,
+ jpeg_info->comp_info[i].quant_tbl_no=3;
+ jpeg_add_quant_table(jpeg_info,3,table->levels,
jpeg_quality_scaling(quality),0);
table=DestroyQuantizationTable(table);
}
}
- jpeg_start_compress(&jpeg_info,TRUE);
+ jpeg_start_compress(jpeg_info,TRUE);
if (image->debug != MagickFalse)
{
if (image->storage_class == PseudoClass)
@@ -2740,7 +2756,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Number of colors: unspecified");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- "JPEG data precision: %d",(int) jpeg_info.data_precision);
+ "JPEG data precision: %d",(int) jpeg_info->data_precision);
switch (image->colorspace)
{
case CMYKColorspace:
@@ -2770,14 +2786,14 @@
"Colorspace: CMYK");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Sampling factors: %dx%d,%dx%d,%dx%d,%dx%d",
- jpeg_info.comp_info[0].h_samp_factor,
- jpeg_info.comp_info[0].v_samp_factor,
- jpeg_info.comp_info[1].h_samp_factor,
- jpeg_info.comp_info[1].v_samp_factor,
- jpeg_info.comp_info[2].h_samp_factor,
- jpeg_info.comp_info[2].v_samp_factor,
- jpeg_info.comp_info[3].h_samp_factor,
- jpeg_info.comp_info[3].v_samp_factor);
+ jpeg_info->comp_info[0].h_samp_factor,
+ jpeg_info->comp_info[0].v_samp_factor,
+ jpeg_info->comp_info[1].h_samp_factor,
+ jpeg_info->comp_info[1].v_samp_factor,
+ jpeg_info->comp_info[2].h_samp_factor,
+ jpeg_info->comp_info[2].v_samp_factor,
+ jpeg_info->comp_info[3].h_samp_factor,
+ jpeg_info->comp_info[3].v_samp_factor);
break;
}
case GRAYColorspace:
@@ -2785,8 +2801,8 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Colorspace: GRAY");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- "Sampling factors: %dx%d",jpeg_info.comp_info[0].h_samp_factor,
- jpeg_info.comp_info[0].v_samp_factor);
+ "Sampling factors: %dx%d",jpeg_info->comp_info[0].h_samp_factor,
+ jpeg_info->comp_info[0].v_samp_factor);
break;
}
case sRGBColorspace:
@@ -2796,12 +2812,12 @@
"Image colorspace is RGB");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Sampling factors: %dx%d,%dx%d,%dx%d",
- jpeg_info.comp_info[0].h_samp_factor,
- jpeg_info.comp_info[0].v_samp_factor,
- jpeg_info.comp_info[1].h_samp_factor,
- jpeg_info.comp_info[1].v_samp_factor,
- jpeg_info.comp_info[2].h_samp_factor,
- jpeg_info.comp_info[2].v_samp_factor);
+ jpeg_info->comp_info[0].h_samp_factor,
+ jpeg_info->comp_info[0].v_samp_factor,
+ jpeg_info->comp_info[1].h_samp_factor,
+ jpeg_info->comp_info[1].v_samp_factor,
+ jpeg_info->comp_info[2].h_samp_factor,
+ jpeg_info->comp_info[2].v_samp_factor);
break;
}
case YCbCrColorspace:
@@ -2812,12 +2828,12 @@
"Colorspace: YCbCr");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Sampling factors: %dx%d,%dx%d,%dx%d",
- jpeg_info.comp_info[0].h_samp_factor,
- jpeg_info.comp_info[0].v_samp_factor,
- jpeg_info.comp_info[1].h_samp_factor,
- jpeg_info.comp_info[1].v_samp_factor,
- jpeg_info.comp_info[2].h_samp_factor,
- jpeg_info.comp_info[2].v_samp_factor);
+ jpeg_info->comp_info[0].h_samp_factor,
+ jpeg_info->comp_info[0].v_samp_factor,
+ jpeg_info->comp_info[1].h_samp_factor,
+ jpeg_info->comp_info[1].v_samp_factor,
+ jpeg_info->comp_info[2].h_samp_factor,
+ jpeg_info->comp_info[2].v_samp_factor);
break;
}
default:
@@ -2826,14 +2842,14 @@
image->colorspace);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Sampling factors: %dx%d,%dx%d,%dx%d,%dx%d",
- jpeg_info.comp_info[0].h_samp_factor,
- jpeg_info.comp_info[0].v_samp_factor,
- jpeg_info.comp_info[1].h_samp_factor,
- jpeg_info.comp_info[1].v_samp_factor,
- jpeg_info.comp_info[2].h_samp_factor,
- jpeg_info.comp_info[2].v_samp_factor,
- jpeg_info.comp_info[3].h_samp_factor,
- jpeg_info.comp_info[3].v_samp_factor);
+ jpeg_info->comp_info[0].h_samp_factor,
+ jpeg_info->comp_info[0].v_samp_factor,
+ jpeg_info->comp_info[1].h_samp_factor,
+ jpeg_info->comp_info[1].v_samp_factor,
+ jpeg_info->comp_info[2].h_samp_factor,
+ jpeg_info->comp_info[2].v_samp_factor,
+ jpeg_info->comp_info[3].h_samp_factor,
+ jpeg_info->comp_info[3].v_samp_factor);
break;
}
}
@@ -2849,22 +2865,22 @@
length=strlen(value);
for (i=0; i < (ssize_t) length; i+=65533L)
- jpeg_write_marker(&jpeg_info,JPEG_COM,(unsigned char *) value+i,
+ jpeg_write_marker(jpeg_info,JPEG_COM,(unsigned char *) value+i,
(unsigned int) MagickMin((size_t) strlen(value+i),65533L));
}
if (image->profiles != (void *) NULL)
- WriteProfile(&jpeg_info,image,exception);
+ WriteProfile(jpeg_info,image,exception);
/*
Convert MIFF to JPEG raster pixels.
*/
memory_info=AcquireVirtualMemory((size_t) image->columns,
- jpeg_info.input_components*sizeof(*jpeg_pixels));
+ jpeg_info->input_components*sizeof(*jpeg_pixels));
if (memory_info == (MemoryInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
jpeg_pixels=(JSAMPLE *) GetVirtualMemoryBlob(memory_info);
if (setjmp(error_manager.error_recovery) != 0)
{
- jpeg_destroy_compress(&jpeg_info);
+ jpeg_destroy_compress(jpeg_info);
if (memory_info != (MemoryInfo *) NULL)
memory_info=RelinquishVirtualMemory(memory_info);
(void) CloseBlob(image);
@@ -2872,13 +2888,13 @@
}
scanline[0]=(JSAMPROW) jpeg_pixels;
scale=65535/(unsigned short) GetQuantumRange((size_t)
- jpeg_info.data_precision);
+ jpeg_info->data_precision);
if (scale == 0)
scale=1;
- if (jpeg_info.data_precision <= 8)
+ if (jpeg_info->data_precision <= 8)
{
- if ((jpeg_info.in_color_space == JCS_RGB) ||
- (jpeg_info.in_color_space == JCS_YCbCr))
+ if ((jpeg_info->in_color_space == JCS_RGB) ||
+ (jpeg_info->in_color_space == JCS_YCbCr))
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
@@ -2898,14 +2914,14 @@
*q++=(JSAMPLE) ScaleQuantumToChar(GetPixelBlue(image,p));
p+=GetPixelChannels(image);
}
- (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
+ (void) jpeg_write_scanlines(jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
if (status == MagickFalse)
break;
}
else
- if (jpeg_info.in_color_space == JCS_GRAYSCALE)
+ if (jpeg_info->in_color_space == JCS_GRAYSCALE)
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
@@ -2924,7 +2940,7 @@
image,p)));
p+=GetPixelChannels(image);
}
- (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
+ (void) jpeg_write_scanlines(jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
if (status == MagickFalse)
@@ -2958,7 +2974,7 @@
GetPixelBlack(image,p))));
p+=GetPixelChannels(image);
}
- (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
+ (void) jpeg_write_scanlines(jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
if (status == MagickFalse)
@@ -2966,7 +2982,7 @@
}
}
else
- if (jpeg_info.in_color_space == JCS_GRAYSCALE)
+ if (jpeg_info->in_color_space == JCS_GRAYSCALE)
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
@@ -2985,15 +3001,15 @@
p)))/scale);
p+=GetPixelChannels(image);
}
- (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
+ (void) jpeg_write_scanlines(jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
if (status == MagickFalse)
break;
}
else
- if ((jpeg_info.in_color_space == JCS_RGB) ||
- (jpeg_info.in_color_space == JCS_YCbCr))
+ if ((jpeg_info->in_color_space == JCS_RGB) ||
+ (jpeg_info->in_color_space == JCS_YCbCr))
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
@@ -3013,7 +3029,7 @@
*q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelBlue(image,p))/scale);
p+=GetPixelChannels(image);
}
- (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
+ (void) jpeg_write_scanlines(jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
if (status == MagickFalse)
@@ -3047,20 +3063,29 @@
image,p))/scale);
p+=GetPixelChannels(image);
}
- (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
+ (void) jpeg_write_scanlines(jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
if (status == MagickFalse)
break;
}
if (y == (ssize_t) image->rows)
- jpeg_finish_compress(&jpeg_info);
+ jpeg_finish_compress(jpeg_info);
/*
Relinquish resources.
*/
- jpeg_destroy_compress(&jpeg_info);
+ jpeg_destroy_compress(jpeg_info);
memory_info=RelinquishVirtualMemory(memory_info);
(void) CloseBlob(image);
return(MagickTrue);
}
+
+static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
+ Image *image,ExceptionInfo *exception)
+{
+ struct jpeg_compress_struct
+ jpeg_info;
+
+ return(WriteJPEGImage_(image_info,image,&jpeg_info,exception));
+}
#endif
diff --git a/coders/label.c b/coders/label.c
index 366ee56..d30cabf 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -131,13 +131,13 @@
(void) SetImageProperty(image,"label",label,exception);
draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
width=(size_t) floor(draw_info->pointsize*strlen(label)+0.5);
+ draw_info->text=ConstantString(label);
+ label=DestroyString(label);
if (AcquireMagickResource(WidthResource,width) == MagickFalse)
{
- label=DestroyString(label);
draw_info=DestroyDrawInfo(draw_info);
ThrowReaderException(ImageError,"WidthOrHeightExceedsLimit");
}
- draw_info->text=ConstantString(label);
(void) memset(&metrics,0,sizeof(metrics));
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
if ((image->columns == 0) && (image->rows == 0))
@@ -146,7 +146,7 @@
image->rows=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
}
else
- if ((status != MagickFalse) && (strlen(label) > 0) &&
+ if ((status != MagickFalse) && (strlen(draw_info->text) > 0) &&
(((image->columns == 0) || (image->rows == 0)) ||
(fabs(image_info->pointsize) < MagickEpsilon)))
{
@@ -160,6 +160,7 @@
/*
Auto fit text into bounding box.
*/
+ (void) ConcatenateString(&draw_info->text,":");
for (n=0; n < 32; n++, draw_info->pointsize*=2.0)
{
(void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
@@ -183,7 +184,6 @@
}
if (status == MagickFalse)
{
- label=DestroyString(label);
draw_info=DestroyDrawInfo(draw_info);
image=DestroyImageList(image);
return((Image *) NULL);
@@ -215,13 +215,13 @@
else
high=draw_info->pointsize-0.5;
}
+ draw_info->text[strlen(draw_info->text)-1]='\0';
if (status != MagickFalse)
{
- draw_info->pointsize=(low+high)/2.0-0.5;
+ draw_info->pointsize=floor((low+high)/2.0-0.5);
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
}
}
- label=DestroyString(label);
if (status == MagickFalse)
{
draw_info=DestroyDrawInfo(draw_info);
diff --git a/coders/mpc.c b/coders/mpc.c
index 7848320..9237417 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -1172,7 +1172,10 @@
{
/*
Write persistent cache meta-information.
+
+ SetImageStorageClass() required to sync pixel cache.
*/
+ (void) SetImageStorageClass(image,image->storage_class,exception);
depth=GetImageQuantumDepth(image,MagickTrue);
if ((image->storage_class == PseudoClass) &&
(image->colors > (size_t) (GetQuantumRange(image->depth)+1)))
diff --git a/coders/pcd.c b/coders/pcd.c
index e18b5b9..1ed5834 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -125,7 +125,7 @@
count=ReadBlob(image,0x800,buffer); \
p=buffer; \
} \
- sum|=((unsigned int) (*p) << (24-bits)); \
+ sum|=(((unsigned int) (*p)) << (24-bits)); \
bits+=8; \
p++; \
} \
@@ -230,17 +230,20 @@
}
pcd_length[i]=(size_t) length;
}
- /*
- Search for Sync byte.
- */
- for (i=0; i < 1; i++)
- PCDGetBits(16);
- for (i=0; i < 1; i++)
- PCDGetBits(16);
- while ((sum & 0x00fff000UL) != 0x00fff000UL)
- PCDGetBits(8);
- while (IsSync(sum) == 0)
- PCDGetBits(1);
+ if (EOFBlob(image) == MagickFalse)
+ {
+ /*
+ Search for Sync byte.
+ */
+ for (i=0; i < 1; i++)
+ PCDGetBits(16);
+ for (i=0; i < 1; i++)
+ PCDGetBits(16);
+ while ((sum & 0x00fff000UL) != 0x00fff000UL)
+ PCDGetBits(8);
+ while (IsSync(sum) == 0)
+ PCDGetBits(1);
+ }
/*
Recover the Huffman encoded luminance and chrominance deltas.
*/
@@ -248,8 +251,7 @@
length=0;
plane=0;
row=0;
- q=luma;
- for ( ; ; )
+ for (q=luma; EOFBlob(image) == MagickFalse; )
{
if (IsSync(sum) != 0)
{
diff --git a/coders/pdb.c b/coders/pdb.c
index 7be605c..6be3314 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -1006,7 +1006,7 @@
(void) WriteBlobMSBShort(image,(unsigned short) pdb_image.height);
(void) WriteBlob(image,(size_t) (q-runlength),runlength);
runlength=(unsigned char *) RelinquishMagickMemory(runlength);
- if (pdb_info.number_records > 1)
+ if (comment != (const char *) NULL)
(void) WriteBlobString(image,comment);
(void) CloseBlob(image);
return(MagickTrue);
diff --git a/coders/pdf.c b/coders/pdf.c
index 0b36d0f..94c5817 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -2930,7 +2930,7 @@
hex_digits[13]='D';
hex_digits[14]='E';
hex_digits[15]='F';
- (void) FormatLocaleString(buffer,MagickPathExtent,"/Title <FEFF");
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Title <");
(void) WriteBlobString(image,buffer);
for (i=0; i < (ssize_t) length; i++)
{
diff --git a/coders/pict.c b/coders/pict.c
index 8bcbfe9..8eec90b 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -807,9 +807,11 @@
rectangle->left=(short) ReadBlobMSBShort(image);
rectangle->bottom=(short) ReadBlobMSBShort(image);
rectangle->right=(short) ReadBlobMSBShort(image);
- if ((EOFBlob(image) != MagickFalse) ||
- ((rectangle->bottom-rectangle->top) <= 0) ||
- ((rectangle->right-rectangle->left) <= 0))
+ if (((EOFBlob(image) != MagickFalse) ||
+ (((rectangle->bottom | rectangle->top |
+ rectangle->right | rectangle->left ) & 0x8000) != 0) ||
+ (rectangle->bottom < rectangle->top) ||
+ (rectangle->right < rectangle->left)))
return(MagickFalse);
return(MagickTrue);
}
@@ -965,6 +967,7 @@
code=ReadBlobByte(image);
if (version == 2)
code=ReadBlobMSBSignedShort(image);
+ code&=0xffff;
if (code < 0)
break;
if (code == 0)
@@ -1448,65 +1451,49 @@
continue;
if (code == 0x8200)
{
- char
- filename[MaxTextExtent];
-
- FILE
- *file;
-
- int
- unique_file;
-
/*
Embedded JPEG.
*/
jpeg=MagickTrue;
- read_info=CloneImageInfo(image_info);
- SetImageInfoBlob(read_info,(void *) NULL,0);
- file=(FILE *) NULL;
- unique_file=AcquireUniqueFileResource(filename);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"jpeg:%s",
- filename);
- if (unique_file != -1)
- file=fdopen(unique_file,"wb");
- if ((unique_file == -1) || (file == (FILE *) NULL))
- {
- (void) RelinquishUniqueFileResource(read_info->filename);
- (void) CopyMagickString(image->filename,read_info->filename,
- MagickPathExtent);
- ThrowPICTException(FileOpenError,"UnableToCreateTemporaryFile");
- }
length=ReadBlobMSBLong(image);
if ((MagickSizeType) length > GetBlobSize(image))
- ThrowPICTException(CorruptImageError,
- "InsufficientImageDataInFile");
+ ThrowPICTException(CorruptImageError,"InsufficientImageDataInFile");
if (length > 154)
{
+ const void
+ *stream;
+
+ ssize_t
+ count;
+
+ unsigned char
+ *pixels;
+
for (i=0; i < 6; i++)
(void) ReadBlobMSBLong(image);
if (ReadRectangle(image,&frame) == MagickFalse)
- {
- (void) fclose(file);
- (void) RelinquishUniqueFileResource(read_info->filename);
- ThrowPICTException(CorruptImageError,"ImproperImageHeader");
- }
+ ThrowPICTException(CorruptImageError,"ImproperImageHeader");
for (i=0; i < 122; i++)
if (ReadBlobByte(image) == EOF)
break;
- for (i=0; i < (ssize_t) (length-154); i++)
- {
- c=ReadBlobByte(image);
- if (c == EOF)
- break;
- if (fputc(c,file) != c)
- break;
- }
+ length-=154;
+ pixels=(unsigned char *) AcquireQuantumMemory(length,
+ sizeof(*pixels));
+ if (pixels == (unsigned char *) NULL)
+ ThrowPICTException(ResourceLimitError,"MemoryAllocationFailed");
+ stream=ReadBlobStream(image,length,pixels,&count);
+ if (count != (ssize_t) length)
+ {
+ pixels=(unsigned char *) RelinquishMagickMemory(pixels);
+ ThrowPICTException(CorruptImageError,"ImproperImageHeader");
+ }
+ read_info=AcquireImageInfo();
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,
+ "jpeg:%s",image_info->filename);
+ tile_image=BlobToImage(read_info,stream,count,exception);
+ pixels=(unsigned char *) RelinquishMagickMemory(pixels);
+ read_info=DestroyImageInfo(read_info);
}
- (void) fclose(file);
- (void) close(unique_file);
- tile_image=ReadImage(read_info,exception);
- (void) RelinquishUniqueFileResource(filename);
- read_info=DestroyImageInfo(read_info);
if (tile_image == (Image *) NULL)
continue;
(void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g",
@@ -1766,7 +1753,7 @@
transfer_mode=0;
x_resolution=0.0;
y_resolution=0.0;
- if ((image->resolution.x > MagickEpsilon) &&
+ if ((image->resolution.x > MagickEpsilon) &&
(image->resolution.y > MagickEpsilon))
{
x_resolution=image->resolution.x;
diff --git a/coders/plasma.c b/coders/plasma.c
index 08a4d94..9e4ee8a 100644
--- a/coders/plasma.c
+++ b/coders/plasma.c
@@ -120,7 +120,7 @@
ImageInfo
*read_info;
- MagickBooleanType
+ MagickStatusType
status;
register ssize_t
diff --git a/coders/png.c b/coders/png.c
index 3465616..b89dcf6 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -2507,7 +2507,7 @@
*value;
value=GetImageOption(image_info,"png:ignore-crc");
- if (value != NULL)
+ if (IsStringTrue(value) != MagickFalse)
{
/* Turn off CRC checking while reading */
png_set_crc_action(ping, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);
@@ -3340,8 +3340,7 @@
"%d, %d",(int) ping_width, (int) ping_height);
(void) SetImageProperty(image,"png:IHDR.width,height",msg,exception);
- (void) FormatLocaleString(msg,MagickPathExtent,"%d",
- (int) ping_file_depth);
+ (void) FormatLocaleString(msg,MagickPathExtent,"%d",(int) ping_file_depth);
(void) SetImageProperty(image,"png:IHDR.bit_depth",msg,exception);
(void) FormatLocaleString(msg,MagickPathExtent,"%d (%s)",
@@ -3364,15 +3363,13 @@
(void) FormatLocaleString(msg,MagickPathExtent,"%d (Unknown method)",
(int) ping_interlace_method);
}
- (void) SetImageProperty(image,"png:IHDR.interlace_method",
- msg,exception);
+ (void) SetImageProperty(image,"png:IHDR.interlace_method",msg,exception);
if (number_colors != 0)
{
(void) FormatLocaleString(msg,MagickPathExtent,"%d",
(int) number_colors);
- (void) SetImageProperty(image,"png:PLTE.number_colors",msg,
- exception);
+ (void) SetImageProperty(image,"png:PLTE.number_colors",msg,exception);
}
}
#if defined(PNG_tIME_SUPPORTED)
@@ -3465,7 +3462,8 @@
found_transparent_pixel=MagickFalse;
- if (image->storage_class == DirectClass)
+ if ((image->storage_class == DirectClass) ||
+ (image_info->stream != (StreamHandler) NULL))
{
for (pass=0; pass < num_passes; pass++)
{
@@ -3960,7 +3958,8 @@
(void) FormatLocaleString(key,MagickPathExtent,"%s",
text[i].key);
- if (LocaleCompare(key,"version") == 0)
+ if ((LocaleCompare(key,"version") == 0) ||
+ (LocaleCompare(key,"width") == 0))
(void) FormatLocaleString(key,MagickPathExtent,"png:%s",
text[i].key);
(void) SetImageProperty(image,key,value,exception);
@@ -4110,8 +4109,7 @@
/* libpng doesn't tell us whether they were tEXt, zTXt, or iTXt */
(void) FormatLocaleString(msg,MagickPathExtent,
"%d tEXt/zTXt/iTXt chunks were found", num_text_total);
- (void) SetImageProperty(image,"png:text",msg,
- exception);
+ (void) SetImageProperty(image,"png:text",msg,exception);
}
if (num_raw_profiles != 0)
@@ -4127,8 +4125,7 @@
{
(void) FormatLocaleString(msg,MagickPathExtent,"%s",
"chunk was found (see Chromaticity, above)");
- (void) SetImageProperty(image,"png:cHRM",msg,
- exception);
+ (void) SetImageProperty(image,"png:cHRM",msg,exception);
}
/* bKGD chunk: */
@@ -4136,8 +4133,7 @@
{
(void) FormatLocaleString(msg,MagickPathExtent,"%s",
"chunk was found (see Background color, above)");
- (void) SetImageProperty(image,"png:bKGD",msg,
- exception);
+ (void) SetImageProperty(image,"png:bKGD",msg,exception);
}
(void) FormatLocaleString(msg,MagickPathExtent,"%s",
@@ -4146,13 +4142,11 @@
#if defined(PNG_iCCP_SUPPORTED)
/* iCCP chunk: */
if (ping_found_iCCP != MagickFalse)
- (void) SetImageProperty(image,"png:iCCP",msg,
- exception);
+ (void) SetImageProperty(image,"png:iCCP",msg,exception);
#endif
if (png_get_valid(ping,ping_info,PNG_INFO_tRNS))
- (void) SetImageProperty(image,"png:tRNS",msg,
- exception);
+ (void) SetImageProperty(image,"png:tRNS",msg,exception);
#if defined(PNG_sRGB_SUPPORTED)
/* sRGB chunk: */
@@ -4162,8 +4156,7 @@
"intent=%d (%s)",
(int) intent,
Magick_RenderingIntentString_from_PNG_RenderingIntent(intent));
- (void) SetImageProperty(image,"png:sRGB",msg,
- exception);
+ (void) SetImageProperty(image,"png:sRGB",msg,exception);
}
#endif
@@ -4173,8 +4166,7 @@
(void) FormatLocaleString(msg,MagickPathExtent,
"gamma=%.8g (See Gamma, above)",
file_gamma);
- (void) SetImageProperty(image,"png:gAMA",msg,
- exception);
+ (void) SetImageProperty(image,"png:gAMA",msg,exception);
}
#if defined(PNG_pHYs_SUPPORTED)
@@ -4184,8 +4176,7 @@
(void) FormatLocaleString(msg,MagickPathExtent,
"x_res=%.10g, y_res=%.10g, units=%d",
(double) x_resolution,(double) y_resolution, unit_type);
- (void) SetImageProperty(image,"png:pHYs",msg,
- exception);
+ (void) SetImageProperty(image,"png:pHYs",msg,exception);
}
#endif
@@ -4196,8 +4187,7 @@
(void) FormatLocaleString(msg,MagickPathExtent,
"x_off=%.20g, y_off=%.20g",
(double) image->page.x,(double) image->page.y);
- (void) SetImageProperty(image,"png:oFFs",msg,
- exception);
+ (void) SetImageProperty(image,"png:oFFs",msg,exception);
}
#endif
@@ -4217,8 +4207,7 @@
"width=%.20g, height=%.20g, x_offset=%.20g, y_offset=%.20g",
(double) image->page.width,(double) image->page.height,
(double) image->page.x,(double) image->page.y);
- (void) SetImageProperty(image,"png:caNv",msg,
- exception);
+ (void) SetImageProperty(image,"png:caNv",msg,exception);
}
}
diff --git a/coders/pnm.c b/coders/pnm.c
index a50de93..3de1b66 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -1936,6 +1936,7 @@
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
+ SetQuantumMinIsWhite(quantum_info,MagickTrue);
(void) SetQuantumEndian(image,quantum_info,MSBEndian);
pixels=GetQuantumPixels(quantum_info);
for (y=0; y < (ssize_t) image->rows; y++)
diff --git a/coders/ps.c b/coders/ps.c
index 8d0c362..4f33cf5 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -315,6 +315,11 @@
c=ReadMagickByteBuffer(&buffer);
if ((c == '%') || (c == '!'))
break;
+ if (c == 'B')
+ {
+ buffer.offset--;
+ break;
+ }
continue;
}
default:
@@ -403,18 +408,21 @@
/*
Read ICC profile.
*/
- ps_info->icc_profile=AcquireStringInfo(MagickPathExtent);
- datum=GetStringInfoDatum(ps_info->icc_profile);
- for (i=0; (c=ProfileInteger(&buffer,hex_digits)) != EOF; i++)
- {
- if (i >= (ssize_t) GetStringInfoLength(ps_info->icc_profile))
+ if (SkipMagickByteBufferUntil(&buffer,'\n') != MagickFalse)
+ {
+ ps_info->icc_profile=AcquireStringInfo(MagickPathExtent);
+ datum=GetStringInfoDatum(ps_info->icc_profile);
+ for (i=0; (c=ProfileInteger(&buffer,hex_digits)) != EOF; i++)
{
- SetStringInfoLength(ps_info->icc_profile,(size_t) i << 1);
- datum=GetStringInfoDatum(ps_info->icc_profile);
+ if (i >= (ssize_t) GetStringInfoLength(ps_info->icc_profile))
+ {
+ SetStringInfoLength(ps_info->icc_profile,(size_t) i << 1);
+ datum=GetStringInfoDatum(ps_info->icc_profile);
+ }
+ datum[i]=(unsigned char) c;
}
- datum[i]=(unsigned char) c;
- }
- SetStringInfoLength(ps_info->icc_profile,(size_t) i+1);
+ SetStringInfoLength(ps_info->icc_profile,(size_t) i+1);
+ }
continue;
}
if ((ps_info->photoshop_profile == (StringInfo *) NULL) &&
@@ -437,17 +445,20 @@
if ((MagickSizeType) extent > GetBlobSize(image))
continue;
length=(size_t) extent;
- ps_info->photoshop_profile=AcquireStringInfo(length+1U);
- q=GetStringInfoDatum(ps_info->photoshop_profile);
- while (extent > 0)
- {
- c=ProfileInteger(&buffer,hex_digits);
- if (c == EOF)
- break;
- *q++=(unsigned char) c;
- extent-=MagickMin(extent,2);
- }
- SetStringInfoLength(ps_info->photoshop_profile,length);
+ if (SkipMagickByteBufferUntil(&buffer,'\n') != MagickFalse)
+ {
+ ps_info->photoshop_profile=AcquireStringInfo(length+1U);
+ q=GetStringInfoDatum(ps_info->photoshop_profile);
+ while (extent > 0)
+ {
+ c=ProfileInteger(&buffer,hex_digits);
+ if (c == EOF)
+ break;
+ *q++=(unsigned char) c;
+ extent-=MagickMin(extent,2);
+ }
+ SetStringInfoLength(ps_info->photoshop_profile,length);
+ }
continue;
}
if (image_info->page != (char *) NULL)
diff --git a/coders/psd.c b/coders/psd.c
index bb48e9b..9a2e81c 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1649,6 +1649,18 @@
return(MagickFalse);
}
+static void CheckMergedImageAlpha(const PSDInfo *psd_info,Image *image)
+{
+ /*
+ The number of layers cannot be used to determine if the merged image
+ contains an alpha channel. So we enable it when we think we should.
+ */
+ if (((psd_info->mode == GrayscaleMode) && (psd_info->channels > 2)) ||
+ ((psd_info->mode == RGBMode) && (psd_info->channels > 3)) ||
+ ((psd_info->mode == CMYKMode) && (psd_info->channels > 4)))
+ image->alpha_trait=BlendPixelTrait;
+}
+
static MagickBooleanType ReadPSDLayersInternal(Image *image,
const ImageInfo *image_info,const PSDInfo *psd_info,
const MagickBooleanType skip_layers,ExceptionInfo *exception)
@@ -1685,7 +1697,10 @@
if (count == 4)
ReversePSDString(image,type,(size_t) count);
if ((count != 4) || (LocaleNCompare(type,"8BIM",4) != 0))
- return(MagickTrue);
+ {
+ CheckMergedImageAlpha(psd_info,image);
+ return(MagickTrue);
+ }
else
{
count=ReadBlob(image,4,(unsigned char *) type);
@@ -1695,7 +1710,10 @@
(LocaleNCompare(type,"Lr32",4) == 0)))
size=GetPSDSize(psd_info,image);
else
- return(MagickTrue);
+ {
+ CheckMergedImageAlpha(psd_info,image);
+ return(MagickTrue);
+ }
}
}
if (size == 0)
diff --git a/coders/svg.c b/coders/svg.c
index 63cf8ed..98a93ee 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -303,11 +303,12 @@
if (delegate_info == (const DelegateInfo *) NULL)
return((Image *) NULL);
status=AcquireUniqueSymbolicLink(image->filename,input_filename);
- (void) AcquireUniqueFilename(output_filename);
+ (void) AcquireUniqueFilename(unique);
+ (void) FormatLocaleString(output_filename,MagickPathExtent,"%s.png",unique);
(void) AcquireUniqueFilename(unique);
density=AcquireString("");
- (void) FormatLocaleString(density,MagickPathExtent,"%.20g,%.20g",
- image->resolution.x,image->resolution.y);
+ (void) FormatLocaleString(density,MagickPathExtent,"%.20g",
+ ceil(sqrt(image->resolution.x*image->resolution.y)-0.5));
(void) FormatLocaleString(background,MagickPathExtent,
"rgb(%.20g%%,%.20g%%,%.20g%%)",
100.0*QuantumScale*image->background_color.red,
@@ -1355,8 +1356,179 @@
{
if (LocaleCompare(keyword,"r") == 0)
{
- svg_info->element.angle=
- GetUserSpaceCoordinateValue(svg_info,0,value);
+ svg_info->element.angle=GetUserSpaceCoordinateValue(svg_info,0,
+ value);
+ break;
+ }
+ break;
+ }
+ case 'T':
+ case 't':
+ {
+ if (LocaleCompare(keyword,"transform") == 0)
+ {
+ AffineMatrix
+ affine,
+ current,
+ transform;
+
+ GetAffineMatrix(&transform);
+ (void) LogMagickEvent(CoderEvent,GetMagickModule()," ");
+ tokens=SVGKeyValuePairs(context,'(',')',value,&number_tokens);
+ if (tokens == (char **) NULL)
+ break;
+ for (j=0; j < (ssize_t) (number_tokens-1); j+=2)
+ {
+ keyword=(char *) tokens[j];
+ value=(char *) tokens[j+1];
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " %s: %s",keyword,value);
+ current=transform;
+ GetAffineMatrix(&affine);
+ switch (*keyword)
+ {
+ case 'M':
+ case 'm':
+ {
+ if (LocaleCompare(keyword,"matrix") == 0)
+ {
+ p=(const char *) value;
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ affine.sx=StringToDouble(value,(char **) NULL);
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ if (*token == ',')
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ affine.rx=StringToDouble(token,&next_token);
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ if (*token == ',')
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ affine.ry=StringToDouble(token,&next_token);
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ if (*token == ',')
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ affine.sy=StringToDouble(token,&next_token);
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ if (*token == ',')
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ affine.tx=StringToDouble(token,&next_token);
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ if (*token == ',')
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ affine.ty=StringToDouble(token,&next_token);
+ break;
+ }
+ break;
+ }
+ case 'R':
+ case 'r':
+ {
+ if (LocaleCompare(keyword,"rotate") == 0)
+ {
+ double
+ angle,
+ x,
+ y;
+
+ p=(const char *) value;
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ angle=StringToDouble(value,(char **) NULL);
+ affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
+ affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
+ affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
+ affine.sy=cos(DegreesToRadians(fmod(angle,360.0)));
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ if (*token == ',')
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ x=StringToDouble(token,&next_token);
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ if (*token == ',')
+ (void) GetNextToken(p,&p,MagickPathExtent,token);
+ y=StringToDouble(token,&next_token);
+ affine.tx=svg_info->bounds.x+x*
+ cos(DegreesToRadians(fmod(angle,360.0)))+y*
+ sin(DegreesToRadians(fmod(angle,360.0)));
+ affine.ty=svg_info->bounds.y-x*
+ sin(DegreesToRadians(fmod(angle,360.0)))+y*
+ cos(DegreesToRadians(fmod(angle,360.0)));
+ affine.tx-=x;
+ affine.ty-=y;
+ break;
+ }
+ break;
+ }
+ case 'S':
+ case 's':
+ {
+ if (LocaleCompare(keyword,"scale") == 0)
+ {
+ for (p=(const char *) value; *p != '\0'; p++)
+ if ((isspace((int) ((unsigned char) *p)) != 0) ||
+ (*p == ','))
+ break;
+ affine.sx=GetUserSpaceCoordinateValue(svg_info,1,value);
+ affine.sy=affine.sx;
+ if (*p != '\0')
+ affine.sy=GetUserSpaceCoordinateValue(svg_info,-1,
+ p+1);
+ svg_info->scale[svg_info->n]=ExpandAffine(&affine);
+ break;
+ }
+ if (LocaleCompare(keyword,"skewX") == 0)
+ {
+ affine.sx=svg_info->affine.sx;
+ affine.ry=tan(DegreesToRadians(fmod(
+ GetUserSpaceCoordinateValue(svg_info,1,value),
+ 360.0)));
+ affine.sy=svg_info->affine.sy;
+ break;
+ }
+ if (LocaleCompare(keyword,"skewY") == 0)
+ {
+ affine.sx=svg_info->affine.sx;
+ affine.rx=tan(DegreesToRadians(fmod(
+ GetUserSpaceCoordinateValue(svg_info,-1,value),
+ 360.0)));
+ affine.sy=svg_info->affine.sy;
+ break;
+ }
+ break;
+ }
+ case 'T':
+ case 't':
+ {
+ if (LocaleCompare(keyword,"translate") == 0)
+ {
+ for (p=(const char *) value; *p != '\0'; p++)
+ if ((isspace((int) ((unsigned char) *p)) != 0) ||
+ (*p == ','))
+ break;
+ affine.tx=GetUserSpaceCoordinateValue(svg_info,1,value);
+ affine.ty=0;
+ if (*p != '\0')
+ affine.ty=GetUserSpaceCoordinateValue(svg_info,-1,
+ p+1);
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ transform.sx=affine.sx*current.sx+affine.ry*current.rx;
+ transform.rx=affine.rx*current.sx+affine.sy*current.rx;
+ transform.ry=affine.sx*current.ry+affine.ry*current.sy;
+ transform.sy=affine.rx*current.ry+affine.sy*current.sy;
+ transform.tx=affine.tx*current.sx+affine.ty*current.ry+
+ current.tx;
+ transform.ty=affine.tx*current.rx+affine.ty*current.sy+
+ current.ty;
+ }
+ (void) FormatLocaleFile(svg_info->file,
+ "affine %g %g %g %g %g %g\n",transform.sx,transform.rx,
+ transform.ry,transform.sy,transform.tx,transform.ty);
+ for (j=0; tokens[j] != (char *) NULL; j++)
+ tokens[j]=DestroyString(tokens[j]);
+ tokens=(char **) RelinquishMagickMemory(tokens);
break;
}
break;
@@ -2233,172 +2405,6 @@
LocaleCompare(value,"true") == 0);
break;
}
- if (LocaleCompare(keyword,"transform") == 0)
- {
- AffineMatrix
- affine,
- current,
- transform;
-
- GetAffineMatrix(&transform);
- (void) LogMagickEvent(CoderEvent,GetMagickModule()," ");
- tokens=SVGKeyValuePairs(context,'(',')',value,&number_tokens);
- if (tokens == (char **) NULL)
- break;
- for (j=0; j < (ssize_t) (number_tokens-1); j+=2)
- {
- keyword=(char *) tokens[j];
- value=(char *) tokens[j+1];
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " %s: %s",keyword,value);
- current=transform;
- GetAffineMatrix(&affine);
- switch (*keyword)
- {
- case 'M':
- case 'm':
- {
- if (LocaleCompare(keyword,"matrix") == 0)
- {
- p=(const char *) value;
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- affine.sx=StringToDouble(value,(char **) NULL);
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- if (*token == ',')
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- affine.rx=StringToDouble(token,&next_token);
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- if (*token == ',')
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- affine.ry=StringToDouble(token,&next_token);
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- if (*token == ',')
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- affine.sy=StringToDouble(token,&next_token);
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- if (*token == ',')
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- affine.tx=StringToDouble(token,&next_token);
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- if (*token == ',')
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- affine.ty=StringToDouble(token,&next_token);
- break;
- }
- break;
- }
- case 'R':
- case 'r':
- {
- if (LocaleCompare(keyword,"rotate") == 0)
- {
- double
- angle,
- x,
- y;
-
- p=(const char *) value;
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- angle=StringToDouble(value,(char **) NULL);
- affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
- affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
- affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
- affine.sy=cos(DegreesToRadians(fmod(angle,360.0)));
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- if (*token == ',')
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- x=StringToDouble(token,&next_token);
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- if (*token == ',')
- (void) GetNextToken(p,&p,MagickPathExtent,token);
- y=StringToDouble(token,&next_token);
- affine.tx=svg_info->bounds.x+x*
- cos(DegreesToRadians(fmod(angle,360.0)))+y*
- sin(DegreesToRadians(fmod(angle,360.0)));
- affine.ty=svg_info->bounds.y-x*
- sin(DegreesToRadians(fmod(angle,360.0)))+y*
- cos(DegreesToRadians(fmod(angle,360.0)));
- affine.tx-=x;
- affine.ty-=y;
- break;
- }
- break;
- }
- case 'S':
- case 's':
- {
- if (LocaleCompare(keyword,"scale") == 0)
- {
- for (p=(const char *) value; *p != '\0'; p++)
- if ((isspace((int) ((unsigned char) *p)) != 0) ||
- (*p == ','))
- break;
- affine.sx=GetUserSpaceCoordinateValue(svg_info,1,value);
- affine.sy=affine.sx;
- if (*p != '\0')
- affine.sy=GetUserSpaceCoordinateValue(svg_info,-1,
- p+1);
- svg_info->scale[svg_info->n]=ExpandAffine(&affine);
- break;
- }
- if (LocaleCompare(keyword,"skewX") == 0)
- {
- affine.sx=svg_info->affine.sx;
- affine.ry=tan(DegreesToRadians(fmod(
- GetUserSpaceCoordinateValue(svg_info,1,value),
- 360.0)));
- affine.sy=svg_info->affine.sy;
- break;
- }
- if (LocaleCompare(keyword,"skewY") == 0)
- {
- affine.sx=svg_info->affine.sx;
- affine.rx=tan(DegreesToRadians(fmod(
- GetUserSpaceCoordinateValue(svg_info,-1,value),
- 360.0)));
- affine.sy=svg_info->affine.sy;
- break;
- }
- break;
- }
- case 'T':
- case 't':
- {
- if (LocaleCompare(keyword,"translate") == 0)
- {
- for (p=(const char *) value; *p != '\0'; p++)
- if ((isspace((int) ((unsigned char) *p)) != 0) ||
- (*p == ','))
- break;
- affine.tx=GetUserSpaceCoordinateValue(svg_info,1,value);
- affine.ty=0;
- if (*p != '\0')
- affine.ty=GetUserSpaceCoordinateValue(svg_info,-1,
- p+1);
- break;
- }
- break;
- }
- default:
- break;
- }
- transform.sx=affine.sx*current.sx+affine.ry*current.rx;
- transform.rx=affine.rx*current.sx+affine.sy*current.rx;
- transform.ry=affine.sx*current.ry+affine.ry*current.sy;
- transform.sy=affine.rx*current.ry+affine.sy*current.sy;
- transform.tx=affine.tx*current.sx+affine.ty*current.ry+
- current.tx;
- transform.ty=affine.tx*current.rx+affine.ty*current.sy+
- current.ty;
- }
- (void) FormatLocaleFile(svg_info->file,
- "affine %g %g %g %g %g %g\n",transform.sx,transform.rx,
- transform.ry,transform.sy,transform.tx,transform.ty);
- for (j=0; tokens[j] != (char *) NULL; j++)
- tokens[j]=DestroyString(tokens[j]);
- tokens=(char **) RelinquishMagickMemory(tokens);
- break;
- }
break;
}
case 'V':
@@ -2781,7 +2787,8 @@
if (LocaleCompare((const char *) name,"stop") == 0)
{
(void) FormatLocaleFile(svg_info->file,"stop-color \"%s\" %s\n",
- svg_info->stop_color,svg_info->offset);
+ svg_info->stop_color,svg_info->offset == (char *) NULL ? "100%" :
+ svg_info->offset);
break;
}
if (LocaleCompare((char *) name,"style") == 0)
@@ -3183,6 +3190,9 @@
char
filename[MagickPathExtent];
+ const char
+ *option;
+
FILE
*file;
@@ -3302,22 +3312,39 @@
ssize_t
y;
- svg_handle=rsvg_handle_new();
- if (svg_handle == (RsvgHandle *) NULL)
+ unsigned char
+ *buffer;
+
+ buffer=(unsigned char *) AcquireQuantumMemory(MagickMaxBufferExtent,
+ sizeof(*buffer));
+ if (buffer == (unsigned char *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+#if LIBRSVG_CHECK_VERSION(2,40,3)
+ option=GetImageOption(image_info,"svg:xml-parse-huge");
+ if ((option != (char *) NULL) && (IsStringTrue(option) != MagickFalse))
+ svg_handle=rsvg_handle_new_with_flags(RSVG_HANDLE_FLAG_UNLIMITED);
+ else
+#endif
+ svg_handle=rsvg_handle_new();
+ if (svg_handle == (RsvgHandle *) NULL)
+ {
+ buffer=(unsigned char *) RelinquishMagickMemory(buffer);
+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ }
rsvg_handle_set_base_uri(svg_handle,image_info->filename);
if ((fabs(image->resolution.x) > MagickEpsilon) &&
(fabs(image->resolution.y) > MagickEpsilon))
rsvg_handle_set_dpi_x_y(svg_handle,image->resolution.x,
image->resolution.y);
- while ((n=ReadBlob(image,MagickPathExtent-1,message)) != 0)
+ while ((n=ReadBlob(image,MagickMaxBufferExtent-1,buffer)) != 0)
{
- message[n]='\0';
+ buffer[n]='\0';
error=(GError *) NULL;
- (void) rsvg_handle_write(svg_handle,message,n,&error);
+ (void) rsvg_handle_write(svg_handle,buffer,n,&error);
if (error != (GError *) NULL)
g_error_free(error);
}
+ buffer=(unsigned char *) RelinquishMagickMemory(buffer);
error=(GError *) NULL;
rsvg_handle_close(svg_handle,&error);
if (error != (GError *) NULL)
@@ -3578,13 +3605,10 @@
message[n]='\0';
if (n > 0)
{
- const char
- *value;
-
svg_info->parser=xmlCreatePushParserCtxt(sax_handler,svg_info,(char *)
message,n,image->filename);
- value=GetImageOption(image_info,"svg:xml-parse-huge");
- if ((value != (char *) NULL) && (IsStringTrue(value) != MagickFalse))
+ option=GetImageOption(image_info,"svg:xml-parse-huge");
+ if ((option != (char *) NULL) && (IsStringTrue(option) != MagickFalse))
(void) xmlCtxtUseOptions(svg_info->parser,XML_PARSE_HUGE);
while ((n=ReadBlob(image,MagickPathExtent-1,message)) != 0)
{
@@ -3912,7 +3936,7 @@
{
#if defined(MAGICKCORE_AUTOTRACE_DELEGATE)
{
- at_bitmap_type
+ at_bitmap
*trace;
at_fitting_opts_type
diff --git a/coders/tga.c b/coders/tga.c
index f74819d..baa80b9 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -543,7 +543,7 @@
offset+=2;
else
offset++;
- if (offset >= image->rows)
+ if (offset >= (ssize_t) image->rows)
{
base++;
offset=base;
diff --git a/coders/tiff.c b/coders/tiff.c
index 211d82f..294af0a 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -115,13 +115,9 @@
*/
typedef enum
{
- ReadSingleSampleMethod,
- ReadRGBAMethod,
- ReadCMYKAMethod,
ReadYCCKMethod,
ReadStripMethod,
ReadTileMethod,
- ReadRGBATileMethod,
ReadGenericMethod
} TIFFMethodType;
@@ -671,24 +667,28 @@
return((toff_t) GetBlobSize((Image *) image));
}
-static void TIFFGetProfiles(TIFF *tiff,Image *image,ExceptionInfo *exception)
+static MagickBooleanType TIFFGetProfiles(TIFF *tiff,Image *image,
+ ExceptionInfo *exception)
{
+ MagickBooleanType
+ status;
+
uint32
- length;
+ length = 0;
unsigned char
- *profile;
+ *profile = (unsigned char *) NULL;
- length=0;
+ status=MagickTrue;
#if defined(TIFFTAG_ICCPROFILE)
if ((TIFFGetField(tiff,TIFFTAG_ICCPROFILE,&length,&profile) == 1) &&
(profile != (unsigned char *) NULL))
- (void) ReadProfile(image,"icc",profile,(ssize_t) length,exception);
+ status=ReadProfile(image,"icc",profile,(ssize_t) length,exception);
#endif
#if defined(TIFFTAG_PHOTOSHOP)
if ((TIFFGetField(tiff,TIFFTAG_PHOTOSHOP,&length,&profile) == 1) &&
(profile != (unsigned char *) NULL))
- (void) ReadProfile(image,"8bim",profile,(ssize_t) length,exception);
+ status=ReadProfile(image,"8bim",profile,(ssize_t) length,exception);
#endif
#if defined(TIFFTAG_RICHTIFFIPTC)
if ((TIFFGetField(tiff,TIFFTAG_RICHTIFFIPTC,&length,&profile) == 1) &&
@@ -696,7 +696,7 @@
{
if (TIFFIsByteSwapped(tiff) != 0)
TIFFSwabArrayOfLong((uint32 *) profile,(size_t) length);
- (void) ReadProfile(image,"iptc",profile,4L*length,exception);
+ status=ReadProfile(image,"iptc",profile,4L*length,exception);
}
#endif
#if defined(TIFFTAG_XMLPACKET)
@@ -706,7 +706,7 @@
StringInfo
*dng;
- (void) ReadProfile(image,"xmp",profile,(ssize_t) length,exception);
+ status=ReadProfile(image,"xmp",profile,(ssize_t) length,exception);
dng=BlobToStringInfo(profile,length);
if (dng != (StringInfo *) NULL)
{
@@ -721,97 +721,104 @@
#endif
if ((TIFFGetField(tiff,34118,&length,&profile) == 1) &&
(profile != (unsigned char *) NULL))
- (void) ReadProfile(image,"tiff:34118",profile,(ssize_t) length,
+ status=ReadProfile(image,"tiff:34118",profile,(ssize_t) length,
exception);
if ((TIFFGetField(tiff,37724,&length,&profile) == 1) &&
(profile != (unsigned char *) NULL))
- (void) ReadProfile(image,"tiff:37724",profile,(ssize_t) length,exception);
+ status=ReadProfile(image,"tiff:37724",profile,(ssize_t) length,exception);
+ return(status);
}
-static void TIFFGetProperties(TIFF *tiff,Image *image,ExceptionInfo *exception)
+static MagickBooleanType TIFFGetProperties(TIFF *tiff,Image *image,
+ ExceptionInfo *exception)
{
char
message[MagickPathExtent],
*text;
+ MagickBooleanType
+ status;
+
uint32
count,
type;
+ status=MagickTrue;
if ((TIFFGetField(tiff,TIFFTAG_ARTIST,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"tiff:artist",text,exception);
+ status=SetImageProperty(image,"tiff:artist",text,exception);
if ((TIFFGetField(tiff,TIFFTAG_COPYRIGHT,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"tiff:copyright",text,exception);
+ status=SetImageProperty(image,"tiff:copyright",text,exception);
if ((TIFFGetField(tiff,TIFFTAG_DATETIME,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"tiff:timestamp",text,exception);
+ status=SetImageProperty(image,"tiff:timestamp",text,exception);
if ((TIFFGetField(tiff,TIFFTAG_DOCUMENTNAME,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"tiff:document",text,exception);
+ status=SetImageProperty(image,"tiff:document",text,exception);
if ((TIFFGetField(tiff,TIFFTAG_HOSTCOMPUTER,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"tiff:hostcomputer",text,exception);
+ status=SetImageProperty(image,"tiff:hostcomputer",text,exception);
if ((TIFFGetField(tiff,TIFFTAG_IMAGEDESCRIPTION,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"comment",text,exception);
+ status=SetImageProperty(image,"comment",text,exception);
if ((TIFFGetField(tiff,TIFFTAG_MAKE,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"tiff:make",text,exception);
+ status=SetImageProperty(image,"tiff:make",text,exception);
if ((TIFFGetField(tiff,TIFFTAG_MODEL,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"tiff:model",text,exception);
+ status=SetImageProperty(image,"tiff:model",text,exception);
if ((TIFFGetField(tiff,TIFFTAG_OPIIMAGEID,&count,&text) == 1) &&
(text != (char *) NULL))
{
if (count >= MagickPathExtent)
count=MagickPathExtent-1;
(void) CopyMagickString(message,text,count+1);
- (void) SetImageProperty(image,"tiff:image-id",message,exception);
+ status=SetImageProperty(image,"tiff:image-id",message,exception);
}
if ((TIFFGetField(tiff,TIFFTAG_PAGENAME,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"label",text,exception);
+ status=SetImageProperty(image,"label",text,exception);
if ((TIFFGetField(tiff,TIFFTAG_SOFTWARE,&text) == 1) &&
(text != (char *) NULL))
- (void) SetImageProperty(image,"tiff:software",text,exception);
+ status=SetImageProperty(image,"tiff:software",text,exception);
if ((TIFFGetField(tiff,33423,&count,&text) == 1) && (text != (char *) NULL))
{
if (count >= MagickPathExtent)
count=MagickPathExtent-1;
(void) CopyMagickString(message,text,count+1);
- (void) SetImageProperty(image,"tiff:kodak-33423",message,exception);
+ status=SetImageProperty(image,"tiff:kodak-33423",message,exception);
}
if ((TIFFGetField(tiff,36867,&count,&text) == 1) && (text != (char *) NULL))
{
if (count >= MagickPathExtent)
count=MagickPathExtent-1;
(void) CopyMagickString(message,text,count+1);
- (void) SetImageProperty(image,"tiff:kodak-36867",message,exception);
+ status=SetImageProperty(image,"tiff:kodak-36867",message,exception);
}
if (TIFFGetField(tiff,TIFFTAG_SUBFILETYPE,&type) == 1)
switch (type)
{
case 0x01:
{
- (void) SetImageProperty(image,"tiff:subfiletype","REDUCEDIMAGE",
+ status=SetImageProperty(image,"tiff:subfiletype","REDUCEDIMAGE",
exception);
break;
}
case 0x02:
{
- (void) SetImageProperty(image,"tiff:subfiletype","PAGE",exception);
+ status=SetImageProperty(image,"tiff:subfiletype","PAGE",exception);
break;
}
case 0x04:
{
- (void) SetImageProperty(image,"tiff:subfiletype","MASK",exception);
+ status=SetImageProperty(image,"tiff:subfiletype","MASK",exception);
break;
}
default:
break;
}
+ return(status);
}
static void TIFFGetEXIFProperties(TIFF *tiff,Image *image,
@@ -1079,12 +1086,12 @@
*/
value=NULL;
if (!TIFFGetField(tiff,TIFFTAG_STRIPOFFSETS,&value) || (value == NULL))
- return(ReadRGBAMethod);
+ return(ReadStripMethod);
position=TellBlob(image);
offset=(MagickOffsetType) (value[0]);
if (SeekBlob(image,offset,SEEK_SET) != offset)
- return(ReadRGBAMethod);
- method=ReadRGBAMethod;
+ return(ReadStripMethod);
+ method=ReadStripMethod;
if (ReadBlob(image,BUFFER_SIZE,buffer) == BUFFER_SIZE)
{
for (i=0; i < BUFFER_SIZE; i++)
@@ -1543,8 +1550,18 @@
SetImageColorspace(image,CMYKColorspace,exception);
if (photometric == PHOTOMETRIC_CIELAB)
SetImageColorspace(image,LabColorspace,exception);
- TIFFGetProfiles(tiff,image,exception);
- TIFFGetProperties(tiff,image,exception);
+ status=TIFFGetProfiles(tiff,image,exception);
+ if (status == MagickFalse)
+ {
+ TIFFClose(tiff);
+ return(DestroyImageList(image));
+ }
+ status=TIFFGetProperties(tiff,image,exception);
+ if (status == MagickFalse)
+ {
+ TIFFClose(tiff);
+ return(DestroyImageList(image));
+ }
option=GetImageOption(image_info,"tiff:exif-properties");
if (IsStringFalse(option) == MagickFalse) /* enabled by default */
TIFFGetEXIFProperties(tiff,image,exception);
@@ -1789,44 +1806,21 @@
char
buffer[MagickPathExtent];
- method=ReadStripMethod;
(void) FormatLocaleString(buffer,MagickPathExtent,"%u",
(unsigned int) rows_per_strip);
(void) SetImageProperty(image,"tiff:rows-per-strip",buffer,exception);
+ method=ReadStripMethod;
+ if (rows_per_strip > (uint32) image->rows)
+ rows_per_strip=(uint32) image->rows;
}
- if (rows_per_strip > (uint32) image->rows)
- rows_per_strip=(uint32) image->rows;
- if ((samples_per_pixel >= 3) && (interlace == PLANARCONFIG_CONTIG))
- if ((image->alpha_trait == UndefinedPixelTrait) ||
- (samples_per_pixel >= 4))
- method=ReadRGBAMethod;
- if ((samples_per_pixel >= 4) && (interlace == PLANARCONFIG_SEPARATE))
- if ((image->alpha_trait == UndefinedPixelTrait) ||
- (samples_per_pixel >= 5))
- method=ReadCMYKAMethod;
- if ((photometric != PHOTOMETRIC_RGB) &&
- (photometric != PHOTOMETRIC_CIELAB) &&
- (photometric != PHOTOMETRIC_SEPARATED))
- method=ReadGenericMethod;
- if (image->storage_class == PseudoClass)
- method=ReadSingleSampleMethod;
- if ((photometric == PHOTOMETRIC_MINISBLACK) ||
- (photometric == PHOTOMETRIC_MINISWHITE))
- method=ReadSingleSampleMethod;
- if ((photometric != PHOTOMETRIC_SEPARATED) &&
- (interlace == PLANARCONFIG_SEPARATE) && (bits_per_sample < 64))
- method=ReadGenericMethod;
+ if (TIFFIsTiled(tiff) != MagickFalse)
+ method=ReadTileMethod;
if (image->compression == JPEGCompression)
method=GetJPEGMethod(image,tiff,photometric,bits_per_sample,
samples_per_pixel);
- if (compress_tag == COMPRESSION_JBIG)
- method=ReadStripMethod;
- if (TIFFIsTiled(tiff) != MagickFalse)
- {
- method=ReadRGBATileMethod;
- if (samples_per_pixel == 1)
- method=ReadTileMethod;
- }
+ if ((photometric == PHOTOMETRIC_LOGLUV) ||
+ (photometric == PHOTOMETRIC_YCBCR))
+ method=ReadGenericMethod;
quantum_info->endian=LSBEndian;
quantum_type=RGBQuantum;
if (TIFFScanlineSize(tiff) <= 0)
@@ -1841,69 +1835,20 @@
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
pixels=(unsigned char *) GetVirtualMemoryBlob(pixel_info);
(void) memset(pixels,0,number_pixels*sizeof(uint32));
- switch (method)
- {
- case ReadSingleSampleMethod:
+ quantum_type=IndexQuantum;
+ pad=(size_t) MagickMax((ssize_t) samples_per_pixel-1,0);
+ if (image->alpha_trait != UndefinedPixelTrait)
{
- /*
- Convert TIFF image to PseudoClass MIFF image.
- */
- quantum_type=IndexQuantum;
- pad=(size_t) MagickMax((ssize_t) samples_per_pixel-1,0);
- if (image->alpha_trait != UndefinedPixelTrait)
- {
- if (image->storage_class != PseudoClass)
- {
- quantum_type=samples_per_pixel == 1 ? AlphaQuantum :
- GrayAlphaQuantum;
- pad=(size_t) MagickMax((ssize_t) samples_per_pixel-2,0);
- }
- else
- {
- quantum_type=IndexAlphaQuantum;
- pad=(size_t) MagickMax((ssize_t) samples_per_pixel-2,0);
- }
- }
+ if (image->storage_class == PseudoClass)
+ quantum_type=IndexAlphaQuantum;
else
- if (image->storage_class != PseudoClass)
- {
- quantum_type=GrayQuantum;
- pad=(size_t) MagickMax((ssize_t) samples_per_pixel-1,0);
- }
- status=SetQuantumPad(image,quantum_info,pad*pow(2,ceil(log(
- bits_per_sample)/log(2))));
- if (status == MagickFalse)
- ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register Quantum
- *magick_restrict q;
-
- tiff_status=TIFFReadPixels(tiff,0,y,(char *) pixels);
- if (tiff_status == -1)
- break;
- q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (Quantum *) NULL)
- break;
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- quantum_type,pixels,exception);
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- if (image->previous == (Image *) NULL)
- {
- status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
- if (status == MagickFalse)
- break;
- }
- }
- break;
+ quantum_type=samples_per_pixel == 1 ? AlphaQuantum : GrayAlphaQuantum;
}
- case ReadRGBAMethod:
+ else
+ if (image->storage_class != PseudoClass)
+ quantum_type=GrayQuantum;
+ if ((samples_per_pixel > 2) && (interlace != PLANARCONFIG_SEPARATE))
{
- /*
- Convert TIFF image to DirectClass MIFF image.
- */
pad=(size_t) MagickMax((size_t) samples_per_pixel-3,0);
quantum_type=RGBQuantum;
if (image->alpha_trait != UndefinedPixelTrait)
@@ -1924,86 +1869,14 @@
status=SetQuantumPad(image,quantum_info,pad*((bits_per_sample+7) >> 3));
if (status == MagickFalse)
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register Quantum
- *magick_restrict q;
-
- tiff_status=TIFFReadPixels(tiff,0,y,(char *) pixels);
- if (tiff_status == -1)
- break;
- q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (Quantum *) NULL)
- break;
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- quantum_type,pixels,exception);
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- if (image->previous == (Image *) NULL)
- {
- status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
- if (status == MagickFalse)
- break;
- }
- }
- break;
}
- case ReadCMYKAMethod:
- {
- /*
- Convert TIFF image to DirectClass MIFF image.
- */
- for (i=0; i < (ssize_t) samples_per_pixel; i++)
- {
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register Quantum
- *magick_restrict q;
-
- tiff_status=TIFFReadPixels(tiff,(tsample_t) i,y,(char *)
- pixels);
- if (tiff_status == -1)
- break;
- q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (Quantum *) NULL)
- break;
- if (image->colorspace != CMYKColorspace)
- switch (i)
- {
- case 0: quantum_type=RedQuantum; break;
- case 1: quantum_type=GreenQuantum; break;
- case 2: quantum_type=BlueQuantum; break;
- case 3: quantum_type=AlphaQuantum; break;
- default: quantum_type=UndefinedQuantum; break;
- }
- else
- switch (i)
- {
- case 0: quantum_type=CyanQuantum; break;
- case 1: quantum_type=MagentaQuantum; break;
- case 2: quantum_type=YellowQuantum; break;
- case 3: quantum_type=BlackQuantum; break;
- case 4: quantum_type=AlphaQuantum; break;
- default: quantum_type=UndefinedQuantum; break;
- }
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- quantum_type,pixels,exception);
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- if (image->previous == (Image *) NULL)
- {
- status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
- if (status == MagickFalse)
- break;
- }
- }
- break;
- }
+ switch (method)
+ {
case ReadYCCKMethod:
{
+ /*
+ Convert YCC TIFF image.
+ */
for (y=0; y < (ssize_t) image->rows; y++)
{
register Quantum
@@ -2049,59 +1922,92 @@
}
case ReadStripMethod:
{
- register uint32
+ register unsigned char
*p;
+ size_t
+ extent;
+
+ ssize_t
+ stride,
+ strip_id;
+
+ tsize_t
+ strip_size;
+
+ unsigned char
+ *strip_pixels;
+
/*
- Convert stripped TIFF image to DirectClass MIFF image.
+ Convert stripped TIFF image.
*/
- (void) SetImageStorageClass(image,DirectClass,exception);
- i=0;
- p=(uint32 *) NULL;
- for (y=0; y < (ssize_t) image->rows; y++)
+ extent=TIFFStripSize(tiff)+sizeof(uint32);
+ strip_pixels=(unsigned char *) AcquireQuantumMemory(extent,
+ sizeof(*strip_pixels));
+ if (strip_pixels == (unsigned char *) NULL)
+ ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
+ (void) memset(strip_pixels,0,extent*sizeof(*strip_pixels));
+ stride=TIFFVStripSize(tiff,1);
+ strip_id=0;
+ p=strip_pixels;
+ for (i=0; i < (ssize_t) samples_per_pixel; i++)
{
- register ssize_t
- x;
+ size_t
+ rows_remaining;
- register Quantum
- *magick_restrict q;
-
- q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (Quantum *) NULL)
- break;
- if (i == 0)
- {
- if (TIFFReadRGBAStrip(tiff,(tstrip_t) y,(uint32 *) pixels) == 0)
- break;
- i=(ssize_t) MagickMin((ssize_t) rows_per_strip,(ssize_t)
- image->rows-y);
- }
- i--;
- p=((uint32 *) pixels)+image->columns*i;
- for (x=0; x < (ssize_t) image->columns; x++)
+ switch (i)
{
- SetPixelRed(image,ScaleCharToQuantum((unsigned char)
- (TIFFGetR(*p))),q);
- SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
- (TIFFGetG(*p))),q);
- SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
- (TIFFGetB(*p))),q);
- if (image->alpha_trait != UndefinedPixelTrait)
- SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
- (TIFFGetA(*p))),q);
- p++;
- q+=GetPixelChannels(image);
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- if (image->previous == (Image *) NULL)
+ case 0: break;
+ case 1: quantum_type=GreenQuantum; break;
+ case 2: quantum_type=BlueQuantum; break;
+ case 3:
{
- status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
- if (status == MagickFalse)
- break;
+ if (image->colorspace == CMYKColorspace)
+ quantum_type=BlackQuantum;
+ break;
}
+ case 4: quantum_type=AlphaQuantum; break;
+ }
+ rows_remaining=0;
+ for (y=0; y < (ssize_t) image->rows; y++)
+ {
+ register Quantum
+ *magick_restrict q;
+
+ q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ if (rows_remaining == 0)
+ {
+ strip_size=TIFFReadEncodedStrip(tiff,strip_id,strip_pixels,
+ TIFFStripSize(tiff));
+ if (strip_size == -1)
+ break;
+ rows_remaining=rows_per_strip;
+ if ((y+rows_per_strip) > image->rows)
+ rows_remaining=(rows_per_strip-(y+rows_per_strip-
+ image->rows));
+ p=strip_pixels;
+ strip_id++;
+ }
+ (void) ImportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,quantum_type,p,exception);
+ p+=stride;
+ rows_remaining--;
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ if (image->previous == (Image *) NULL)
+ {
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (status == MagickFalse)
+ break;
+ }
+ }
+ if ((samples_per_pixel > 1) && (interlace != PLANARCONFIG_SEPARATE))
+ break;
}
+ strip_pixels=(unsigned char *) RelinquishMagickMemory(strip_pixels);
break;
}
case ReadTileMethod:
@@ -2109,6 +2015,9 @@
register unsigned char
*p;
+ size_t
+ extent;
+
uint32
columns,
rows;
@@ -2117,204 +2026,91 @@
*tile_pixels;
/*
- Convert tiled TIFF image to DirectClass MIFF image.
+ Convert tiled TIFF image.
*/
- quantum_type=IndexQuantum;
- pad=(size_t) MagickMax((ssize_t) samples_per_pixel-1,0);
- if (image->alpha_trait != UndefinedPixelTrait)
- {
- if (image->storage_class != PseudoClass)
- {
- quantum_type=samples_per_pixel == 1 ? AlphaQuantum :
- GrayAlphaQuantum;
- pad=(size_t) MagickMax((ssize_t) samples_per_pixel-2,0);
- }
- else
- {
- quantum_type=IndexAlphaQuantum;
- pad=(size_t) MagickMax((ssize_t) samples_per_pixel-2,0);
- }
- }
- else
- if (image->storage_class != PseudoClass)
- {
- quantum_type=GrayQuantum;
- pad=(size_t) MagickMax((ssize_t) samples_per_pixel-1,0);
- }
- status=SetQuantumPad(image,quantum_info,pad*pow(2,ceil(log(
- bits_per_sample)/log(2))));
- if (status == MagickFalse)
- ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
if ((TIFFGetField(tiff,TIFFTAG_TILEWIDTH,&columns) != 1) ||
(TIFFGetField(tiff,TIFFTAG_TILELENGTH,&rows) != 1))
ThrowTIFFException(CoderError,"ImageIsNotTiled");
if ((AcquireMagickResource(WidthResource,columns) == MagickFalse) ||
(AcquireMagickResource(HeightResource,rows) == MagickFalse))
ThrowTIFFException(ImageError,"WidthOrHeightExceedsLimit");
- (void) SetImageStorageClass(image,DirectClass,exception);
number_pixels=(MagickSizeType) columns*rows;
if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
- tile_pixels=(unsigned char *) AcquireQuantumMemory(TIFFTileSize(tiff)+
- sizeof(uint32),sizeof(*tile_pixels));
+ extent=TIFFTileSize(tiff)+sizeof(uint32);
+ tile_pixels=(unsigned char *) AcquireQuantumMemory(extent,
+ sizeof(*tile_pixels));
if (tile_pixels == (unsigned char *) NULL)
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
(void) memset(tile_pixels,0,TIFFTileSize(tiff)*sizeof(*tile_pixels));
- for (y=0; y < (ssize_t) image->rows; y+=rows)
+ for (i=0; i < (ssize_t) samples_per_pixel; i++)
{
- register ssize_t
- x;
-
- size_t
- rows_remaining;
-
- rows_remaining=image->rows-y;
- if ((ssize_t) (y+rows) < (ssize_t) image->rows)
- rows_remaining=rows;
- for (x=0; x < (ssize_t) image->columns; x+=columns)
+ switch (i)
{
- size_t
- columns_remaining,
- row;
-
- columns_remaining=image->columns-x;
- if ((ssize_t) (x+columns) < (ssize_t) image->columns)
- columns_remaining=columns;
- if (TIFFReadTile(tiff,tile_pixels,(uint32) x,(uint32) y,0,0) == 0)
+ case 0: break;
+ case 1: quantum_type=GreenQuantum; break;
+ case 2: quantum_type=BlueQuantum; break;
+ case 3:
+ {
+ if (image->colorspace == CMYKColorspace)
+ quantum_type=BlackQuantum;
break;
- p=tile_pixels;
- for (row=0; row < rows_remaining; row++)
- {
- register Quantum
- *magick_restrict q;
-
- q=GetAuthenticPixels(image,x,y+row,columns_remaining,1,exception);
- if (q == (Quantum *) NULL)
- break;
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- quantum_type,p,exception);
- p+=TIFFTileRowSize(tiff);
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
}
+ case 4: quantum_type=AlphaQuantum; break;
}
- if (image->previous == (Image *) NULL)
+ for (y=0; y < (ssize_t) image->rows; y+=rows)
+ {
+ register ssize_t
+ x;
+
+ size_t
+ rows_remaining;
+
+ rows_remaining=image->rows-y;
+ if ((ssize_t) (y+rows) < (ssize_t) image->rows)
+ rows_remaining=rows;
+ for (x=0; x < (ssize_t) image->columns; x+=columns)
{
- status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
- if (status == MagickFalse)
+ size_t
+ columns_remaining,
+ row;
+
+ columns_remaining=image->columns-x;
+ if ((ssize_t) (x+columns) < (ssize_t) image->columns)
+ columns_remaining=columns;
+ if (TIFFReadTile(tiff,tile_pixels,(uint32) x,(uint32) y,0,i) == 0)
break;
+ p=tile_pixels;
+ for (row=0; row < rows_remaining; row++)
+ {
+ register Quantum
+ *magick_restrict q;
+
+ q=GetAuthenticPixels(image,x,y+row,columns_remaining,1,
+ exception);
+ if (q == (Quantum *) NULL)
+ break;
+ (void) ImportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,quantum_type,p,exception);
+ p+=TIFFTileRowSize(tiff);
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
}
+ if (image->previous == (Image *) NULL)
+ {
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (status == MagickFalse)
+ break;
+ }
+ }
+ if ((samples_per_pixel > 1) && (interlace != PLANARCONFIG_SEPARATE))
+ break;
}
tile_pixels=(unsigned char *) RelinquishMagickMemory(tile_pixels);
break;
}
- case ReadRGBATileMethod:
- {
- register uint32
- *p;
-
- uint32
- *tile_pixels,
- columns,
- rows;
-
- /*
- Convert tiled TIFF image to DirectClass MIFF image.
- */
- if ((TIFFGetField(tiff,TIFFTAG_TILEWIDTH,&columns) != 1) ||
- (TIFFGetField(tiff,TIFFTAG_TILELENGTH,&rows) != 1))
- ThrowTIFFException(CoderError,"ImageIsNotTiled");
- if ((AcquireMagickResource(WidthResource,columns) == MagickFalse) ||
- (AcquireMagickResource(HeightResource,rows) == MagickFalse))
- ThrowTIFFException(ImageError,"WidthOrHeightExceedsLimit");
- (void) SetImageStorageClass(image,DirectClass,exception);
- number_pixels=(MagickSizeType) columns*rows;
- if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
- ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
- tile_pixels=(uint32 *) AcquireQuantumMemory(columns,rows*
- sizeof(*tile_pixels));
- if (tile_pixels == (uint32 *) NULL)
- ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
- for (y=0; y < (ssize_t) image->rows; y+=rows)
- {
- register ssize_t
- x;
-
- register Quantum
- *magick_restrict q,
- *magick_restrict tile;
-
- size_t
- columns_remaining,
- rows_remaining;
-
- rows_remaining=image->rows-y;
- if ((ssize_t) (y+rows) < (ssize_t) image->rows)
- rows_remaining=rows;
- tile=QueueAuthenticPixels(image,0,y,image->columns,rows_remaining,
- exception);
- if (tile == (Quantum *) NULL)
- break;
- for (x=0; x < (ssize_t) image->columns; x+=columns)
- {
- size_t
- column,
- row;
-
- if (TIFFReadRGBATile(tiff,(uint32) x,(uint32) y,tile_pixels) == 0)
- break;
- columns_remaining=image->columns-x;
- if ((ssize_t) (x+columns) < (ssize_t) image->columns)
- columns_remaining=columns;
- p=tile_pixels+(rows-rows_remaining)*columns;
- q=tile+GetPixelChannels(image)*(image->columns*(rows_remaining-1)+
- x);
- for (row=rows_remaining; row > 0; row--)
- {
- if (image->alpha_trait != UndefinedPixelTrait)
- for (column=columns_remaining; column > 0; column--)
- {
- SetPixelRed(image,ScaleCharToQuantum((unsigned char)
- TIFFGetR(*p)),q);
- SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
- TIFFGetG(*p)),q);
- SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
- TIFFGetB(*p)),q);
- SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
- TIFFGetA(*p)),q);
- p++;
- q+=GetPixelChannels(image);
- }
- else
- for (column=columns_remaining; column > 0; column--)
- {
- SetPixelRed(image,ScaleCharToQuantum((unsigned char)
- TIFFGetR(*p)),q);
- SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
- TIFFGetG(*p)),q);
- SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
- TIFFGetB(*p)),q);
- p++;
- q+=GetPixelChannels(image);
- }
- p+=columns-columns_remaining;
- q-=GetPixelChannels(image)*(image->columns+columns_remaining);
- }
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- if (image->previous == (Image *) NULL)
- {
- status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
- if (status == MagickFalse)
- break;
- }
- }
- tile_pixels=(uint32 *) RelinquishMagickMemory(tile_pixels);
- break;
- }
case ReadGenericMethod:
default:
{
@@ -2328,9 +2124,8 @@
*pixels;
/*
- Convert TIFF image to DirectClass MIFF image.
+ Convert generic TIFF image.
*/
- (void) SetImageStorageClass(image,DirectClass,exception);
if (HeapOverflowSanityCheck(image->rows,sizeof(*pixels)) != MagickFalse)
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
number_pixels=(MagickSizeType) image->columns*image->rows;
@@ -2340,9 +2135,6 @@
pixels=(uint32 *) GetVirtualMemoryBlob(generic_info);
(void) TIFFReadRGBAImage(tiff,(uint32) image->columns,(uint32)
image->rows,(uint32 *) pixels,0);
- /*
- Convert image to DirectClass pixel packets.
- */
p=pixels+number_pixels-1;
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -3099,6 +2891,8 @@
static MagickBooleanType GetTIFFInfo(const ImageInfo *image_info,
TIFF *tiff,TIFFInfo *tiff_info)
{
+#define TIFFStripSizeDefault 1048576
+
const char
*option;
@@ -3114,16 +2908,22 @@
option=GetImageOption(image_info,"tiff:tile-geometry");
if (option == (const char *) NULL)
{
+ size_t
+ extent;
+
uint32
+ rows,
rows_per_strip;
- rows_per_strip=0; /* use default */
+ extent=TIFFScanlineSize(tiff);
+ rows_per_strip=TIFFStripSizeDefault/(extent == 0 ? 1 : extent);
+ rows_per_strip=16*(((rows_per_strip < 16 ? 16 : rows_per_strip)+1)/16);
+ TIFFGetField(tiff,TIFFTAG_IMAGELENGTH,&rows);
+ if (rows_per_strip > rows)
+ rows_per_strip=rows;
option=GetImageOption(image_info,"tiff:rows-per-strip");
if (option != (const char *) NULL)
- rows_per_strip=(size_t) strtol(option,(char **) NULL,10);
- else
- if (TIFFGetField(tiff,TIFFTAG_IMAGELENGTH,&rows_per_strip) == 0)
- rows_per_strip=0;
+ rows_per_strip=(uint32) strtoul(option,(char **) NULL,10);
rows_per_strip=TIFFDefaultStripSize(tiff,rows_per_strip);
(void) TIFFSetField(tiff,TIFFTAG_ROWSPERSTRIP,rows_per_strip);
return(MagickTrue);
@@ -3825,7 +3625,7 @@
{
(void) ThrowMagickException(exception,GetMagickModule(),CoderError,
"CompressionNotSupported","`%s'",CommandOptionToMnemonic(
- MagickCompressOptions,(ssize_t) compression));
+ MagickCompressOptions,(ssize_t) compression));
compress_tag=COMPRESSION_NONE;
compression=NoCompression;
break;
@@ -4211,6 +4011,8 @@
*/
if (GetTIFFInfo(image_info,tiff,&tiff_info) == MagickFalse)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
+ if (compress_tag == COMPRESSION_CCITTFAX4)
+ (void) TIFFSetField(tiff,TIFFTAG_ROWSPERSTRIP,(uint32) image->rows);
quantum_info->endian=LSBEndian;
pixels=(unsigned char *) GetQuantumPixels(quantum_info);
tiff_info.scanline=(unsigned char *) GetQuantumPixels(quantum_info);
diff --git a/coders/txt.c b/coders/txt.c
index eb0c1d3..a835784 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -609,7 +609,8 @@
} while (LocaleNCompare((char *) text,MagickTXTID,strlen(MagickTXTID)) == 0);
(void) CloseBlob(image);
if (status == MagickFalse)
- return(DestroyImageList(image));
+ (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageWarning,
+ "InsufficientImageDataInFile","`%s'",image->filename);
return(GetFirstImageInList(image));
}
diff --git a/coders/webp.c b/coders/webp.c
index d4b704c..b8bbc75 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -645,7 +645,9 @@
#endif
entry->mime_type=ConstantString("image/webp");
entry->flags|=CoderDecoderSeekableStreamFlag;
- entry->flags|=CoderAdjoinFlag;
+#if !defined(MAGICKCORE_WEBPMUX_DELEGATE)
+ entry->flags^=CoderAdjoinFlag;
+#endif
entry->magick=(IsImageFormatHandler *) IsWEBP;
if (*version != '\0')
entry->version=ConstantString(version);
diff --git a/coders/xbm.c b/coders/xbm.c
index 7570d0c..cbad3f0 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -573,7 +573,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
byte>>=1;
- if (GetPixelLuma(image,p) > (QuantumRange/2))
+ if (GetPixelLuma(image,p) < (QuantumRange/2))
byte|=0x80;
bit++;
if (bit == 8)
diff --git a/config/config.h.in b/config/config.h.in
index ca34a48..f86a060 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the `acosh' function. */
#undef HAVE_ACOSH
+/* Define to 1 if you have the `aligned_malloc' function. */
+#undef HAVE_ALIGNED_MALLOC
+
/* Define to 1 if you have the <arm/limits.h> header file. */
#undef HAVE_ARM_LIMITS_H
diff --git a/config/configure.xml b/config/configure.xml
index f267a1b..8b38bd7 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,41 +10,41 @@
ImageMagick build configuration.
-->
<configuremap>
- <configure name="CC" value="/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang"/>
+ <configure name="CC" value="/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang"/>
<configure name="CFLAGS" value=" -fopenmp -fPIE -fPIC -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"/>
- <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-7.0.9/modules-Q16HDRI/coders"/>
+ <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders"/>
<configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick-7/"/>
- <configure name="CONFIGURE" value="./configure '--host=x86_64-linux-android' '--without-zlib' 'host_alias=x86_64-linux-android' 'CC=/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'LDFLAGS=-pie' 'CXX=/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++'"/>
+ <configure name="CONFIGURE" value="./configure '--host=x86_64-linux-android' '--without-zlib' 'host_alias=x86_64-linux-android' 'CC=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'LDFLAGS=-pie' 'CXX=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++'"/>
<configure name="COPYRIGHT" value="Copyright (C) 1999-2020 ImageMagick Studio LLC"/>
<configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick-7"/>
<configure name="CXXFLAGS" value="-g -O2 -pthread"/>
- <configure name="CXX" value="/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++"/>
+ <configure name="CXX" value="/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++"/>
<configure name="DEFS" value="-DHAVE_CONFIG_H"/>
<configure name="DELEGATES" value="mpeg ps"/>
- <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'CXX=/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++' 'LDFLAGS=-pie' --disable-deprecated --with-quantum-depth=16 --with-jemalloc=no --with-umem=no --with-zlib=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-rsvg=no --with-perl=no "/>
+ <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'CXX=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++' 'LDFLAGS=-pie' --disable-deprecated --with-quantum-depth=16 --with-jemalloc=no --with-umem=no --with-zlib=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-rsvg=no --with-perl=no "/>
<configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-7"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
<configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
<configure name="FEATURES" value="DPC HDRI Cipher OpenMP"/>
- <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-7.0.9/modules-Q16HDRI/filters"/>
- <configure name="GIT_REVISION" value="16588:7fdd47ede:20191227" />
+ <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-7.0.10/modules-Q16HDRI/filters"/>
+ <configure name="GIT_REVISION" value="17025:00c3687cc:20200307" />
<configure name="HOST" value="x86_64-pc-linux-android"/>
<configure name="INCLUDE_PATH" value="/usr/local/include/ImageMagick-7"/>
<configure name="LDFLAGS" value="-L/usr/local/lib -pie"/>
- <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.9"/>
+ <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.10"/>
<configure name="LIBS" value=" -lm "/>
- <configure name="LIB_VERSION_NUMBER" value="7,0,9,13"/>
- <configure name="LIB_VERSION" value="0x709"/>
+ <configure name="LIB_VERSION_NUMBER" value="7,0,10,1"/>
+ <configure name="LIB_VERSION" value="0x70A"/>
<configure name="NAME" value="ImageMagick"/>
<configure name="PCFLAGS" value="-fopenmp -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="QuantumDepth" value="16"/>
- <configure name="RELEASE_DATE" value="2019-12-29"/>
- <configure name="SHAREARCH_PATH" value="/usr/local/lib/ImageMagick-7.0.9/config-Q16HDRI"/>
+ <configure name="RELEASE_DATE" value="2020-03-09"/>
+ <configure name="SHAREARCH_PATH" value="/usr/local/lib/ImageMagick-7.0.10/config-Q16HDRI"/>
<configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-7"/>
<configure name="TARGET_CPU" value="x86_64"/>
<configure name="TARGET_OS" value="linux-android"/>
<configure name="TARGET_VENDOR" value="pc"/>
- <configure name="VERSION" value="7.0.9"/>
+ <configure name="VERSION" value="7.0.10"/>
<configure name="WEBSITE" value="https://imagemagick.org"/>
</configuremap>
diff --git a/config/delegates.xml.in b/config/delegates.xml.in
index c12eeca..442fa1a 100644
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -110,7 +110,8 @@
<delegate decode="shtml" command=""@HTMLDecodeDelegate@" -U -o "%o" "%i""/>
<delegate decode="sid" command=""@MrSIDDecodeDelegate@" -if sid -i "%i" -of tif -o "%o" > "%u""/>
<delegate decode="svg" command=""@RSVGDecodeDelegate@" -o "%o" "%i""/>
- <delegate decode="svg:decode" stealth="True" command=""@SVGDecodeDelegate@" "%s" --export-png="%s" --export-dpi="%s" --export-background="%s" --export-background-opacity="%s" > "%s" 2>&1"/>
+ <!-- Change export-file to export-png for inkscape < 1.0 -->
+ <delegate decode="svg:decode" stealth="True" command=""@SVGDecodeDelegate@" "%s" --export-file="%s" --export-dpi="%s" --export-background="%s" --export-background-opacity="%s" > "%s" 2>&1"/>
<delegate decode="tiff" encode="launch" mode="encode" command=""@LaunchDelegate@" "%i""/>
<delegate decode="wdp" command="@MVDelegate@ "%i" "%i.jxr"; "@JXRDecodeDelegate@" -i "%i.jxr" -o "%o.bmp"; @MVDelegate@ "%i.jxr" "%i"; @MVDelegate@ "%o.bmp" "%o""/>
<delegate decode="webp" command=""@WebPDecodeDelegate@" -pam "%i" -o "%o""/>
diff --git a/config/english.xml b/config/english.xml
index a0ea781..d38285b 100644
--- a/config/english.xml
+++ b/config/english.xml
@@ -776,6 +776,9 @@
<message name="UnbalancedParenthesis">
unbalanced parenthesis
</message>
+ <message name="UndefinedVariable">
+ undefined variable
+ </message>
<message name="UnrecognizedAttribute">
unrecognized attribute
</message>
@@ -996,6 +999,9 @@
<message name="NoSuchElement">
no such element in list
</message>
+ <message name="SetReadOnlyProperty">
+ attempt to set read-only property
+ </message>
<message name="UnknownImageProperty">
unknown image property
</message>
diff --git a/config/francais.xml b/config/francais.xml
index b74ac2b..66c82ef 100644
--- a/config/francais.xml
+++ b/config/francais.xml
@@ -737,9 +737,6 @@
<message name="ReferenceIsNotMyType">
référence de type erroné
</message>
- <message name="SetReadOnlyProperty">
- tenter d'établir propriété en lecture seule
- </message>
<message name="SteganoImageRequired">
image stégano requise
</message>
@@ -770,6 +767,9 @@
<message name="UnbalancedParenthesis">
parenthèse non fermée
</message>
+ <message name="UndefinedVariable">
+ undefined variable
+ </message>
<message name="UnrecognizedAttribute">
attribut non reconnu
</message>
@@ -987,6 +987,9 @@
<message name="NoSuchElement">
élément absent de la liste
</message>
+ <message name="SetReadOnlyProperty">
+ tenter d'établir propriété en lecture seule
+ </message>
<message name="UnknownImageProperty">
image propriété non reconnus
</message>
diff --git a/config/locale.md b/config/locale.md
index 6d79bfc..1207ccf 100644
--- a/config/locale.md
+++ b/config/locale.md
@@ -11,6 +11,6 @@
impossible d'ouvrir l'image
</message>
```
-in French. You then need to copy the _locale_.xml to the same location as `english.xml`, e.g. `/usr/local/ImageMagick-7/_locale_.xml`. Make sure your your _locale_.xml file is referenced in the `locale.xml` configuration file.
+in French. You then need to copy the _locale_.xml to the same location as `english.xml`, e.g. `/usr/local/ImageMagick-7/_locale_.xml`. Make sure your _locale_.xml file is referenced in the `locale.xml` configuration file.
The final step is to contribute _locale_.xml to ImageMagick so we can include it in a future release of ImageMagick so the community can benefit from the translation.
diff --git a/configs/arm/MagickCore/magick-baseconfig.h b/configs/arm/MagickCore/magick-baseconfig.h
index 76f74db..c6c11ff 100644
--- a/configs/arm/MagickCore/magick-baseconfig.h
+++ b/configs/arm/MagickCore/magick-baseconfig.h
@@ -96,6 +96,9 @@
#define MAGICKCORE_HAVE_ACOSH 1
#endif
+/* Define to 1 if you have the `aligned_malloc' function. */
+/* #undef HAVE_ALIGNED_MALLOC */
+
/* Define to 1 if you have the <arm/limits.h> header file. */
/* #undef HAVE_ARM_LIMITS_H */
@@ -307,6 +310,11 @@
#define MAGICKCORE_HAVE_GETPID 1
#endif
+/* Define to 1 if you have the `getpwnam_r' function. */
+#ifndef MAGICKCORE_HAVE_GETPWNAM_R
+#define MAGICKCORE_HAVE_GETPWNAM_R 1
+#endif
+
/* Define to 1 if you have the `getrlimit' function. */
#ifndef MAGICKCORE_HAVE_GETRLIMIT
#define MAGICKCORE_HAVE_GETRLIMIT 1
@@ -1082,13 +1090,13 @@
/* Directory where architecture-dependent files live. */
#ifndef MAGICKCORE_LIBRARY_PATH
-#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.9/"
+#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.10/"
#endif
/* Subdirectory of lib where ImageMagick architecture dependent files are
installed. */
#ifndef MAGICKCORE_LIBRARY_RELATIVE_PATH
-#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.9"
+#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.10"
#endif
/* Binaries in libraries path base name (will be during install linked to bin)
@@ -1170,7 +1178,7 @@
/* Define to the full name and version of this package. */
#ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.9-13"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.10-1"
#endif
/* Define to the one symbol short name of this package. */
@@ -1185,7 +1193,7 @@
/* Define to the version of this package. */
#ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "7.0.9-13"
+#define MAGICKCORE_PACKAGE_VERSION "7.0.10-1"
#endif
/* Define if you have PANGOCAIRO library */
@@ -1343,7 +1351,7 @@
/* Version number of package */
#ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.0.9-13"
+#define MAGICKCORE_VERSION "7.0.10-1"
#endif
/* Define if you have WEBPMUX library */
diff --git a/configs/arm/MagickCore/version.h b/configs/arm/MagickCore/version.h
index 3b68a9f..4eb45fd 100644
--- a/configs/arm/MagickCore/version.h
+++ b/configs/arm/MagickCore/version.h
@@ -27,10 +27,10 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "© 1999-2020 ImageMagick Studio LLC"
-#define MagickLibVersion 0x709
-#define MagickLibVersionText "7.0.9"
+#define MagickLibVersion 0x70A
+#define MagickLibVersionText "7.0.10"
#define MagickLibVersionNumber 7,0,0
-#define MagickLibAddendum "-13"
+#define MagickLibAddendum "-1"
#define MagickLibInterface 7
#define MagickLibMinInterface 7
#if defined(_WINDOWS)
@@ -42,12 +42,12 @@
#else
#define MagickPlatform "arm"
#endif
-#define MagickppLibVersionText "7.0.9"
+#define MagickppLibVersionText "7.0.10"
#define MagickppLibVersionNumber 4:0:0
-#define MagickppLibAddendum "-13"
+#define MagickppLibAddendum "-1"
#define MagickppLibInterface 4
#define MagickppLibMinInterface 4
-#define MagickReleaseDate "2019-12-29"
+#define MagickReleaseDate "2020-03-09"
#define MagickAuthoritativeLicense \
"https://imagemagick.org/script/license.php"
#define MagickAuthoritativeURL "https://imagemagick.org"
diff --git a/configs/arm64/MagickCore/magick-baseconfig.h b/configs/arm64/MagickCore/magick-baseconfig.h
index 75961aa..dfba173 100644
--- a/configs/arm64/MagickCore/magick-baseconfig.h
+++ b/configs/arm64/MagickCore/magick-baseconfig.h
@@ -96,6 +96,9 @@
#define MAGICKCORE_HAVE_ACOSH 1
#endif
+/* Define to 1 if you have the `aligned_malloc' function. */
+/* #undef HAVE_ALIGNED_MALLOC */
+
/* Define to 1 if you have the <arm/limits.h> header file. */
/* #undef HAVE_ARM_LIMITS_H */
@@ -307,6 +310,11 @@
#define MAGICKCORE_HAVE_GETPID 1
#endif
+/* Define to 1 if you have the `getpwnam_r' function. */
+#ifndef MAGICKCORE_HAVE_GETPWNAM_R
+#define MAGICKCORE_HAVE_GETPWNAM_R 1
+#endif
+
/* Define to 1 if you have the `getrlimit' function. */
#ifndef MAGICKCORE_HAVE_GETRLIMIT
#define MAGICKCORE_HAVE_GETRLIMIT 1
@@ -1082,13 +1090,13 @@
/* Directory where architecture-dependent files live. */
#ifndef MAGICKCORE_LIBRARY_PATH
-#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.9/"
+#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.10/"
#endif
/* Subdirectory of lib where ImageMagick architecture dependent files are
installed. */
#ifndef MAGICKCORE_LIBRARY_RELATIVE_PATH
-#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.9"
+#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.10"
#endif
/* Binaries in libraries path base name (will be during install linked to bin)
@@ -1170,7 +1178,7 @@
/* Define to the full name and version of this package. */
#ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.9-13"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.10-1"
#endif
/* Define to the one symbol short name of this package. */
@@ -1185,7 +1193,7 @@
/* Define to the version of this package. */
#ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "7.0.9-13"
+#define MAGICKCORE_PACKAGE_VERSION "7.0.10-1"
#endif
/* Define if you have PANGOCAIRO library */
@@ -1343,7 +1351,7 @@
/* Version number of package */
#ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.0.9-13"
+#define MAGICKCORE_VERSION "7.0.10-1"
#endif
/* Define if you have WEBPMUX library */
diff --git a/configs/arm64/MagickCore/version.h b/configs/arm64/MagickCore/version.h
index bf043b0..a9991a9 100644
--- a/configs/arm64/MagickCore/version.h
+++ b/configs/arm64/MagickCore/version.h
@@ -27,10 +27,10 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "© 1999-2020 ImageMagick Studio LLC"
-#define MagickLibVersion 0x709
-#define MagickLibVersionText "7.0.9"
+#define MagickLibVersion 0x70A
+#define MagickLibVersionText "7.0.10"
#define MagickLibVersionNumber 7,0,0
-#define MagickLibAddendum "-13"
+#define MagickLibAddendum "-1"
#define MagickLibInterface 7
#define MagickLibMinInterface 7
#if defined(_WINDOWS)
@@ -42,12 +42,12 @@
#else
#define MagickPlatform "aarch64"
#endif
-#define MagickppLibVersionText "7.0.9"
+#define MagickppLibVersionText "7.0.10"
#define MagickppLibVersionNumber 4:0:0
-#define MagickppLibAddendum "-13"
+#define MagickppLibAddendum "-1"
#define MagickppLibInterface 4
#define MagickppLibMinInterface 4
-#define MagickReleaseDate "2019-12-29"
+#define MagickReleaseDate "2020-03-09"
#define MagickAuthoritativeLicense \
"https://imagemagick.org/script/license.php"
#define MagickAuthoritativeURL "https://imagemagick.org"
diff --git a/configs/x86-64/MagickCore/magick-baseconfig.h b/configs/x86-64/MagickCore/magick-baseconfig.h
index 3971c9f..283addc 100644
--- a/configs/x86-64/MagickCore/magick-baseconfig.h
+++ b/configs/x86-64/MagickCore/magick-baseconfig.h
@@ -96,6 +96,9 @@
#define MAGICKCORE_HAVE_ACOSH 1
#endif
+/* Define to 1 if you have the `aligned_malloc' function. */
+/* #undef HAVE_ALIGNED_MALLOC */
+
/* Define to 1 if you have the <arm/limits.h> header file. */
/* #undef HAVE_ARM_LIMITS_H */
@@ -307,6 +310,11 @@
#define MAGICKCORE_HAVE_GETPID 1
#endif
+/* Define to 1 if you have the `getpwnam_r' function. */
+#ifndef MAGICKCORE_HAVE_GETPWNAM_R
+#define MAGICKCORE_HAVE_GETPWNAM_R 1
+#endif
+
/* Define to 1 if you have the `getrlimit' function. */
#ifndef MAGICKCORE_HAVE_GETRLIMIT
#define MAGICKCORE_HAVE_GETRLIMIT 1
@@ -1082,13 +1090,13 @@
/* Directory where architecture-dependent files live. */
#ifndef MAGICKCORE_LIBRARY_PATH
-#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.9/"
+#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.10/"
#endif
/* Subdirectory of lib where ImageMagick architecture dependent files are
installed. */
#ifndef MAGICKCORE_LIBRARY_RELATIVE_PATH
-#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.9"
+#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.10"
#endif
/* Binaries in libraries path base name (will be during install linked to bin)
@@ -1170,7 +1178,7 @@
/* Define to the full name and version of this package. */
#ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.9-13"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.10-1"
#endif
/* Define to the one symbol short name of this package. */
@@ -1185,7 +1193,7 @@
/* Define to the version of this package. */
#ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "7.0.9-13"
+#define MAGICKCORE_PACKAGE_VERSION "7.0.10-1"
#endif
/* Define if you have PANGOCAIRO library */
@@ -1343,7 +1351,7 @@
/* Version number of package */
#ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.0.9-13"
+#define MAGICKCORE_VERSION "7.0.10-1"
#endif
/* Define if you have WEBPMUX library */
diff --git a/configs/x86-64/MagickCore/version.h b/configs/x86-64/MagickCore/version.h
index 7aa3716..bdf7ade 100644
--- a/configs/x86-64/MagickCore/version.h
+++ b/configs/x86-64/MagickCore/version.h
@@ -27,10 +27,10 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "© 1999-2020 ImageMagick Studio LLC"
-#define MagickLibVersion 0x709
-#define MagickLibVersionText "7.0.9"
+#define MagickLibVersion 0x70A
+#define MagickLibVersionText "7.0.10"
#define MagickLibVersionNumber 7,0,0
-#define MagickLibAddendum "-13"
+#define MagickLibAddendum "-1"
#define MagickLibInterface 7
#define MagickLibMinInterface 7
#if defined(_WINDOWS)
@@ -42,12 +42,12 @@
#else
#define MagickPlatform "x86_64"
#endif
-#define MagickppLibVersionText "7.0.9"
+#define MagickppLibVersionText "7.0.10"
#define MagickppLibVersionNumber 4:0:0
-#define MagickppLibAddendum "-13"
+#define MagickppLibAddendum "-1"
#define MagickppLibInterface 4
#define MagickppLibMinInterface 4
-#define MagickReleaseDate "2019-12-29"
+#define MagickReleaseDate "2020-03-09"
#define MagickAuthoritativeLicense \
"https://imagemagick.org/script/license.php"
#define MagickAuthoritativeURL "https://imagemagick.org"
diff --git a/configs/x86/MagickCore/magick-baseconfig.h b/configs/x86/MagickCore/magick-baseconfig.h
index 36ed06a..f5f76b7 100644
--- a/configs/x86/MagickCore/magick-baseconfig.h
+++ b/configs/x86/MagickCore/magick-baseconfig.h
@@ -96,6 +96,9 @@
#define MAGICKCORE_HAVE_ACOSH 1
#endif
+/* Define to 1 if you have the `aligned_malloc' function. */
+/* #undef HAVE_ALIGNED_MALLOC */
+
/* Define to 1 if you have the <arm/limits.h> header file. */
/* #undef HAVE_ARM_LIMITS_H */
@@ -307,6 +310,11 @@
#define MAGICKCORE_HAVE_GETPID 1
#endif
+/* Define to 1 if you have the `getpwnam_r' function. */
+#ifndef MAGICKCORE_HAVE_GETPWNAM_R
+#define MAGICKCORE_HAVE_GETPWNAM_R 1
+#endif
+
/* Define to 1 if you have the `getrlimit' function. */
#ifndef MAGICKCORE_HAVE_GETRLIMIT
#define MAGICKCORE_HAVE_GETRLIMIT 1
@@ -1082,13 +1090,13 @@
/* Directory where architecture-dependent files live. */
#ifndef MAGICKCORE_LIBRARY_PATH
-#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.9/"
+#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.10/"
#endif
/* Subdirectory of lib where ImageMagick architecture dependent files are
installed. */
#ifndef MAGICKCORE_LIBRARY_RELATIVE_PATH
-#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.9"
+#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.10"
#endif
/* Binaries in libraries path base name (will be during install linked to bin)
@@ -1170,7 +1178,7 @@
/* Define to the full name and version of this package. */
#ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.9-13"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.10-1"
#endif
/* Define to the one symbol short name of this package. */
@@ -1185,7 +1193,7 @@
/* Define to the version of this package. */
#ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "7.0.9-13"
+#define MAGICKCORE_PACKAGE_VERSION "7.0.10-1"
#endif
/* Define if you have PANGOCAIRO library */
@@ -1343,7 +1351,7 @@
/* Version number of package */
#ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.0.9-13"
+#define MAGICKCORE_VERSION "7.0.10-1"
#endif
/* Define if you have WEBPMUX library */
diff --git a/configs/x86/MagickCore/version.h b/configs/x86/MagickCore/version.h
index 1eecf04..4ae65ab 100644
--- a/configs/x86/MagickCore/version.h
+++ b/configs/x86/MagickCore/version.h
@@ -27,10 +27,10 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "© 1999-2020 ImageMagick Studio LLC"
-#define MagickLibVersion 0x709
-#define MagickLibVersionText "7.0.9"
+#define MagickLibVersion 0x70A
+#define MagickLibVersionText "7.0.10"
#define MagickLibVersionNumber 7,0,0
-#define MagickLibAddendum "-13"
+#define MagickLibAddendum "-1"
#define MagickLibInterface 7
#define MagickLibMinInterface 7
#if defined(_WINDOWS)
@@ -42,12 +42,12 @@
#else
#define MagickPlatform "i686"
#endif
-#define MagickppLibVersionText "7.0.9"
+#define MagickppLibVersionText "7.0.10"
#define MagickppLibVersionNumber 4:0:0
-#define MagickppLibAddendum "-13"
+#define MagickppLibAddendum "-1"
#define MagickppLibInterface 4
#define MagickppLibMinInterface 4
-#define MagickReleaseDate "2019-12-29"
+#define MagickReleaseDate "2020-03-09"
#define MagickAuthoritativeLicense \
"https://imagemagick.org/script/license.php"
#define MagickAuthoritativeURL "https://imagemagick.org"
diff --git a/configure b/configure
index 3f952ab..9c1f7ce 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.9-15.
+# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.10-1.
#
# Report bugs to <https://github.com/ImageMagick/ImageMagick/issues>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='ImageMagick'
PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='7.0.9-15'
-PACKAGE_STRING='ImageMagick 7.0.9-15'
+PACKAGE_VERSION='7.0.10-1'
+PACKAGE_STRING='ImageMagick 7.0.10-1'
PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues'
PACKAGE_URL='https://imagemagick.org'
@@ -1846,7 +1846,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ImageMagick 7.0.9-15 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 7.0.10-1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1921,7 +1921,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ImageMagick 7.0.9-15:";;
+ short | recursive ) echo "Configuration of ImageMagick 7.0.10-1:";;
esac
cat <<\_ACEOF
@@ -2215,7 +2215,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ImageMagick configure 7.0.9-15
+ImageMagick configure 7.0.10-1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3266,7 +3266,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ImageMagick $as_me 7.0.9-15, which was
+It was created by ImageMagick $as_me 7.0.10-1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4252,7 +4252,7 @@
# Define the identity of the package.
PACKAGE='ImageMagick'
- VERSION='7.0.9-15'
+ VERSION='7.0.10-1'
cat >>confdefs.h <<_ACEOF
@@ -4560,13 +4560,13 @@
MAGICK_MINOR_VERSION=0
-MAGICK_MICRO_VERSION=9
+MAGICK_MICRO_VERSION=10
-MAGICK_PATCHLEVEL_VERSION=15
+MAGICK_PATCHLEVEL_VERSION=1
-MAGICK_VERSION=7.0.9-15
+MAGICK_VERSION=7.0.10-1
-MAGICK_GIT_REVISION=16660:73e93053c:20200105
+MAGICK_GIT_REVISION=17025:00c3687cc:20200307
# Substitute library versioning
@@ -29236,19 +29236,19 @@
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autotrace >= 0.31.1" >&5
-$as_echo_n "checking for autotrace >= 0.31.1... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autotrace >= 0.31.2" >&5
+$as_echo_n "checking for autotrace >= 0.31.2... " >&6; }
if test -n "$AUTOTRACE_CFLAGS"; then
pkg_cv_AUTOTRACE_CFLAGS="$AUTOTRACE_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"autotrace >= 0.31.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "autotrace >= 0.31.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"autotrace >= 0.31.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "autotrace >= 0.31.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_AUTOTRACE_CFLAGS=`$PKG_CONFIG --cflags "autotrace >= 0.31.1" 2>/dev/null`
+ pkg_cv_AUTOTRACE_CFLAGS=`$PKG_CONFIG --cflags "autotrace >= 0.31.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -29260,12 +29260,12 @@
pkg_cv_AUTOTRACE_LIBS="$AUTOTRACE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"autotrace >= 0.31.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "autotrace >= 0.31.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"autotrace >= 0.31.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "autotrace >= 0.31.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_AUTOTRACE_LIBS=`$PKG_CONFIG --libs "autotrace >= 0.31.1" 2>/dev/null`
+ pkg_cv_AUTOTRACE_LIBS=`$PKG_CONFIG --libs "autotrace >= 0.31.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -29286,9 +29286,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- AUTOTRACE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "autotrace >= 0.31.1" 2>&1`
+ AUTOTRACE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "autotrace >= 0.31.2" 2>&1`
else
- AUTOTRACE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "autotrace >= 0.31.1" 2>&1`
+ AUTOTRACE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "autotrace >= 0.31.2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$AUTOTRACE_PKG_ERRORS" >&5
@@ -33289,7 +33289,7 @@
# Check for functions
#
-for ac_func in acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat
+for ac_func in acosh _aligned_malloc aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -37293,7 +37293,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ImageMagick $as_me 7.0.9-15, which was
+This file was extended by ImageMagick $as_me 7.0.10-1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -37360,7 +37360,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ImageMagick config.status 7.0.9-15
+ImageMagick config.status 7.0.10-1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index df42a78..4800f2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@
# ==============================================================================
m4_define([magick_major_version], [7])
m4_define([magick_minor_version], [0])
-m4_define([magick_micro_version], [9])
-m4_define([magick_patchlevel_version], [15])
+m4_define([magick_micro_version], [10])
+m4_define([magick_patchlevel_version], [1])
m4_define([magick_version],
[magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
m4_define([magick_git_revision],
@@ -1684,7 +1684,7 @@
AUTOTRACE_PKG=""
if test "x$with_autotrace" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(AUTOTRACE,[autotrace >= 0.31.1], have_autotrace=yes, have_autotrace=no)
+ PKG_CHECK_MODULES(AUTOTRACE,[autotrace >= 0.31.2], have_autotrace=yes, have_autotrace=no)
AC_MSG_RESULT([])
fi
@@ -2900,7 +2900,7 @@
# Check for functions
#
-AC_CHECK_FUNCS([acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat])
+AC_CHECK_FUNCS([acosh _aligned_malloc aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat])
# Substitute compiler name to build/link PerlMagick
#
diff --git a/images/color-thresholding-gray.gif b/images/color-thresholding-gray.gif
new file mode 100644
index 0000000..339afd4
--- /dev/null
+++ b/images/color-thresholding-gray.gif
Binary files differ
diff --git a/images/color-thresholding-hsv-rgb.gif b/images/color-thresholding-hsv-rgb.gif
new file mode 100644
index 0000000..7937d3f
--- /dev/null
+++ b/images/color-thresholding-hsv-rgb.gif
Binary files differ
diff --git a/images/color-thresholding-hsv.gif b/images/color-thresholding-hsv.gif
new file mode 100644
index 0000000..f9fcb72
--- /dev/null
+++ b/images/color-thresholding-hsv.gif
Binary files differ
diff --git a/images/color-thresholding-rgb.gif b/images/color-thresholding-rgb.gif
new file mode 100644
index 0000000..5f77d22
--- /dev/null
+++ b/images/color-thresholding-rgb.gif
Binary files differ
diff --git a/images/color-thresholding.gif b/images/color-thresholding.gif
new file mode 100644
index 0000000..bb9fc6e
--- /dev/null
+++ b/images/color-thresholding.gif
Binary files differ
diff --git a/images/color-thresholding.jpg b/images/color-thresholding.jpg
new file mode 100644
index 0000000..4f0e543
--- /dev/null
+++ b/images/color-thresholding.jpg
Binary files differ
diff --git a/index.html b/index.html
index 8d7692a..1cad366 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="www/index.html" rel="canonical" />
+ <link href="./www/index.html" rel="canonical" />
<link href="images/wand.png" rel="icon" />
<link href="images/wand.ico" rel="shortcut icon" />
<link href="www/assets/magick.css" rel="stylesheet" />
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="./www/https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="www/https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -92,10 +92,10 @@
<p class="lead magick-description"><a href="images/wizard.png" title="And Now a Touch of Magick"><img class="img-fluid magick-icon" id="logo" alt="And Now a Touch of Magick" width="265" height="352" src="images/wizard.jpg" /></a>
Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&entry=78333969">®</a></sup> to create, edit, compose, or convert bitmap images. It can read and write images in a variety of <a href="www/formats.html">formats</a> (over 200) including PNG, JPEG, GIF, HEIC, TIFF, <a href="www/motion-picture.html">DPX</a>, <a href="www/high-dynamic-range.html">EXR</a>, WebP, Postscript, PDF, and SVG. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.</p>
-<p>ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may use, copy, modify, and distribute in both open and proprietary applications. It is distributed under a derived Apache 2.0 <a href="www/license.html">license</a>.</p>
+<p>ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may use, copy, modify, and distribute in both open and proprietary applications. It is distributed under a derived Apache 2.0 <a href="./www/license.html">license</a>.</p>
<p>ImageMagick utilizes multiple computational threads to increase performance and can read, process, or write mega-, giga-, or tera-pixel image sizes.</p>
-<p>The current release is ImageMagick <a href="www/download.html">7.0.9-14</a>. It runs on <a href="www/download.html#unix">Linux</a>, <a href="www/download.html#windows">Windows</a>, <a href="www/download.html#macosx">Mac Os X</a>, <a href="www/download.html#iOS">iOS</a>, <a href="https://github.com/cherryleafroad/Android-ImageMagick7">Android</a> OS, and others.</p>
+<p>The current release is ImageMagick <a href="www/download.html">7.0.9-25</a>. It runs on <a href="www/download.html#unix">Linux</a>, <a href="www/download.html#windows">Windows</a>, <a href="www/download.html#macosx">Mac Os X</a>, <a href="www/download.html#iOS">iOS</a>, <a href="https://github.com/cherryleafroad/Android-ImageMagick7">Android</a> OS, and others.</p>
<p>The authoritative ImageMagick web site is <a href="./">https://imagemagick.org</a>. The authoritative source code repository is <a href="https://github.com/ImageMagick" target="_blank">https://github.com/ImageMagick</a>. We maintain a source code mirror at <a href="https://gitlab.com/ImageMagick" target="_blank">https://gitlab.com/ImageMagick</a>. We continue to maintain the legacy release of ImageMagick, version 6, at <a href="https://legacy.imagemagick.org/">https://legacy.imagemagick.org</a>.</p>
@@ -244,6 +244,8 @@
<p>Now that ImageMagick version 7 is released, we continue to maintain the legacy release of ImageMagick, version 6, at <a href="https://legacy.imagemagick.org/">https://legacy.imagemagick.org</a>. Learn how ImageMagick version 7 differs from previous versions with our <a href="www/porting.html">porting guide</a>.</p>
+<p>We discovered a bug in the pseudo-random generator prior to ImageMagick 7.0.9-11, the first 3 values repeated because the random state was not initialized properly. As a consequence of the fix, expect a different numerical sequence when seeding (-seed).</p>
+
<p>ImageMagick best practices <strong>strongly</strong> encourages you to configure a <a href="www/security-policy.html">security policy</a> that suits your local environment.</p>
<p>The ImageMagick development process ensures a stable API and <a href="https://abi-laboratory.pro/tracker/timeline/imagemagick/">ABI</a>. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="https://github.com/google/sanitizers/wiki/AddressSanitizer">memory error</a>, <a href="https://github.com/google/sanitizers/wiki/ThreadSanitizer">thread data race</a> detection, and continuous <a href="https://github.com/google/oss-fuzz">fuzzing</a> to detect and prevent security vulnerabilities.</p>
@@ -278,12 +280,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:10 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:36 -->
\ No newline at end of file
diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1
index 36c49ba..f11bbb6 100644
--- a/utilities/ImageMagick.1
+++ b/utilities/ImageMagick.1
@@ -37,7 +37,7 @@
.B magick
Read images into memory, and perform operations on those images, and write
-then out to either the same of some other image file format.
+them out to either the same or some other image file format.
The "-script" option can be switch from processing command line options,
to reading options from a file or pipeline.
diff --git a/utilities/ImageMagick.1.in b/utilities/ImageMagick.1.in
index f399fea..477c080 100644
--- a/utilities/ImageMagick.1.in
+++ b/utilities/ImageMagick.1.in
@@ -37,7 +37,7 @@
.B magick
Read images into memory, and perform operations on those images, and write
-then out to either the same of some other image file format.
+them out to either the same or some other image file format.
The "-script" option can be switch from processing command line options,
to reading options from a file or pipeline.
diff --git a/utilities/convert.1 b/utilities/convert.1
index 1e04c07..9566020 100644
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -148,6 +148,8 @@
\-colorize value colorize the image with the fill color
\-color-matrix matrix apply color correction to the image
\-colors value preferred number of colors in the image
+ \-color-threshold start_color-stop_color
+ force all pixels in the color range to white otherwise black
\-connected-component connectivity
connected-components uniquely labeled
\-contrast enhance or reduce the image contrast
diff --git a/utilities/convert.1.in b/utilities/convert.1.in
index f345fec..f2b574e 100644
--- a/utilities/convert.1.in
+++ b/utilities/convert.1.in
@@ -148,6 +148,8 @@
\-colorize value colorize the image with the fill color
\-color-matrix matrix apply color correction to the image
\-colors value preferred number of colors in the image
+ \-color-threshold start_color-stop_color
+ force all pixels in the color range to white otherwise black
\-connected-component connectivity
connected-components uniquely labeled
\-contrast enhance or reduce the image contrast
diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 14b43aa..d320868 100644
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -146,6 +146,8 @@
\-colorize value colorize the image with the fill color
\-color-matrix matrix apply color correction to the image
\-colors value preferred number of colors in the image
+ \-color-threshold start_color-stop_color
+ force all pixels in the color range to white otherwise black
\-connected-component connectivity
connected-components uniquely labeled
\-contrast enhance or reduce the image contrast
diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in
index aab9033..71e7c67 100644
--- a/utilities/mogrify.1.in
+++ b/utilities/mogrify.1.in
@@ -146,6 +146,8 @@
\-colorize value colorize the image with the fill color
\-color-matrix matrix apply color correction to the image
\-colors value preferred number of colors in the image
+ \-color-threshold start_color-stop_color
+ force all pixels in the color range to white otherwise black
\-connected-component connectivity
connected-components uniquely labeled
\-contrast enhance or reduce the image contrast
diff --git a/version.sh b/version.sh
index 63ca3ad..73e3b6a 100644
--- a/version.sh
+++ b/version.sh
@@ -16,11 +16,11 @@
#
# Package version. This is is the numeric version suffix applied to
# PACKAGE_NAME (e.g. "1.0.0").
-PACKAGE_VERSION='7.0.9'
-PACKAGE_PERL_VERSION='7.0.9'
-PACKAGE_LIB_VERSION="0x709"
-PACKAGE_RELEASE="15"
-PACKAGE_LIB_VERSION_NUMBER="7,0,9,${PACKAGE_RELEASE}"
+PACKAGE_VERSION='7.0.10'
+PACKAGE_PERL_VERSION='7.0.10'
+PACKAGE_LIB_VERSION="0x70A"
+PACKAGE_RELEASE="1"
+PACKAGE_LIB_VERSION_NUMBER="7,0,10,${PACKAGE_RELEASE}"
PACKAGE_RELEASE_DATE_RAW=`date +%F`
PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}"
PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html
index dc8b508..90bfec3 100644
--- a/www/ImageMagickObject.html
+++ b/www/ImageMagickObject.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/www/ImageMagickObject.html" rel="canonical" />
- <link href="../www/images/wand.png" rel="icon" />
- <link href="../www/images/wand.ico" rel="shortcut icon" />
- <link href="../www/assets/magick.css" rel="stylesheet" />
+ <link href="../www/ImageMagickObject.html" rel="canonical" />
+ <link href="../images/wand.png" rel="icon" />
+ <link href="../images/wand.ico" rel="shortcut icon" />
+ <link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../www/index.html">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/download.html">Download</a>
+ <a class="nav-link" href="download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../www/www/https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -87,13 +87,13 @@
<main class="container">
<div class="magick-template">
<div class="magick-header">
-<p class="text-center"><a href="../www/www/#build">Build ImageMagickObject From Source</a></p>
+<p class="text-center"><a href="../www/#build">Build ImageMagickObject From Source</a></p>
<p class="lead magick-description">The ImageMagickObject is a COM+ compatible component that can be invoked from any language capable of using COM objects. The intended use is for Windows Scripting Host VBS scripts and Visual Basic, but it is also available from to C++, ASP, and other languages like Delphi, Perl and PHP.</p>
-<p>The ImageMagickObject COM+ component provides access to the <a href="../www/www/compare.html">compare</a>, <a href="../www/www/convert.html">convert</a>, <a href="../www/www/composite.html">composite</a>, <a href="../www/www/mogrify.html">mogrify</a>, <a href="../www/www/identify.html">identify</a>, <a href="../www/www/montage.html">montage</a>, and <a href="../www/www/stream.html">stream</a> tools, efficiently executing them as part of your process, rather than as external programs. The way you use it is exactly the same. You pass it a list of strings including filenames and various options and it does the job. In fact, you can take any existing batch scripts that use the command line tools and translate them into the equivalent calls to the COM+ object in a matter of minutes. Beyond that, there is also a way to pass in and retrieve images in memory in the form of standard smart arrays (byte arrays). Samples are provided, to show both the simple and more elaborate forms of access.</p>
+<p>The ImageMagickObject COM+ component provides access to the <a href="compare.html">compare</a>, <a href="convert.html">convert</a>, <a href="composite.html">composite</a>, <a href="mogrify.html">mogrify</a>, <a href="identify.html">identify</a>, <a href="montage.html">montage</a>, and <a href="stream.html">stream</a> tools, efficiently executing them as part of your process, rather than as external programs. The way you use it is exactly the same. You pass it a list of strings including filenames and various options and it does the job. In fact, you can take any existing batch scripts that use the command line tools and translate them into the equivalent calls to the COM+ object in a matter of minutes. Beyond that, there is also a way to pass in and retrieve images in memory in the form of standard smart arrays (byte arrays). Samples are provided, to show both the simple and more elaborate forms of access.</p>
-<p>ImageMagick provides a statically-built ImageMagick object as part of its <a href="../www/www/download.html#windows">Windows installation package</a>. When this package is installed, ImageMagickObject and its sample programs are installed to this path:</p>
+<p>ImageMagick provides a statically-built ImageMagick object as part of its <a href="download.html#windows">Windows installation package</a>. When this package is installed, ImageMagickObject and its sample programs are installed to this path:</p>
<pre class="highlight"><code> c:\Program Files\ImageMagick-7.0.9-Q16\ImageMagickObject
</code></pre>
@@ -105,15 +105,15 @@
<pre class="highlight"><code>cscript SimpleTest.vbs
</code></pre>
-<p>Since the ImageMagick utility command line parsers are incorporated within ImageMagickObject, please refer to the <a href="../www/www/command-line-tools.html">command-line tools</a> discussion to learn how to use it. The sample VBS scripts show how the object should be called and used and have lots of comments.</p>
+<p>Since the ImageMagick utility command line parsers are incorporated within ImageMagickObject, please refer to the <a href="command-line-tools.html">command-line tools</a> discussion to learn how to use it. The sample VBS scripts show how the object should be called and used and have lots of comments.</p>
<p>C++ programmers should have a look at the <code>MagickCMD.cpp</code> command line utility for an example of how to call the object from C++. The object requires a variable size list of BSTR's to emulate the command line argc, argv style calling conventions of the COM component which is more complex in C++ then in VBS or VB.</p>
-<p>MagickCMD is a C++ sample, but it also serves as a replacement for all the other command line utilities in most applications. Instead of using <code>convert xxxx yyyy</code> you can use <code>MagickCMD convert xxxx yyyy</code> instead. MagickCMD calls the COM object to accomplish the designated task. This small tight combination replaces the entire usual binary distribution in just a few mebibytes.</p>
+<p>MagickCMD is a C++ sample, but it also serves as a replacement for all the other command line utilities in most applications. Instead of using <code>magick xxxx yyyy</code> you can use <code>MagickCMD convert xxxx yyyy</code> instead. MagickCMD calls the COM object to accomplish the designated task. This small tight combination replaces the entire usual binary distribution in just a few mebibytes.</p>
<h2><a class="anchor" id="build"></a>Build ImageMagickObject From Source</h2>
-<p>The source code for ImageMagickObject is available from the ImageMagick <a href="https://github.com/ImageMagick">GIT</a> repository, or as part of the <a href="../www/www/install-source.html#windows">Windows source</a> distribution. Once the source code has been retrieved and extracted, the source for ImageMagickObject is the directory <code>ImageMagick\contrib\win32\ATL7ImageMagickObject</code>, however, ImageMagick itself must be built using the static-multithread (VisualStaticMT) build configuration. Building ImageMagickObject requires Microsoft Visual C++ 7.0 as delivered with Microsoft's Visual Studio .NET package. See the <a href="../www/www/install-source.html#windows">Windows compilation instructions</a> to get ImageMagick itself built before building the ImageMagick COM+ component.</p>
+<p>The source code for ImageMagickObject is available from the ImageMagick <a href="https://github.com/ImageMagick">GIT</a> repository, or as part of the <a href="install-source.html#windows">Windows source</a> distribution. Once the source code has been retrieved and extracted, the source for ImageMagickObject is the directory <code>ImageMagick\contrib\win32\ATL7ImageMagickObject</code>, however, ImageMagick itself must be built using the static-multithread (VisualStaticMT) build configuration. Building ImageMagickObject requires Microsoft Visual C++ 7.0 as delivered with Microsoft's Visual Studio .NET package. See the <a href="install-source.html#windows">Windows compilation instructions</a> to get ImageMagick itself built before building the ImageMagick COM+ component.</p>
<p>Once the VisualStaticMT project has been built, build the ImageMagickObject with this procedure:</p>
@@ -139,24 +139,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/www/security-policy.html">Security</a> •
- <a href="../www/www/architecture.html">Architecture</a>
+ <p><a href="security-policy.html">Security</a> •
+ <a href="architecture.html">Architecture</a>
- <a href="ImageMagickObject.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../www/images/wand.ico"/></a>
+ <a href="ImageMagickObject.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/www/links.html">Related</a> •
- <a href="../www/www/sitemap.html">Sitemap</a>
+ <a href="links.html">Related</a> •
+ <a href="sitemap.html">Sitemap</a>
<br/>
- <a href="../www/www/support.html">Donate</a> •
+ <a href="support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:06 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
index 6481c2c..8bfac69 100644
--- a/www/advanced-unix-installation.html
+++ b/www/advanced-unix-installation.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -107,7 +107,7 @@
<p>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:</p>
-<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-7.0.9-14</span><span class='crtout'></span><span class="crtprompt">$ </span><span class='crtin'>./configure</span></pre>
+<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-7.0.9-25</span><span class='crtout'></span><span class="crtprompt">$ </span><span class='crtin'>./configure</span></pre>
<p>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:</p>
@@ -492,7 +492,7 @@
<p>To confirm your installation of the ImageMagick distribution was successful, ensure that the installation directory is in your executable search path and type:</p>
-<pre class="highlight"><code>convert logo: logo.gif
+<pre class="highlight"><code>magick logo: logo.gif
identify logo.gif
</code></pre>
@@ -513,7 +513,7 @@
<pre class="highlight"><code>make check
</code></pre>
-<p>Ghostscript is a prerequisite, otherwise the EPS, PS, and PDF tests will fail. Note that due to differences between the developer's environment and your own it is possible that a few tests may fail even though the results are ok. Differences between the developer's environment environment and your own may include the compiler, the CPU type, and the library versions used. The ImageMagick developers use the current release of all dependent libraries.</p>
+<p>Ghostscript is a prerequisite, otherwise the EPS, PS, and PDF tests will fail. Note that due to differences between the developer's environment and your own it is possible that a few tests may fail even though the results are ok. Differences between the developer's environment and your own may include the compiler, the CPU type, and the library versions used. The ImageMagick developers use the current release of all dependent libraries.</p>
<h2><a class="anchor" id="linux"></a>Linux-specific Build instructions</h2>
@@ -551,7 +551,7 @@
<p><a href="../www/download.html">Download</a> the ImageMagick source distribution and verify the distribution against its <a href="https://imagemagick.org/download/digest.rdf">message digest</a>.</p>
<p>Unpack and change into the top-level ImageMagick directory:</p>
- <pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>tar xvzf ImageMagick-7.0.9-14.tar.gz</span><span class='crtout'></span><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-7.0.9-14</span></pre> <p>Configure ImageMagick:</p>
+ <pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>tar xvzf ImageMagick-7.0.9-25.tar.gz</span><span class='crtout'></span><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-7.0.9-25</span></pre> <p>Configure ImageMagick:</p>
<pre class="highlight"><code>./configure --prefix=/opt --with-quantum-depth=16 \
--disable-dependency-tracking --with-x=yes \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \
@@ -578,7 +578,7 @@
<p>Although you can download and install delegate libraries yourself, many are already available in the <a href="http://gnuwin32.sourceforge.net/">GnuWin32</a> 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,</p>
-<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>tar jxvf ImageMagick-7.0.9-?.tar.bz2</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-7.0.9-14</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>./configure --without-perl</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>make</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>sudo make install</span></pre>
+<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>tar jxvf ImageMagick-7.0.9-?.tar.bz2</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-7.0.9-25</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>./configure --without-perl</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>make</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>sudo make install</span></pre>
<h2><a class="anchor" id="problems"></a>Dealing with Unexpected Problems</h2>
<p>Chances are the download, configure, build, and install of ImageMagick went flawlessly as it is intended, however, certain systems and environments may cause one or more steps to fail. We discuss a few problems we've run across and how to take corrective action to ensure you have a working release of ImageMagick</p>
@@ -638,12 +638,14 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:25 -->
\ No newline at end of file
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index d37f8e4..92d4e14 100644
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -141,12 +141,14 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:34 -->
\ No newline at end of file
diff --git a/www/animate.html b/www/animate.html
index 66a3881..8dc226b 100644
--- a/www/animate.html
+++ b/www/animate.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -556,12 +556,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 09:26 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/api.html b/www/api.html
index 635b5ee..ba3d092 100644
--- a/www/api.html
+++ b/www/api.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -211,12 +211,14 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:46 -->
\ No newline at end of file
diff --git a/www/api/Image++.html b/www/api/Image++.html
index a7938f1..a58677e 100644
--- a/www/api/Image++.html
+++ b/www/api/Image++.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -3231,12 +3231,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 31st December 2019 19:38 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 03:52 -->
\ No newline at end of file
diff --git a/www/api/animate.html b/www/api/animate.html
index 71dac97..fd39c32 100644
--- a/www/api/animate.html
+++ b/www/api/animate.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="animate.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/animate.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -93,24 +93,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="animate.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="animate.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 29th December 2019 14:22 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 15:53 -->
\ No newline at end of file
diff --git a/www/api/annotate.html b/www/api/annotate.html
index 9d895c6..9fcdfa5 100644
--- a/www/api/annotate.html
+++ b/www/api/annotate.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -276,12 +276,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 30th December 2019 13:18 -->
\ No newline at end of file
+<!-- Magick Cache 19th February 2020 04:51 -->
\ No newline at end of file
diff --git a/www/api/attribute.html b/www/api/attribute.html
index 13ccd83..5f19626 100644
--- a/www/api/attribute.html
+++ b/www/api/attribute.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/attribute.html" rel="canonical" />
- <link href="../../www/images/wand.png" rel="icon" />
- <link href="../../www/images/wand.ico" rel="shortcut icon" />
- <link href="../../www/assets/magick.css" rel="stylesheet" />
+ <link href="attribute.html" rel="canonical" />
+ <link href="../../images/wand.png" rel="icon" />
+ <link href="../../images/wand.ico" rel="shortcut icon" />
+ <link href="../assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/download.html">Download</a>
+ <a class="nav-link" href="../../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -398,24 +398,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/www/security-policy.html">Security</a> •
- <a href="../../www/www/architecture.html">Architecture</a>
+ <p><a href="../../www/security-policy.html">Security</a> •
+ <a href="../../www/architecture.html">Architecture</a>
- <a href="attribute.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
+ <a href="attribute.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
- <a href="../../www/www/links.html">Related</a> •
- <a href="../../www/www/sitemap.html">Sitemap</a>
+ <a href="../../www/links.html">Related</a> •
+ <a href="../../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/www/support.html">Donate</a> •
+ <a href="../../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/www/contact.html">Contact Us</a>
+ <a href="../../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 12:06 -->
\ No newline at end of file
+<!-- Magick Cache 16th February 2020 02:05 -->
\ No newline at end of file
diff --git a/www/api/blob.html b/www/api/blob.html
index 2b9779f..a475ece 100644
--- a/www/api/blob.html
+++ b/www/api/blob.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -463,12 +463,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 00:27 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 13:25 -->
\ No newline at end of file
diff --git a/www/api/cache-view.html b/www/api/cache-view.html
index b57d368..74cc82a 100644
--- a/www/api/cache-view.html
+++ b/www/api/cache-view.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -354,7 +354,7 @@
</dl>
<h2><a href="../../api/MagickCore/cache-view_8c.html" id="GetCacheViewVirtualPixelQueue">GetCacheViewVirtualPixelQueue</a></h2>
-<p>GetCacheViewVirtualPixelQueue() returns the the pixels associated with the last call to GetCacheViewVirtualPixels(). The pixels are virtual and therefore cannot be updated.</p>
+<p>GetCacheViewVirtualPixelQueue() returns the pixels associated with the last call to GetCacheViewVirtualPixels(). The pixels are virtual and therefore cannot be updated.</p>
<p>The format of the GetCacheViewVirtualPixelQueue() method is:</p>
@@ -689,12 +689,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 21:06 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 19:39 -->
\ No newline at end of file
diff --git a/www/api/cache.html b/www/api/cache.html
index 0ab84de..45c38fd 100644
--- a/www/api/cache.html
+++ b/www/api/cache.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../../api/cache.html" rel="canonical" />
- <link href="../images/wand.png" rel="icon" />
- <link href="../images/wand.ico" rel="shortcut icon" />
- <link href="assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/cache.html" rel="canonical" />
+ <link href="../www/images/wand.png" rel="icon" />
+ <link href="../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../www/index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/download.html">Download</a>
+ <a class="nav-link" href="../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/resources.html">Resources</a>
+ <a class="nav-link" href="../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/develop.html">Develop</a>
+ <a class="nav-link" href="../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -380,7 +380,7 @@
<p>GetVirtualPixels() returns an immutable pixel region. If the region is successfully accessed, a pointer to it is returned, otherwise NULL is returned. The returned pointer may point to a temporary working copy of the pixels or it may point to the original pixels in memory. Performance is maximized if the selected region is part of one row, or one or more full rows, since there is opportunity to access the pixels in-place (without a copy) if the image is in memory, or in a memory-mapped file. The returned pointer must *never* be deallocated by the user.</p>
-<p>Pixels accessed via the returned pointer represent a simple array of type Quantum. If the image type is CMYK or the storage class is PseudoClass, call GetAuthenticMetacontent() after invoking GetAuthenticPixels() to access the meta-content (of type void) corresponding to the the region.</p>
+<p>Pixels accessed via the returned pointer represent a simple array of type Quantum. If the image type is CMYK or the storage class is PseudoClass, call GetAuthenticMetacontent() after invoking GetAuthenticPixels() to access the meta-content (of type void) corresponding to the region.</p>
<p>If you plan to modify the pixels, use GetAuthenticPixels() instead.</p>
@@ -514,24 +514,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/security-policy.html">Security</a> •
- <a href="../www/architecture.html">Architecture</a>
+ <p><a href="../www/www/security-policy.html">Security</a> •
+ <a href="../www/www/architecture.html">Architecture</a>
- <a href="cache.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
+ <a href="cache.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../www/images/wand.ico"/></a>
- <a href="../www/links.html">Related</a> •
- <a href="../www/sitemap.html">Sitemap</a>
+ <a href="../www/www/links.html">Related</a> •
+ <a href="../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../www/support.html">Donate</a> •
+ <a href="../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/contact.html">Contact Us</a>
+ <a href="../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 29th December 2019 22:53 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 22:15 -->
\ No newline at end of file
diff --git a/www/api/channel.html b/www/api/channel.html
index 93ae5c0..1aeb103 100644
--- a/www/api/channel.html
+++ b/www/api/channel.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/channel.html" rel="canonical" />
- <link href="../../www/images/wand.png" rel="icon" />
- <link href="../../www/images/wand.ico" rel="shortcut icon" />
- <link href="../../www/assets/magick.css" rel="stylesheet" />
+ <link href="channel.html" rel="canonical" />
+ <link href="../../images/wand.png" rel="icon" />
+ <link href="../../images/wand.ico" rel="shortcut icon" />
+ <link href="../assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/download.html">Download</a>
+ <a class="nav-link" href="../../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -278,24 +278,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/www/security-policy.html">Security</a> •
- <a href="../../www/www/architecture.html">Architecture</a>
+ <p><a href="../../www/security-policy.html">Security</a> •
+ <a href="../../www/architecture.html">Architecture</a>
- <a href="channel.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
+ <a href="channel.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
- <a href="../../www/www/links.html">Related</a> •
- <a href="../../www/www/sitemap.html">Sitemap</a>
+ <a href="../../www/links.html">Related</a> •
+ <a href="../../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/www/support.html">Donate</a> •
+ <a href="../../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/www/contact.html">Contact Us</a>
+ <a href="../../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 17:47 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 09:36 -->
\ No newline at end of file
diff --git a/www/api/cipher.html b/www/api/cipher.html
index 59c1df0..259b062 100644
--- a/www/api/cipher.html
+++ b/www/api/cipher.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -338,12 +338,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 07:32 -->
\ No newline at end of file
+<!-- Magick Cache 16th February 2020 23:03 -->
\ No newline at end of file
diff --git a/www/api/color.html b/www/api/color.html
index 2cd760b..1b9f166 100644
--- a/www/api/color.html
+++ b/www/api/color.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -243,12 +243,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 08:23 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 11:42 -->
\ No newline at end of file
diff --git a/www/api/colormap.html b/www/api/colormap.html
index 38aa253..2e9c0eb 100644
--- a/www/api/colormap.html
+++ b/www/api/colormap.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -169,12 +169,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 30th December 2019 09:22 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 03:53 -->
\ No newline at end of file
diff --git a/www/api/colorspace.html b/www/api/colorspace.html
index e985450..cc61062 100644
--- a/www/api/colorspace.html
+++ b/www/api/colorspace.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="colorspace.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/colorspace.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -243,24 +243,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="colorspace.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="colorspace.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 05:10 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 16:04 -->
\ No newline at end of file
diff --git a/www/api/compare.html b/www/api/compare.html
index f321b11..6ef95b8 100644
--- a/www/api/compare.html
+++ b/www/api/compare.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -144,12 +144,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 31st December 2019 18:19 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 14:36 -->
\ No newline at end of file
diff --git a/www/api/composite.html b/www/api/composite.html
index 2acf671..db268c8 100644
--- a/www/api/composite.html
+++ b/www/api/composite.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -144,12 +144,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 30th December 2019 16:23 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 21:28 -->
\ No newline at end of file
diff --git a/www/api/constitute.html b/www/api/constitute.html
index 47af54e..fb76370 100644
--- a/www/api/constitute.html
+++ b/www/api/constitute.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="constitute.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/constitute.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -321,24 +321,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="constitute.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="constitute.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 23:22 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 20:02 -->
\ No newline at end of file
diff --git a/www/api/decorate.html b/www/api/decorate.html
index f755fd9..bae9817 100644
--- a/www/api/decorate.html
+++ b/www/api/decorate.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="decorate.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/decorate.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -199,24 +199,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="decorate.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="decorate.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 05:10 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 18:09 -->
\ No newline at end of file
diff --git a/www/api/deprecate.html b/www/api/deprecate.html
index c6b24b5..583f743 100644
--- a/www/api/deprecate.html
+++ b/www/api/deprecate.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="deprecate.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/deprecate.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -147,24 +147,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="deprecate.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="deprecate.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 31st December 2019 07:37 -->
\ No newline at end of file
+<!-- Magick Cache 19th February 2020 01:52 -->
\ No newline at end of file
diff --git a/www/api/display.html b/www/api/display.html
index 3623697..afeb8bc 100644
--- a/www/api/display.html
+++ b/www/api/display.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/display.html" rel="canonical" />
- <link href="../../www/images/wand.png" rel="icon" />
- <link href="../../www/images/wand.ico" rel="shortcut icon" />
- <link href="../../www/assets/magick.css" rel="stylesheet" />
+ <link href="display.html" rel="canonical" />
+ <link href="../../images/wand.png" rel="icon" />
+ <link href="../../images/wand.ico" rel="shortcut icon" />
+ <link href="../assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/download.html">Download</a>
+ <a class="nav-link" href="../../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -93,24 +93,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/www/security-policy.html">Security</a> •
- <a href="../../www/www/architecture.html">Architecture</a>
+ <p><a href="../../www/security-policy.html">Security</a> •
+ <a href="../../www/architecture.html">Architecture</a>
- <a href="display.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
+ <a href="display.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
- <a href="../../www/www/links.html">Related</a> •
- <a href="../../www/www/sitemap.html">Sitemap</a>
+ <a href="../../www/links.html">Related</a> •
+ <a href="../../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/www/support.html">Donate</a> •
+ <a href="../../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/www/contact.html">Contact Us</a>
+ <a href="../../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 3rd January 2020 14:18 -->
\ No newline at end of file
+<!-- Magick Cache 15th February 2020 09:44 -->
\ No newline at end of file
diff --git a/www/api/distort.html b/www/api/distort.html
index 6dc78d5..b79ad58 100644
--- a/www/api/distort.html
+++ b/www/api/distort.html
@@ -7,12 +7,12 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,shrink-to-fit=no" />
- <title>ImageMagick - MagickCore, C API: Image Distortions</title>
+ <title>ImageMagick - Convert, Edit, or Compose Bitmap Images</title>
<meta name="application-name" content="ImageMagick" />
<meta name="description" content="Use ImageMagick® to create, edit, compose, and convert bitmap images. Resize an image, crop it, change its shades and colors, add captions, and more." />
<meta name="application-url" content="https://imagemagick.org" />
<meta name="generator" content="PHP" />
- <meta name="keywords" content="magickcore, c, api:, image, distortions, ImageMagick, PerlMagick, image processing, image, photo, software, Magick++, OpenMP, convert" />
+ <meta name="keywords" content="convert, edit, or, compose, bitmap, images, ImageMagick, PerlMagick, image processing, image, photo, software, Magick++, OpenMP, convert" />
<meta name="rating" content="GENERAL" />
<meta name="robots" content="INDEX, FOLLOW" />
<meta name="generator" content="ImageMagick Studio LLC" />
@@ -29,47 +29,47 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/distort.html" rel="canonical" />
- <link href="../../www/images/wand.png" rel="icon" />
- <link href="../../www/images/wand.ico" rel="shortcut icon" />
- <link href="../../www/assets/magick.css" rel="stylesheet" />
+ <link href="../../www/index.html" rel="canonical" />
+ <link href="../../images/wand.png" rel="icon" />
+ <link href="../../images/wand.ico" rel="shortcut icon" />
+ <link href="../assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
- <li class="nav-item ">
- <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
+ <li class="nav-item active">
+ <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/download.html">Download</a>
+ <a class="nav-link" href="../../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -87,193 +87,208 @@
<main class="container">
<div class="magick-template">
<div class="magick-header">
-<p class="text-center"><a href="distort.html#AffineTransformImage">AffineTransformImage</a> • <a href="distort.html#DistortImage">DistortImage</a> • <a href="distort.html#RotateImage">RotateImage</a> • <a href="distort.html#SparseColorImage">SparseColorImage</a></p>
+<p class="text-center"><a href="distort.html#features">Features and Capabilities</a> • <a href="distort.html#news">News</a> • <a href="distort.html#community">Community</a></p>
-<h2><a href="../../api/MagickCore/distort_8c.html" id="AffineTransformImage">AffineTransformImage</a></h2>
+<p class="lead magick-description"><a href="../../images/wizard.png" title="And Now a Touch of Magick"><img class="img-fluid magick-icon" id="logo" alt="And Now a Touch of Magick" width="265" height="352" src="../../images/wizard.jpg" /></a>
+Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&entry=78333969">®</a></sup> to create, edit, compose, or convert bitmap images. It can read and write images in a variety of <a href="../../www/formats.html">formats</a> (over 200) including PNG, JPEG, GIF, HEIC, TIFF, <a href="../../www/motion-picture.html">DPX</a>, <a href="../../www/high-dynamic-range.html">EXR</a>, WebP, Postscript, PDF, and SVG. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.</p>
-<p>AffineTransformImage() transforms an image as dictated by the affine matrix. It allocates the memory necessary for the new Image structure and returns a pointer to the new image.</p>
+<p>ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may use, copy, modify, and distribute in both open and proprietary applications. It is distributed under a derived Apache 2.0 <a href="../../www/license.html">license</a>.</p>
+<p>ImageMagick utilizes multiple computational threads to increase performance and can read, process, or write mega-, giga-, or tera-pixel image sizes.</p>
-<p>The format of the AffineTransformImage method is:</p>
+<p>The current release is ImageMagick <a href="../../www/download.html">7.0.9-25</a>. It runs on <a href="../../www/download.html#unix">Linux</a>, <a href="../../www/download.html#windows">Windows</a>, <a href="../../www/download.html#macosx">Mac Os X</a>, <a href="../../www/download.html#iOS">iOS</a>, <a href="https://github.com/cherryleafroad/Android-ImageMagick7">Android</a> OS, and others.</p>
-<pre class="text">
-Image *AffineTransformImage(const Image *image,
- AffineMatrix *affine_matrix,ExceptionInfo *exception)
-</pre>
+<p>The authoritative ImageMagick web site is <a href="../../">https://imagemagick.org</a>. The authoritative source code repository is <a href="https://github.com/ImageMagick" target="_blank">https://github.com/ImageMagick</a>. We maintain a source code mirror at <a href="https://gitlab.com/ImageMagick" target="_blank">https://gitlab.com/ImageMagick</a>. We continue to maintain the legacy release of ImageMagick, version 6, at <a href="https://legacy.imagemagick.org/">https://legacy.imagemagick.org</a>.</p>
-<p>A description of each parameter follows:</p>
+<h2><a class="anchor" id="features"></a>Features and Capabilities</h2>
+<p>Here are just a few <a href="../../www/examples.html">examples</a> of what ImageMagick can do for you:</p>
+<div class="table-responsive" style="font-size:87.5% !important;">
+<table class="table table-sm table-striped">
+ <tr>
+ <td><a href="../../Usage/anim_basics/">Animation</a></td>
+ <td>create a GIF animation sequence from a group of images.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/color-management.html">Color management</a></td>
+ <td>accurate color management with color profiles or in lieu of-- built-in gamma compression or expansion as demanded by the colorspace.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/command-line-processing.html">Command-line processing</a></td>
+ <td>utilize ImageMagick from the command-line.</td>
+ </tr>
+ <tr>
+ <td><a href="https://en.wikipedia.org/wiki/Complex_text_layout">Complex text layout</a></td>
+ <td>bidirectional text support and shaping.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/composite.html">Composite</a></td>
+ <td>overlap one image over another.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/connected-components.html">Connected component labeling</a></td>
+ <td>uniquely label connected regions in an image.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/crop/">Decorate</a></td>
+ <td>add a border or frame to an image.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/transform/#vision">Delineate image features</a></td>
+ <td><a href="../https://imagemagick.org/discourse-server//viewtopic.html?f=4&t=25405">Canny edge detection</a>, <a href="../https://imagemagick.org/discourse-server//viewtopic.html?f=4&t=25476">Hough lines</a>.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/fourier/">Discrete Fourier transform</a></td>
+ <td>implements the forward and inverse <a href="https://en.wikipedia.org/wiki/Discrete_Fourier_transform">DFT</a>.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/distribute-pixel-cache.html">Distributed pixel cache</a></td>
+ <td>offload intermediate pixel storage to one or more remote servers.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/draw/">Draw</a></td>
+ <td>add shapes or text to an image.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/cipher.html">Encipher or decipher an image</a></td>
+ <td>convert ordinary images into unintelligible gibberish and back again.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/convert.html">Format conversion</a></td>
+ <td>convert an image from one <a href="../../www/formats.html">format </a> to another (e.g. PNG to JPEG).</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/distorts/">Generalized pixel distortion</a></td>
+ <td>correct for, or induce image distortions including perspective.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/architecture.html#distributed">Heterogeneous distributed processing</a></td>
+ <td>certain algorithms are <a href="../../www/opencl.html">OpenCL</a>-enabled to take advantage of speed-ups offered by executing in concert across heterogeneous platforms consisting of CPUs, GPUs, and other processors.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/high-dynamic-range.html">High dynamic-range images</a></td>
+ <td>accurately represent the wide range of intensity levels found in real scenes ranging from the brightest direct sunlight to the deepest darkest shadows.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/clahe.html">Histogram Equalization</a></td>
+ <td>Use adaptive histogram equalization to improve contrast in images.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/fx.html">Image calculator</a></td>
+ <td>apply a mathematical expression to an image, image sequence, or image channels.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/gradient.html">Image gradients</a></td>
+ <td>create a gradual blend of two colors whose shape is horizontal, vertical, circular, or elliptical.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/identify.html">Image identification</a></td>
+ <td>describe the format and attributes of an image.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/download.html#iOS">ImageMagick on the iPhone</a></td>
+ <td>convert, edit, or compose images on your <a href="https://www.apple.com/ios/">iOS</a> device such as the iPhone or iPad.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/architecture.html#tera-pixel">Large image support</a></td>
+ <td>read, process, or write mega-, giga-, or tera-pixel image sizes.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/montage.html">Montage</a></td>
+ <td>juxtapose image thumbnails on an image canvas.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/morphology/">Morphology of shapes</a></td>
+ <td>extract features, describe shapes, and recognize patterns in images.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/motion-picture.html">Motion picture support</a></td>
+ <td>read and write the common image formats used in digital film work.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/transform/#vision">Noise and color reduction</a></td>
+ <td><a href="../https://imagemagick.org/discourse-server//viewtopic.html?f=4&t=26480">Kuwahara Filter</a>, <a href="../https://imagemagick.org/discourse-server//viewtopic.html?f=4&t=25504">mean-shift</a>.</td>
+ </tr>
+ <tr>
+ <td><a href="http://www.fmwconcepts.com/misc_tests/perceptual_hash_test_results_510/index.html">Perceptual hash</a></td>
+ <td>map visually identical images to the same or similar hash-- useful in image retrieval, authentication, indexing, or copy detection as well as digital watermarking.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/blur/">Special effects</a></td>
+ <td>blur, sharpen, threshold, or tint an image.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/text/">Text & comments</a></td>
+ <td>insert descriptive or artistic text in an image.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/architecture.html#threads">Threads of execution support</a></td>
+ <td>ImageMagick is thread safe and most internal algorithms execute in <a href="../../www/openmp.html">parallel</a> to take advantage of speed-ups offered by multicore processor chips.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/resize/">Transform</a></td>
+ <td>resize, rotate, deskew, crop, flip or trim an image.</td>
+ </tr>
+ <tr>
+ <td><a href="../../Usage/masking/">Transparency</a></td>
+ <td>render portions of an image invisible.</td>
+ </tr>
+ <tr>
+ <td><a href="../../www/architecture.html#virtual-pixels">Virtual pixel support</a></td>
+ <td>convenient access to pixels outside the image boundaries.</td>
+ </tr>
+</table>
+</div>
-<dd>
-</dd>
+<p><a href="../../Usage/" target="_blank">Examples of ImageMagick Usage</a> shows how to use ImageMagick from the <a href="../../www/command-line-processing.html">command-line</a> to accomplish any of these tasks and much more. Also, see <a href="http://www.fmwconcepts.com/imagemagick/" target="_blank">Fred's ImageMagick Scripts</a>: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations. With <a href="https://github.com/dlemstra/Magick.NET">Magick.NET</a>, use ImageMagick without having to install ImageMagick on your server or desktop.</p>
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
+<h2><a class="anchor" id="news"></a>News</h2>
-<dd> </dd>
-<dt>affine_matrix</dt>
-<dd>the affine matrix. </dd>
+<p>Now that ImageMagick version 7 is released, we continue to maintain the legacy release of ImageMagick, version 6, at <a href="https://legacy.imagemagick.org/">https://legacy.imagemagick.org</a>. Learn how ImageMagick version 7 differs from previous versions with our <a href="../../www/porting.html">porting guide</a>.</p>
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
+<p>We discovered a bug in the pseudo-random generator prior to ImageMagick 7.0.9-11, the first 3 values repeated because the random state was not initialized properly. As a consequence of the fix, expect a different numerical sequence when seeding (-seed).</p>
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/distort_8c.html" id="DistortImage">DistortImage</a></h2>
+<p>ImageMagick best practices <strong>strongly</strong> encourages you to configure a <a href="../../www/security-policy.html">security policy</a> that suits your local environment.</p>
-<p>DistortImage() distorts an image using various distortion methods, by mapping color lookups of the source image to a new destination image usally of the same size as the source image, unless 'bestfit' is set to true.</p>
+<p>The ImageMagick development process ensures a stable API and <a href="https://abi-laboratory.pro/tracker/timeline/imagemagick/">ABI</a>. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="https://github.com/google/sanitizers/wiki/AddressSanitizer">memory error</a>, <a href="https://github.com/google/sanitizers/wiki/ThreadSanitizer">thread data race</a> detection, and continuous <a href="https://github.com/google/oss-fuzz">fuzzing</a> to detect and prevent security vulnerabilities.</p>
-<p>If 'bestfit' is enabled, and distortion allows it, the destination image is adjusted to ensure the whole source 'image' will just fit within the final destination image, which will be sized and offset accordingly. Also in many cases the virtual offset of the source image will be taken into account in the mapping.</p>
+<p>As an analog to linear (RGB) and non-linear (sRGB) color colorspaces, as of ImageMagick 7.0.7-17, we introduce the LinearGray colorspace. Gray is non-linear grayscale and LinearGray is linear (e.g. -colorspace linear-gray).</p>
-<p>If the '-verbose' control option has been set print to standard error the equicelent '-fx' formula with coefficients for the function, if practical.</p>
+<p>Want more performance from ImageMagick? Try these options:</p>
-<p>The format of the DistortImage() method is:</p>
+<ul>
+<li>add more memory to your system, see <a href="../../www/architecture.html#cache">the pixel cache</a>;</li>
+<li>add more cores to your system, see <a href="../../www/architecture.html#threads">threads of execution support</a>;</li>
+<li>reduce lock contention with the <a href="http://goog-perftools.sourceforge.net/doc/tcmalloc.html">tcmalloc</a> memory allocation library;</li>
+<li>push large images to a solid-state drive, see <a href="../../www/architecture.html#tera-pixel">large image support</a>.</li>
+</ul>
+<p>If these options are prohibitive, you can reduce the quality of the image results. The default build is Q16 HDRI. If you disable <a href="../../www/high-dynamic-range.html">HDRI</a>, you use half the memory and instead of predominately floating point operations, you use the typically more efficient integer operations. The tradeoff is reduced precision and you cannot process out of range pixel values (e.g. negative). If you build the Q8 non-HDRI version of ImageMagick, you again reduce the memory requirements in half-- and once again there is a tradeoff, even less precision and no out of range pixel values. For a Q8 non-HDRI build of ImageMagick, use these <code>configure</code> script options: <code>--with-quantum-depth=8 --disable-hdri</code>.</p>
-<pre class="text">
-Image *DistortImage(const Image *image,const DistortMethod method,
- const size_t number_arguments,const double *arguments,
- MagickBooleanType bestfit, ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image to be distorted. </dd>
-
-<dd> </dd>
-<dt>method</dt>
-<dd>the method of image distortion. </dd>
-
-<dd> ArcDistortion always ignores source image offset, and always 'bestfit' the destination image with the top left corner offset relative to the polar mapping center. </dd>
-
-<dd> Affine, Perspective, and Bilinear, do least squares fitting of the distrotion when more than the minimum number of control point pairs are provided. </dd>
-
-<dd> Perspective, and Bilinear, fall back to a Affine distortion when less than 4 control point pairs are provided. While Affine distortions let you use any number of control point pairs, that is Zero pairs is a No-Op (viewport only) distortion, one pair is a translation and two pairs of control points do a scale-rotate-translate, without any shearing. </dd>
-
-<dd> </dd>
-<dt>number_arguments</dt>
-<dd>the number of arguments given. </dd>
-
-<dd> </dd>
-<dt>arguments</dt>
-<dd>an array of floating point arguments for this method. </dd>
-
-<dd> </dd>
-<dt>bestfit</dt>
-<dd>Attempt to 'bestfit' the size of the resulting image. This also forces the resulting image to be a 'layered' virtual canvas image. Can be overridden using 'distort:viewport' setting. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure </dd>
-
-<dd> Extra Controls from Image meta-data (artifacts)... </dd>
-
-<dd> 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. </dd>
-
-<dd> 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. </dd>
-
-<dd> o "distort:scale" Scale the size of the output canvas by this amount to provide a method of Zooming, and for super-sampling the results. </dd>
-
-<dd> Other settings that can effect results include </dd>
-
-<dd> o 'interpolate' For source image lookups (scale enlargements) </dd>
-
-<dd> o 'filter' Set filter to use for area-resampling (scale shrinking). Set to 'point' to turn off and use 'interpolate' lookup instead </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/distort_8c.html" id="RotateImage">RotateImage</a></h2>
-
-<p>RotateImage() creates a new image that is a rotated copy of an existing one. Positive angles rotate counter-clockwise (right-hand rule), while negative angles rotate clockwise. Rotated images are usually larger than the originals and have 'empty' triangular corners. X axis. Empty triangles left over from shearing the image are filled with the background color defined by member 'background_color' of the image. RotateImage allocates the memory necessary for the new Image structure and returns a pointer to the new image.</p>
-
-<p>The format of the RotateImage method is:</p>
-
-<pre class="text">
-Image *RotateImage(const Image *image,const double degrees,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows.</p>
-
-<dt>image</dt>
-<p>the image.</p>
-
-<dt>degrees</dt>
-<p>Specifies the number of degrees to rotate the image.</p>
-
-<dt>exception</dt>
-<p>return any errors or warnings in this structure.</p>
-
-<h2><a href="../../api/MagickCore/distort_8c.html" id="SparseColorImage">SparseColorImage</a></h2>
-
-<p>SparseColorImage(), given a set of coordinates, interpolates the colors found at those coordinates, across the whole image, using various methods.</p>
-
-<p>The format of the SparseColorImage() method is:</p>
-
-<pre class="text">
-Image *SparseColorImage(const Image *image,
- const SparseColorMethod method,const size_t number_arguments,
- const double *arguments,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image to be filled in. </dd>
-
-<dd> </dd>
-<dt>method</dt>
-<dd>the method to fill in the gradient between the control points. </dd>
-
-<dd> The methods used for SparseColor() are often simular to methods used for DistortImage(), and even share the same code for determination of the function coefficents, though with more dimensions (or resulting values). </dd>
-
-<dd> </dd>
-<dt>number_arguments</dt>
-<dd>the number of arguments given. </dd>
-
-<dd> </dd>
-<dt>arguments</dt>
-<dd>array of floating point arguments for this method-- x,y,color_values-- with color_values given as normalized values. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure </dd>
-
-<dd> </dd>
-</dl>
+<h2><a class="anchor" id="community"></a>Community</h2>
+<p>To join the ImageMagick community, try the <a target="_blank" href="https://imagemagick.org/discourse-server/">discourse server</a>. You can review questions or comments (with informed responses) posed by ImageMagick users or ask your own questions. If you want to contribute image processing algorithms, other enhancements, or bug fixes, open an <a href="https://github.com/ImageMagick/ImageMagick/issues">issue</a>. </p>
</div>
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/www/security-policy.html">Security</a> •
- <a href="../../www/www/architecture.html">Architecture</a>
+ <p><a href="../../www/security-policy.html">Security</a> •
+ <a href="../../www/architecture.html">Architecture</a>
- <a href="distort.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
+ <a href="distort.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
- <a href="../../www/www/links.html">Related</a> •
- <a href="../../www/www/sitemap.html">Sitemap</a>
+ <a href="../../www/links.html">Related</a> •
+ <a href="../../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/www/support.html">Donate</a> •
+ <a href="../../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/www/contact.html">Contact Us</a>
+ <a href="../../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 1st January 2020 09:56 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:36 -->
\ No newline at end of file
diff --git a/www/api/draw.html b/www/api/draw.html
index 7ced453..0b1f7c1 100644
--- a/www/api/draw.html
+++ b/www/api/draw.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -470,12 +470,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 05:11 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 10:00 -->
\ No newline at end of file
diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html
index 06d1cbc..0a0b6a2 100644
--- a/www/api/drawing-wand.html
+++ b/www/api/drawing-wand.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -3927,12 +3927,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 1st January 2020 09:27 -->
\ No newline at end of file
+<!-- Magick Cache 19th February 2020 23:37 -->
\ No newline at end of file
diff --git a/www/api/effect.html b/www/api/effect.html
index a317318..f128382 100644
--- a/www/api/effect.html
+++ b/www/api/effect.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -738,12 +738,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 00:27 -->
\ No newline at end of file
+<!-- Magick Cache 16th February 2020 23:03 -->
\ No newline at end of file
diff --git a/www/api/enhance.html b/www/api/enhance.html
index e762486..d192cfe 100644
--- a/www/api/enhance.html
+++ b/www/api/enhance.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -832,12 +832,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 19:27 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 16:14 -->
\ No newline at end of file
diff --git a/www/api/exception.html b/www/api/exception.html
index cc85e46..6607e88 100644
--- a/www/api/exception.html
+++ b/www/api/exception.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -495,12 +495,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 29th December 2019 14:22 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 22:21 -->
\ No newline at end of file
diff --git a/www/api/feature.html b/www/api/feature.html
index 56f1f67..9a99383 100644
--- a/www/api/feature.html
+++ b/www/api/feature.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="feature.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/feature.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -246,24 +246,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="feature.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="feature.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 29th December 2019 16:55 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 08:35 -->
\ No newline at end of file
diff --git a/www/api/fourier.html b/www/api/fourier.html
index c7778b9..1640f9d 100644
--- a/www/api/fourier.html
+++ b/www/api/fourier.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -203,12 +203,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 29th December 2019 16:55 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 16:15 -->
\ No newline at end of file
diff --git a/www/api/fx.html b/www/api/fx.html
index d19ae0b..6ea976b 100644
--- a/www/api/fx.html
+++ b/www/api/fx.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="fx.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/fx.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -87,179 +87,8 @@
<main class="container">
<div class="magick-template">
<div class="magick-header">
-<p class="text-center"><a href="fx.html#AddNoiseImage">AddNoiseImage</a> • <a href="fx.html#BlueShiftImage">BlueShiftImage</a> • <a href="fx.html#CharcoalImage">CharcoalImage</a> • <a href="fx.html#ColorizeImage">ColorizeImage</a> • <a href="fx.html#ColorMatrixImage">ColorMatrixImage</a> • <a href="fx.html#FxImage">FxImage</a> • <a href="fx.html#ImplodeImage">ImplodeImage</a> • <a href="fx.html#The MorphImages">The MorphImages</a> • <a href="fx.html#PlasmaImage">PlasmaImage</a> • <a href="fx.html#PolaroidImage">PolaroidImage</a> • <a href="fx.html#MagickSepiaToneImage">MagickSepiaToneImage</a> • <a href="fx.html#ShadowImage">ShadowImage</a> • <a href="fx.html#SketchImage">SketchImage</a> • <a href="fx.html#SolarizeImage">SolarizeImage</a> • <a href="fx.html#SteganoImage">SteganoImage</a> • <a href="fx.html#StereoAnaglyphImage">StereoAnaglyphImage</a> • <a href="fx.html#SwirlImage">SwirlImage</a> • <a href="fx.html#TintImage">TintImage</a> • <a href="fx.html#VignetteImage">VignetteImage</a> • <a href="fx.html#WaveImage">WaveImage</a> • <a href="fx.html#WaveletDenoiseImage">WaveletDenoiseImage</a></p>
+<p class="text-center"><a href="fx.html#FxImage">FxImage</a></p>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="AddNoiseImage">AddNoiseImage</a></h2>
-
-<p>AddNoiseImage() adds random noise to the image.</p>
-
-<p>The format of the AddNoiseImage method is:</p>
-
-<pre class="text">
-Image *AddNoiseImage(const Image *image,const NoiseType noise_type,
- const double attenuate,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>channel</dt>
-<dd>the channel type. </dd>
-
-<dd> </dd>
-<dt>noise_type</dt>
-<dd> The type of noise: Uniform, Gaussian, Multiplicative, Impulse, Laplacian, or Poisson. </dd>
-
-<dd> </dd>
-<dt>attenuate</dt>
-<dd> attenuate the random distribution. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="BlueShiftImage">BlueShiftImage</a></h2>
-
-<p>BlueShiftImage() mutes the colors of the image to simulate a scene at nighttime in the moonlight.</p>
-
-<p>The format of the BlueShiftImage method is:</p>
-
-<pre class="text">
-Image *BlueShiftImage(const Image *image,const double factor,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>factor</dt>
-<dd>the shift factor. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="CharcoalImage">CharcoalImage</a></h2>
-
-<p>CharcoalImage() creates a new image that is a copy of an existing one with the edge highlighted. It allocates the memory necessary for the new Image structure and returns a pointer to the new image.</p>
-
-<p>The format of the CharcoalImage method is:</p>
-
-<pre class="text">
-Image *CharcoalImage(const Image *image,const double radius,
- const double sigma,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>radius</dt>
-<dd>the radius of the pixel neighborhood. </dd>
-
-<dd> </dd>
-<dt>sigma</dt>
-<dd>the standard deviation of the Gaussian, in pixels. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="ColorizeImage">ColorizeImage</a></h2>
-
-<p>ColorizeImage() blends the fill color with each pixel in the image. A percentage blend is specified with opacity. Control the application of different color components by specifying a different percentage for each component (e.g. 90/100/10 is 90 red, 100 green, and 10 blue).</p>
-
-<p>The format of the ColorizeImage method is:</p>
-
-<pre class="text">
-Image *ColorizeImage(const Image *image,const char *blend,
- const PixelInfo *colorize,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>blend</dt>
-<dd> A character string indicating the level of blending as a percentage. </dd>
-
-<dd> </dd>
-<dt>colorize</dt>
-<dd>A color value. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="ColorMatrixImage">ColorMatrixImage</a></h2>
-
-<p>ColorMatrixImage() applies color transformation to an image. This method permits saturation changes, hue rotation, luminance to alpha, and various other effects. Although variable-sized transformation matrices can be used, typically one uses a 5x5 matrix for an RGBA image and a 6x6 for CMYKA (or RGBA with offsets). The matrix is similar to those used by Adobe Flash except offsets are in column 6 rather than 5 (in support of CMYKA images) and offsets are normalized (divide Flash offset by 255).</p>
-
-<p>The format of the ColorMatrixImage method is:</p>
-
-<pre class="text">
-Image *ColorMatrixImage(const Image *image,
- const KernelInfo *color_matrix,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>color_matrix</dt>
-<dd> the color matrix. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
<h2><a href="../../api/MagickCore/fx_8c.html" id="FxImage">FxImage</a></h2>
<p>FxImage() applies a mathematical expression to the specified image.</p>
@@ -291,582 +120,31 @@
<dd> </dd>
</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="ImplodeImage">ImplodeImage</a></h2>
-
-<p>ImplodeImage() creates a new image that is a copy of an existing one with the image pixels "implode" by the specified percentage. It allocates the memory necessary for the new Image structure and returns a pointer to the new image.</p>
-
-<p>The format of the ImplodeImage method is:</p>
-
-<pre class="text">
-Image *ImplodeImage(const Image *image,const double amount,
- const PixelInterpolateMethod method,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>implode_image</dt>
-<dd>Method ImplodeImage returns a pointer to the image after it is implode. A null image is returned if there is a memory shortage. </dd>
-
-<dd> </dd>
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>amount</dt>
-<dd> Define the extent of the implosion. </dd>
-
-<dd> </dd>
-<dt>method</dt>
-<dd>the pixel interpolation method. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="The_MorphImages">The MorphImages</a></h2>
-
-<p>The MorphImages() method requires a minimum of two images. The first image is transformed into the second by a number of intervening images as specified by frames.</p>
-
-<p>The format of the MorphImage method is:</p>
-
-<pre class="text">
-Image *MorphImages(const Image *image,const size_t number_frames,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>number_frames</dt>
-<dd> Define the number of in-between image to generate. The more in-between frames, the smoother the morph. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="PlasmaImage">PlasmaImage</a></h2>
-
-<p>PlasmaImage() initializes an image with plasma fractal values. The image must be initialized with a base color and the random number generator seeded before this method is called.</p>
-
-<p>The format of the PlasmaImage method is:</p>
-
-<pre class="text">
-MagickBooleanType PlasmaImage(Image *image,const SegmentInfo *segment,
- size_t attenuate,size_t depth,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>segment</dt>
-<dd> Define the region to apply plasma fractals values. </dd>
-
-<dd> </dd>
-<dt>attenuate</dt>
-<dd>Define the plasma attenuation factor. </dd>
-
-<dd> </dd>
-<dt>depth</dt>
-<dd>Limit the plasma recursion depth. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="PolaroidImage">PolaroidImage</a></h2>
-
-<p>PolaroidImage() simulates a Polaroid picture.</p>
-
-<p>The format of the PolaroidImage method is:</p>
-
-<pre class="text">
-Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
- const char *caption,const double angle,
- const PixelInterpolateMethod method,ExceptionInfo exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>draw_info</dt>
-<dd>the draw info. </dd>
-
-<dd> </dd>
-<dt>caption</dt>
-<dd>the Polaroid caption. </dd>
-
-<dd> </dd>
-<dt>angle</dt>
-<dd>Apply the effect along this angle. </dd>
-
-<dd> </dd>
-<dt>method</dt>
-<dd>the pixel interpolation method. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="MagickSepiaToneImage">MagickSepiaToneImage</a></h2>
-
-<p>MagickSepiaToneImage() applies a special effect to the image, similar to the effect achieved in a photo darkroom by sepia toning. Threshold ranges from 0 to QuantumRange and is a measure of the extent of the sepia toning. A threshold of 80 is a good starting point for a reasonable tone.</p>
-
-<p>The format of the SepiaToneImage method is:</p>
-
-<pre class="text">
-Image *SepiaToneImage(const Image *image,const double threshold,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>threshold</dt>
-<dd>the tone threshold. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="ShadowImage">ShadowImage</a></h2>
-
-<p>ShadowImage() simulates a shadow from the specified image and returns it.</p>
-
-<p>The format of the ShadowImage method is:</p>
-
-<pre class="text">
-Image *ShadowImage(const Image *image,const double alpha,
- const double sigma,const ssize_t x_offset,const ssize_t y_offset,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>alpha</dt>
-<dd>percentage transparency. </dd>
-
-<dd> </dd>
-<dt>sigma</dt>
-<dd>the standard deviation of the Gaussian, in pixels. </dd>
-
-<dd> </dd>
-<dt>x_offset</dt>
-<dd>the shadow x-offset. </dd>
-
-<dd> </dd>
-<dt>y_offset</dt>
-<dd>the shadow y-offset. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="SketchImage">SketchImage</a></h2>
-
-<p>SketchImage() simulates a pencil sketch. We convolve the image with a Gaussian operator of the given radius and standard deviation (sigma). For reasonable results, radius should be larger than sigma. Use a radius of 0 and SketchImage() selects a suitable radius for you. Angle gives the angle of the sketch.</p>
-
-<p>The format of the SketchImage method is:</p>
-
-<pre class="text">
- Image *SketchImage(const Image *image,const double radius,
-const double sigma,const double angle,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>radius</dt>
-<dd>the radius of the Gaussian, in pixels, not counting the center pixel. </dd>
-
-<dd> </dd>
-<dt>sigma</dt>
-<dd>the standard deviation of the Gaussian, in pixels. </dd>
-
-<dd> </dd>
-<dt>angle</dt>
-<dd>apply the effect along this angle. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="SolarizeImage">SolarizeImage</a></h2>
-
-<p>SolarizeImage() applies a special effect to the image, similar to the effect achieved in a photo darkroom by selectively exposing areas of photo sensitive paper to light. Threshold ranges from 0 to QuantumRange and is a measure of the extent of the solarization.</p>
-
-<p>The format of the SolarizeImage method is:</p>
-
-<pre class="text">
-MagickBooleanType SolarizeImage(Image *image,const double threshold,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>threshold</dt>
-<dd> Define the extent of the solarization. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="SteganoImage">SteganoImage</a></h2>
-
-<p>SteganoImage() hides a digital watermark within the image. Recover the hidden watermark later to prove that the authenticity of an image. Offset defines the start position within the image to hide the watermark.</p>
-
-<p>The format of the SteganoImage method is:</p>
-
-<pre class="text">
-Image *SteganoImage(const Image *image,Image *watermark,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>watermark</dt>
-<dd>the watermark image. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="StereoAnaglyphImage">StereoAnaglyphImage</a></h2>
-
-<p>StereoAnaglyphImage() combines two images and produces a single image that is the composite of a left and right image of a stereo pair. Special red-green stereo glasses are required to view this effect.</p>
-
-<p>The format of the StereoAnaglyphImage method is:</p>
-
-<pre class="text">
-Image *StereoImage(const Image *left_image,const Image *right_image,
- ExceptionInfo *exception)
-Image *StereoAnaglyphImage(const Image *left_image,
- const Image *right_image,const ssize_t x_offset,const ssize_t y_offset,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>left_image</dt>
-<dd>the left image. </dd>
-
-<dd> </dd>
-<dt>right_image</dt>
-<dd>the right image. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-<dt>x_offset</dt>
-<dd>amount, in pixels, by which the left image is offset to the right of the right image. </dd>
-
-<dd> </dd>
-<dt>y_offset</dt>
-<dd>amount, in pixels, by which the left image is offset to the bottom of the right image. </dd>
-
-<dd> </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="SwirlImage">SwirlImage</a></h2>
-
-<p>SwirlImage() swirls the pixels about the center of the image, where degrees indicates the sweep of the arc through which each pixel is moved. You get a more dramatic effect as the degrees move from 1 to 360.</p>
-
-<p>The format of the SwirlImage method is:</p>
-
-<pre class="text">
-Image *SwirlImage(const Image *image,double degrees,
- const PixelInterpolateMethod method,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>degrees</dt>
-<dd>Define the tightness of the swirling effect. </dd>
-
-<dd> </dd>
-<dt>method</dt>
-<dd>the pixel interpolation method. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="TintImage">TintImage</a></h2>
-
-<p>TintImage() applies a color vector to each pixel in the image. The length of the vector is 0 for black and white and at its maximum for the midtones. The vector weighting function is f(x)=(1-(4.0*((x-0.5)*(x-0.5))))</p>
-
-<p>The format of the TintImage method is:</p>
-
-<pre class="text">
-Image *TintImage(const Image *image,const char *blend,
- const PixelInfo *tint,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>blend</dt>
-<dd>A color value used for tinting. </dd>
-
-<dd> </dd>
-<dt>tint</dt>
-<dd>A color value used for tinting. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="VignetteImage">VignetteImage</a></h2>
-
-<p>VignetteImage() softens the edges of the image in vignette style.</p>
-
-<p>The format of the VignetteImage method is:</p>
-
-<pre class="text">
-Image *VignetteImage(const Image *image,const double radius,
- const double sigma,const ssize_t x,const ssize_t y,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>radius</dt>
-<dd>the radius of the pixel neighborhood. </dd>
-
-<dd> </dd>
-<dt>sigma</dt>
-<dd>the standard deviation of the Gaussian, in pixels. </dd>
-
-<dd> </dd>
-<dt>x, y</dt>
-<dd> Define the x and y ellipse offset. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="WaveImage">WaveImage</a></h2>
-
-<p>WaveImage() creates a "ripple" effect in the image by shifting the pixels vertically along a sine wave whose amplitude and wavelength is specified by the given parameters.</p>
-
-<p>The format of the WaveImage method is:</p>
-
-<pre class="text">
-Image *WaveImage(const Image *image,const double amplitude,
- const double wave_length,const PixelInterpolateMethod method,
- ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>amplitude, wave_length</dt>
-<dd> Define the amplitude and wave length of the sine wave. </dd>
-
-<dd> </dd>
-<dt>interpolate</dt>
-<dd>the pixel interpolation method. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
-<h2><a href="../../api/MagickCore/fx_8c.html" id="WaveletDenoiseImage">WaveletDenoiseImage</a></h2>
-
-<p>WaveletDenoiseImage() removes noise from the image using a wavelet transform. The wavelet transform is a fast hierarchical scheme for processing an image using a set of consecutive lowpass and high_pass filters, followed by a decimation. This results in a decomposition into different scales which can be regarded as different “frequency bands”, determined by the mother wavelet. Adapted from dcraw.c by David Coffin.</p>
-
-<p>The format of the WaveletDenoiseImage method is:</p>
-
-<pre class="text">
-Image *WaveletDenoiseImage(const Image *image,const double threshold,
- const double softness,ExceptionInfo *exception)
-</pre>
-
-<p>A description of each parameter follows:</p>
-
-<dd>
-</dd>
-
-<dd> </dd>
-<dl class="dl-horizontal">
-<dt>image</dt>
-<dd>the image. </dd>
-
-<dd> </dd>
-<dt>threshold</dt>
-<dd>set the threshold for smoothing. </dd>
-
-<dd> </dd>
-<dt>softness</dt>
-<dd>attenuate the smoothing threshold. </dd>
-
-<dd> </dd>
-<dt>exception</dt>
-<dd>return any errors or warnings in this structure. </dd>
-
-<dd> </dd>
-</dl>
</div>
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="fx.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="fx.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 23:22 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 20:06 -->
\ No newline at end of file
diff --git a/www/api/histogram.html b/www/api/histogram.html
index 22bba40..0995352 100644
--- a/www/api/histogram.html
+++ b/www/api/histogram.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -263,12 +263,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 05:06 -->
\ No newline at end of file
+<!-- Magick Cache 15th February 2020 21:56 -->
\ No newline at end of file
diff --git a/www/api/image-view.html b/www/api/image-view.html
index 27cf7c9..f63c812 100644
--- a/www/api/image-view.html
+++ b/www/api/image-view.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/image-view.html" rel="canonical" />
- <link href="../www/images/wand.png" rel="icon" />
- <link href="../www/images/wand.ico" rel="shortcut icon" />
- <link href="../www/assets/magick.css" rel="stylesheet" />
+ <link href="../../api/image-view.html" rel="canonical" />
+ <link href="../images/wand.png" rel="icon" />
+ <link href="../images/wand.ico" rel="shortcut icon" />
+ <link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../www/index.html">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/download.html">Download</a>
+ <a class="nav-link" href="../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -398,7 +398,7 @@
</dl>
<h2><a href="../../api/MagickCore/image-view_8c.html" id="IsImageView">IsImageView</a></h2>
-<p>IsImageView() returns MagickTrue if the the parameter is verified as a image view object.</p>
+<p>IsImageView() returns MagickTrue if the parameter is verified as a image view object.</p>
<p>The format of the IsImageView method is:</p>
@@ -650,24 +650,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/www/security-policy.html">Security</a> •
- <a href="../www/www/architecture.html">Architecture</a>
+ <p><a href="../www/security-policy.html">Security</a> •
+ <a href="../www/architecture.html">Architecture</a>
- <a href="image-view.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../www/images/wand.ico"/></a>
+ <a href="image-view.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/www/links.html">Related</a> •
- <a href="../www/www/sitemap.html">Sitemap</a>
+ <a href="../www/links.html">Related</a> •
+ <a href="../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../www/www/support.html">Donate</a> •
+ <a href="../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/www/contact.html">Contact Us</a>
+ <a href="../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 3rd January 2020 11:30 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 19:38 -->
\ No newline at end of file
diff --git a/www/api/image.html b/www/api/image.html
index 5b3b60f..442207c 100644
--- a/www/api/image.html
+++ b/www/api/image.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="image.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/image.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -1199,24 +1199,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="image.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="image.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 18:38 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 07:20 -->
\ No newline at end of file
diff --git a/www/api/layer.html b/www/api/layer.html
index e7a2f40..301810a 100644
--- a/www/api/layer.html
+++ b/www/api/layer.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="layer.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/layer.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -398,7 +398,7 @@
<dd> MosaicLayer: Start with the virtual canvas of the first image, enlarging left and right edges to contain all images. Images with negative offsets will be clipped. </dd>
-<dd> TrimBoundsLayer: Determine the overall bounds of all the image layers just as in "MergeLayer", then adjust the the canvas and offsets to be relative to those bounds, without overlaying the images. </dd>
+<dd> TrimBoundsLayer: Determine the overall bounds of all the image layers just as in "MergeLayer", then adjust the canvas and offsets to be relative to those bounds, without overlaying the images. </dd>
<dd> WARNING: a new image is not returned, the original image sequence page data is modified instead. </dd>
@@ -412,24 +412,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="layer.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="layer.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 22:14 -->
\ No newline at end of file
+<!-- Magick Cache 15th February 2020 20:55 -->
\ No newline at end of file
diff --git a/www/api/list.html b/www/api/list.html
index f0fa8b1..77ac00d 100644
--- a/www/api/list.html
+++ b/www/api/list.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -764,12 +764,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:35 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 05:09 -->
\ No newline at end of file
diff --git a/www/api/magick++-classes.html b/www/api/magick++-classes.html
index c33ed80..f29a3b3 100644
--- a/www/api/magick++-classes.html
+++ b/www/api/magick++-classes.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -158,12 +158,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 06:26 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 16:16 -->
\ No newline at end of file
diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html
index 8b761e7..6da0a07 100644
--- a/www/api/magick-deprecate.html
+++ b/www/api/magick-deprecate.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -105,12 +105,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 02:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 23:13 -->
\ No newline at end of file
diff --git a/www/api/magick-image.html b/www/api/magick-image.html
index 27bd277..34271b1 100644
--- a/www/api/magick-image.html
+++ b/www/api/magick-image.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -8315,12 +8315,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 3rd January 2020 18:20 -->
\ No newline at end of file
+<!-- Magick Cache 15th February 2020 06:31 -->
\ No newline at end of file
diff --git a/www/api/magick-property.html b/www/api/magick-property.html
index 5367f7d..40a3d89 100644
--- a/www/api/magick-property.html
+++ b/www/api/magick-property.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -1966,12 +1966,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 31st December 2019 17:59 -->
\ No newline at end of file
+<!-- Magick Cache 19th February 2020 22:13 -->
\ No newline at end of file
diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html
index 1d9dc6f..0dc46bd 100644
--- a/www/api/magick-wand.html
+++ b/www/api/magick-wand.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -689,12 +689,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 11:37 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 17:52 -->
\ No newline at end of file
diff --git a/www/api/magick.html b/www/api/magick.html
index e1acca8..a8d44ad 100644
--- a/www/api/magick.html
+++ b/www/api/magick.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -219,12 +219,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 12:41 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 22:26 -->
\ No newline at end of file
diff --git a/www/api/memory.html b/www/api/memory.html
index 69fadc7..e41c049 100644
--- a/www/api/memory.html
+++ b/www/api/memory.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -525,12 +525,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 29th December 2019 14:22 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 09:00 -->
\ No newline at end of file
diff --git a/www/api/mime.html b/www/api/mime.html
index 7e0f6cb..4ef0b05 100644
--- a/www/api/mime.html
+++ b/www/api/mime.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="mime.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/mime.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -244,24 +244,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="mime.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="mime.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 12:22 -->
\ No newline at end of file
+<!-- Magick Cache 16th February 2020 20:24 -->
\ No newline at end of file
diff --git a/www/api/module.html b/www/api/module.html
index 82552c4..ba6baa8 100644
--- a/www/api/module.html
+++ b/www/api/module.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -523,12 +523,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 22:03 -->
\ No newline at end of file
+<!-- Magick Cache 15th February 2020 08:50 -->
\ No newline at end of file
diff --git a/www/api/mogrify.html b/www/api/mogrify.html
index 48a557c..50f5553 100644
--- a/www/api/mogrify.html
+++ b/www/api/mogrify.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/mogrify.html" rel="canonical" />
- <link href="../../www/images/wand.png" rel="icon" />
- <link href="../../www/images/wand.ico" rel="shortcut icon" />
- <link href="../../www/assets/magick.css" rel="stylesheet" />
+ <link href="mogrify.html" rel="canonical" />
+ <link href="../../images/wand.png" rel="icon" />
+ <link href="../../images/wand.ico" rel="shortcut icon" />
+ <link href="../assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/download.html">Download</a>
+ <a class="nav-link" href="../../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -139,24 +139,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/www/security-policy.html">Security</a> •
- <a href="../../www/www/architecture.html">Architecture</a>
+ <p><a href="../../www/security-policy.html">Security</a> •
+ <a href="../../www/architecture.html">Architecture</a>
- <a href="mogrify.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
+ <a href="mogrify.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
- <a href="../../www/www/links.html">Related</a> •
- <a href="../../www/www/sitemap.html">Sitemap</a>
+ <a href="../../www/links.html">Related</a> •
+ <a href="../../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/www/support.html">Donate</a> •
+ <a href="../../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/www/contact.html">Contact Us</a>
+ <a href="../../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 30th December 2019 12:51 -->
\ No newline at end of file
+<!-- Magick Cache 19th February 2020 22:49 -->
\ No newline at end of file
diff --git a/www/api/monitor.html b/www/api/monitor.html
index 0ae6647..4565772 100644
--- a/www/api/monitor.html
+++ b/www/api/monitor.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -218,12 +218,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 29th December 2019 14:22 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 21:16 -->
\ No newline at end of file
diff --git a/www/api/montage.html b/www/api/montage.html
index 6691a10..19228f5 100644
--- a/www/api/montage.html
+++ b/www/api/montage.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -105,12 +105,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 15:25 -->
\ No newline at end of file
+<!-- Magick Cache 16th February 2020 09:04 -->
\ No newline at end of file
diff --git a/www/api/morphology.html b/www/api/morphology.html
index 8b5f709..32ba0d7 100644
--- a/www/api/morphology.html
+++ b/www/api/morphology.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/morphology.html" rel="canonical" />
- <link href="../../www/images/wand.png" rel="icon" />
- <link href="../../www/images/wand.ico" rel="shortcut icon" />
- <link href="../../www/assets/magick.css" rel="stylesheet" />
+ <link href="morphology.html" rel="canonical" />
+ <link href="../../images/wand.png" rel="icon" />
+ <link href="../../images/wand.ico" rel="shortcut icon" />
+ <link href="../assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/download.html">Download</a>
+ <a class="nav-link" href="../../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -628,24 +628,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/www/security-policy.html">Security</a> •
- <a href="../../www/www/architecture.html">Architecture</a>
+ <p><a href="../../www/security-policy.html">Security</a> •
+ <a href="../../www/architecture.html">Architecture</a>
- <a href="morphology.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
+ <a href="morphology.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
- <a href="../../www/www/links.html">Related</a> •
- <a href="../../www/www/sitemap.html">Sitemap</a>
+ <a href="../../www/links.html">Related</a> •
+ <a href="../../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/www/support.html">Donate</a> •
+ <a href="../../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/www/contact.html">Contact Us</a>
+ <a href="../../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 04:23 -->
\ No newline at end of file
+<!-- Magick Cache 16th February 2020 18:25 -->
\ No newline at end of file
diff --git a/www/api/paint.html b/www/api/paint.html
index 167c60a..de22c61 100644
--- a/www/api/paint.html
+++ b/www/api/paint.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="paint.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/paint.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -305,24 +305,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="paint.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="paint.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 23:22 -->
\ No newline at end of file
+<!-- Magick Cache 15th February 2020 02:58 -->
\ No newline at end of file
diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html
index 5a763d6..30a0f74 100644
--- a/www/api/pixel-iterator.html
+++ b/www/api/pixel-iterator.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -528,12 +528,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 30th December 2019 04:48 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 08:53 -->
\ No newline at end of file
diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html
index 5e6156a..d3866b9 100644
--- a/www/api/pixel-wand.html
+++ b/www/api/pixel-wand.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -1597,12 +1597,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 03:16 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 23:45 -->
\ No newline at end of file
diff --git a/www/api/profile.html b/www/api/profile.html
index 02847f8..4eb8d07 100644
--- a/www/api/profile.html
+++ b/www/api/profile.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -370,12 +370,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 3rd January 2020 09:48 -->
\ No newline at end of file
+<!-- Magick Cache 16th February 2020 03:47 -->
\ No newline at end of file
diff --git a/www/api/property.html b/www/api/property.html
index a72c873..dfbf9b8 100644
--- a/www/api/property.html
+++ b/www/api/property.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -422,12 +422,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 29th December 2019 23:26 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 19:22 -->
\ No newline at end of file
diff --git a/www/api/quantize.html b/www/api/quantize.html
index 60dd5e9..429a2ca 100644
--- a/www/api/quantize.html
+++ b/www/api/quantize.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/quantize.html" rel="canonical" />
- <link href="../../www/images/wand.png" rel="icon" />
- <link href="../../www/images/wand.ico" rel="shortcut icon" />
- <link href="../../www/assets/magick.css" rel="stylesheet" />
+ <link href="quantize.html" rel="canonical" />
+ <link href="../../images/wand.png" rel="icon" />
+ <link href="../../images/wand.ico" rel="shortcut icon" />
+ <link href="../assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/download.html">Download</a>
+ <a class="nav-link" href="../../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -307,7 +307,7 @@
<pre class="text">
MagickBooleanType KmeansImage(Image *image,const size_t number_colors,
- const size_t max_iterations,const double max_distortion,
+ const size_t max_iterations,const double tolerance,
ExceptionInfo *exception)
</pre>
@@ -330,8 +330,8 @@
<dd>maximum number of iterations while converging. </dd>
<dd> </dd>
-<dt>max_distortion</dt>
-<dd>the maximum quantization distortion. </dd>
+<dt>tolerance</dt>
+<dd>the maximum tolerance. </dd>
<dd> </dd>
<dt>exception</dt>
@@ -537,24 +537,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/www/security-policy.html">Security</a> •
- <a href="../../www/www/architecture.html">Architecture</a>
+ <p><a href="../../www/security-policy.html">Security</a> •
+ <a href="../../www/architecture.html">Architecture</a>
- <a href="quantize.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
+ <a href="quantize.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
- <a href="../../www/www/links.html">Related</a> •
- <a href="../../www/www/sitemap.html">Sitemap</a>
+ <a href="../../www/links.html">Related</a> •
+ <a href="../../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/www/support.html">Donate</a> •
+ <a href="../../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/www/contact.html">Contact Us</a>
+ <a href="../../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 19:00 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 04:58 -->
\ No newline at end of file
diff --git a/www/api/registry.html b/www/api/registry.html
index b0aeb77..ed7d1fa 100644
--- a/www/api/registry.html
+++ b/www/api/registry.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -276,12 +276,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 14:18 -->
\ No newline at end of file
+<!-- Magick Cache 17th February 2020 18:52 -->
\ No newline at end of file
diff --git a/www/api/resize.html b/www/api/resize.html
index 0b03f6a..52933a5 100644
--- a/www/api/resize.html
+++ b/www/api/resize.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="resize.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/resize.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -454,24 +454,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="resize.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="resize.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 23:22 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 20:05 -->
\ No newline at end of file
diff --git a/www/api/resource.html b/www/api/resource.html
index 16aa2be..8a31a9a 100644
--- a/www/api/resource.html
+++ b/www/api/resource.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -293,12 +293,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 02:25 -->
\ No newline at end of file
+<!-- Magick Cache 16th February 2020 18:33 -->
\ No newline at end of file
diff --git a/www/api/segment.html b/www/api/segment.html
index 1cfd550..fb74723 100644
--- a/www/api/segment.html
+++ b/www/api/segment.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="segment.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/segment.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -126,24 +126,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="segment.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="segment.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 10:12 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 19:50 -->
\ No newline at end of file
diff --git a/www/api/shear.html b/www/api/shear.html
index ad2395a..1fe3e1e 100644
--- a/www/api/shear.html
+++ b/www/api/shear.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="shear.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/shear.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -197,24 +197,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="shear.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="shear.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 2nd January 2020 17:34 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 20:06 -->
\ No newline at end of file
diff --git a/www/api/signature.html b/www/api/signature.html
index 6473d33..26a03ed 100644
--- a/www/api/signature.html
+++ b/www/api/signature.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -131,12 +131,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 05:26 -->
\ No newline at end of file
+<!-- Magick Cache 15th February 2020 20:52 -->
\ No newline at end of file
diff --git a/www/api/statistic.html b/www/api/statistic.html
index 5bf054d..5a20fdb 100644
--- a/www/api/statistic.html
+++ b/www/api/statistic.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -513,12 +513,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 31st December 2019 16:54 -->
\ No newline at end of file
+<!-- Magick Cache 14th February 2020 14:25 -->
\ No newline at end of file
diff --git a/www/api/stream.html b/www/api/stream.html
index f7af641..9211e03 100644
--- a/www/api/stream.html
+++ b/www/api/stream.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/stream.html" rel="canonical" />
- <link href="../www/images/wand.png" rel="icon" />
- <link href="../www/images/wand.ico" rel="shortcut icon" />
- <link href="../www/assets/magick.css" rel="stylesheet" />
+ <link href="../../api/stream.html" rel="canonical" />
+ <link href="../images/wand.png" rel="icon" />
+ <link href="../images/wand.ico" rel="shortcut icon" />
+ <link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../www/index.html">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/download.html">Download</a>
+ <a class="nav-link" href="../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -132,24 +132,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/www/security-policy.html">Security</a> •
- <a href="../www/www/architecture.html">Architecture</a>
+ <p><a href="../www/security-policy.html">Security</a> •
+ <a href="../www/architecture.html">Architecture</a>
- <a href="stream.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../www/images/wand.ico"/></a>
+ <a href="stream.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/www/links.html">Related</a> •
- <a href="../www/www/sitemap.html">Sitemap</a>
+ <a href="../www/links.html">Related</a> •
+ <a href="../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../www/www/support.html">Donate</a> •
+ <a href="../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/www/contact.html">Contact Us</a>
+ <a href="../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 1st January 2020 16:15 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 02:01 -->
\ No newline at end of file
diff --git a/www/api/transform.html b/www/api/transform.html
index 1a8c983..6c92bbc 100644
--- a/www/api/transform.html
+++ b/www/api/transform.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/api/transform.html" rel="canonical" />
- <link href="../../www/images/wand.png" rel="icon" />
- <link href="../../www/images/wand.ico" rel="shortcut icon" />
- <link href="../../www/assets/magick.css" rel="stylesheet" />
+ <link href="transform.html" rel="canonical" />
+ <link href="../../images/wand.png" rel="icon" />
+ <link href="../../images/wand.ico" rel="shortcut icon" />
+ <link href="../assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/download.html">Download</a>
+ <a class="nav-link" href="../../www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -548,24 +548,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/www/security-policy.html">Security</a> •
- <a href="../../www/www/architecture.html">Architecture</a>
+ <p><a href="../../www/security-policy.html">Security</a> •
+ <a href="../../www/architecture.html">Architecture</a>
- <a href="transform.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
+ <a href="transform.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
- <a href="../../www/www/links.html">Related</a> •
- <a href="../../www/www/sitemap.html">Sitemap</a>
+ <a href="../../www/links.html">Related</a> •
+ <a href="../../www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/www/support.html">Donate</a> •
+ <a href="../../www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/www/contact.html">Contact Us</a>
+ <a href="../../www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 00:55 -->
\ No newline at end of file
+<!-- Magick Cache 15th February 2020 06:43 -->
\ No newline at end of file
diff --git a/www/api/version.html b/www/api/version.html
index a788b0e..045a4bd 100644
--- a/www/api/version.html
+++ b/www/api/version.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="version.html" rel="canonical" />
- <link href="../../images/wand.png" rel="icon" />
- <link href="../../images/wand.ico" rel="shortcut icon" />
- <link href="../assets/magick.css" rel="stylesheet" />
+ <link href="../www/api/version.html" rel="canonical" />
+ <link href="../../www/images/wand.png" rel="icon" />
+ <link href="../../www/images/wand.ico" rel="shortcut icon" />
+ <link href="../../www/assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../../www/images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../../www/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/download.html">Download</a>
+ <a class="nav-link" href="../../www/www/download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="../../www/www/command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="../../www/www/command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/resources.html">Resources</a>
+ <a class="nav-link" href="../../www/www/resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../../www/develop.html">Develop</a>
+ <a class="nav-link" href="../../www/www/develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="../../www/www/search.html">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -281,24 +281,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../../www/security-policy.html">Security</a> •
- <a href="../../www/architecture.html">Architecture</a>
+ <p><a href="../../www/www/security-policy.html">Security</a> •
+ <a href="../../www/www/architecture.html">Architecture</a>
- <a href="version.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../images/wand.ico"/></a>
+ <a href="version.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../../www/images/wand.ico"/></a>
- <a href="../../www/links.html">Related</a> •
- <a href="../../www/sitemap.html">Sitemap</a>
+ <a href="../../www/www/links.html">Related</a> •
+ <a href="../../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="../../www/support.html">Donate</a> •
+ <a href="../../www/www/support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../../www/contact.html">Contact Us</a>
+ <a href="../../www/www/contact.html">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="../../www/assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 4th January 2020 14:45 -->
\ No newline at end of file
+<!-- Magick Cache 18th February 2020 02:34 -->
\ No newline at end of file
diff --git a/www/api/wand-view.html b/www/api/wand-view.html
index a3091a2..d31147e 100644
--- a/www/api/wand-view.html
+++ b/www/api/wand-view.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -330,7 +330,7 @@
</dl>
<h2><a href="../../api/MagickWand/wand-view_8c.html" id="IsWandView">IsWandView</a></h2>
-<p>IsWandView() returns MagickTrue if the the parameter is verified as a wand view object.</p>
+<p>IsWandView() returns MagickTrue if the parameter is verified as a wand view object.</p>
<p>The format of the IsWandView method is:</p>
@@ -584,12 +584,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/contact.html">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 1st January 2020 15:45 -->
\ No newline at end of file
+<!-- Magick Cache 20th February 2020 13:37 -->
\ No newline at end of file
diff --git a/www/architecture.html b/www/architecture.html
index 7ec4668..7394377 100644
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -166,7 +166,7 @@
<p>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 8-bit gray 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 <a href="command-line-options.html#version">‑version</a> option: </p>
-<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>identify -version</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>Version: ImageMagick 7.0.9-14 2020-01-01 Q16 https://imagemagick.org</span></pre>
+<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>identify -version</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>Version: ImageMagick 7.0.9-25 2020-02-01 Q16 https://imagemagick.org</span></pre>
<p>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 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.</p>
<h3><a class="anchor" id="authentic-pixels"></a>Access the Pixel Cache</h3>
@@ -326,22 +326,33 @@
<p>You can set these limits either as a <a href="security-policy.html">security policy</a> (see <a href="https://imagemagick.org/source/policy.xml">policy.xml</a>), with an <a href="resources.html#environment">environment variable</a>, with the <a href="command-line-options.html#limit">-limit</a> command line option, or with the <a href="api/resource.html#SetMagickResourceLimit">SetMagickResourceLimit()</a> MagickCore API method. As an example, our online web interface to ImageMagick, <a href="../MagickStudio/scripts/MagickStudio.cgi">ImageMagick Studio</a>, includes these policy limits to help prevent a denial-of-service:</p>
<pre class="highlight"><code><policymap>
+ <!-- temporary path must be a preexisting writable directory -->
<policy domain="resource" name="temporary-path" value="/tmp"/>
<policy domain="resource" name="memory" value="256MiB"/>
<policy domain="resource" name="map" value="512MiB"/>
<policy domain="resource" name="width" value="8KP"/>
<policy domain="resource" name="height" value="8KP"/>
- <policy domain="resource" name="area" value="128MB"/>
+ <policy domain="resource" name="area" value="16KP"/>
<policy domain="resource" name="disk" value="1GiB"/>
<policy domain="resource" name="file" value="768"/>
<policy domain="resource" name="thread" value="2"/>
<policy domain="resource" name="throttle" value="0"/>
<policy domain="resource" name="time" value="120"/>
+ <policy domain="resource" name="list-length" value="128"/>
<policy domain="system" name="precision" value="6"/>
- <policy domain="cache" name="shared-secret" value="replace with your secret phrase" stealth="true"/>
- <policy domain="delegate" rights="none" pattern="HTTPS" />
- <policy domain="path" rights="none" pattern="@*"/> <!-- indirect reads not permitted -->
-</policymap>
+ <policy domain="cache" name="shared-secret" stealth="true" value="replace with your secret phrase"/>
+ <policy domain="coder" rights="none" pattern="MVG" />
+ <policy domain="coder" rights="none" pattern="EPS" />
+ <policy domain="coder" rights="none" pattern="PS" />
+ <policy domain="coder" rights="none" pattern="PS2" />
+ <policy domain="coder" rights="none" pattern="PS3" />
+ <policy domain="coder" rights="none" pattern="PDF" />
+ <policy domain="coder" rights="none" pattern="XPS" />
+ <policy domain="filter" rights="none" pattern="*" />
+ <policy domain="delegate" rights="none" pattern="HTTPS" /> <!-- prevent 'curl' program from reading HTTPS URL's -->
+ <policy domain="delegate" rights="none" pattern="SHOW" />
+ <policy domain="delegate" rights="none" pattern="WIN" />
+ <policy domain="path" rights="none" pattern="@*"/> <!-- indirect reads not permitted -->
</code></pre>
<p>Since we process multiple simultaneous sessions, we don't want any one session consuming all the available memory.With this policy, large images are cached to disk. If the image is too large and exceeds the pixel cache disk limit, the program exits. In addition, we place a time limit to prevent any run-away processing tasks. If any one image has a width or height that exceeds 8192 pixels, an exception is thrown and processing stops. As of ImageMagick 7.0.1-8 you can prevent the use of any delegate or all delegates (set the pattern to "*"). Note, prior to this release, use a domain of "coder" to prevent delegate usage (e.g. domain="coder" rights="none" pattern="HTTPS"). The policy also prevents indirect reads. If you want to, for example, read text from a file (e.g. caption:@myCaption.txt), you'll need to remove this policy.</p>
@@ -371,7 +382,7 @@
<h3>Distributed Pixel Cache</h3>
<p>A distributed pixel cache is an extension of the traditional pixel cache available on a single host. The distributed pixel cache may span multiple servers so that it can grow in size and transactional capacity to support very large images. Start up the pixel cache server on one or more machines. When you read or operate on an image and the local pixel cache resources are exhausted, ImageMagick contacts one or more of these remote pixel servers to store or retrieve pixels. The distributed pixel cache relies on network bandwidth to marshal pixels to and from the remote server. As such, it will likely be significantly slower than a pixel cache utilizing local storage (e.g. memory, disk, etc.).</p>
-<pre class="highlight"><code>convert -distribute-cache 6668 & // start on 192.168.100.50
+<pre class="highlight"><code>magick -distribute-cache 6668 & // start on 192.168.100.50
convert -define registry:cache:hosts=192.168.100.50:6668 myimage.jpg -sharpen 5x2 mimage.png
</code></pre>
@@ -427,13 +438,13 @@
<p>A great majority of image formats and algorithms restrict themselves to a fixed range of pixel values from 0 to some maximum value, for example, the Q16 version of ImageMagick permit intensities from 0 to 65535. High dynamic-range imaging (HDRI), however, permits a far greater dynamic range of exposures (i.e. a large difference between light and dark areas) than standard digital imaging techniques. HDRI accurately represents the wide range of intensity levels found in real scenes ranging from the brightest direct sunlight to the deepest darkest shadows. Enable <a href="high-dynamic-range.html">HDRI</a> at ImageMagick build time to deal with high dynamic-range images, but be mindful that each pixel component is a 32-bit floating point value. In addition, pixel values are not clamped by default so some algorithms may have unexpected results due to out-of-band pixel values than the non-HDRI version.</p>
<p>If you are dealing with large images, make sure the pixel cache is written to a disk area with plenty of free space. Under Unix, this is typically <code>/tmp</code> and for Windows, <code>c:/temp</code>. You can tell ImageMagick to write the pixel cache to an alternate location and conserve memory with these options:</p>
-<pre class="highlight"><code>convert -limit memory 2GB -limit map 4GB -define registry:temporary-path=/data/tmp ...
+<pre class="highlight"><code>magick -limit memory 2GB -limit map 4GB -define registry:temporary-path=/data/tmp ...
</code></pre>
<p>Set global resource limits for your environment in the <code>policy.xml</code> configuration file.</p>
<p>If you plan on processing the same image many times, consider the MPC format. Reading a MPC image has near-zero overhead because its in the native pixel cache format eliminating the need for decoding the image pixels. Here is an example:</p>
-<pre class="highlight"><code>convert image.tif image.mpc
+<pre class="highlight"><code>magick image.tif image.mpc
convert image.mpc -crop 100x100+0+0 +repage 1.png
convert image.mpc -crop 100x100+100+0 +repage 2.png
convert image.mpc -crop 100x100+200+0 +repage 3.png
@@ -505,30 +516,30 @@
<h2><a class="anchor" id="tera-pixel"></a>Large Image Support</h2>
<p>ImageMagick can read, process, or write mega-, giga-, or tera-pixel image sizes. An image width or height can range from 1 to 2 giga-pixels on a 32 bit OS (up to 2147483647 rows/columns) and up to 9 exa-pixels on a 64-bit OS (up to 9223372036854775807 rows/columns). Note, that some image formats have restrictions on image size. For example, Photoshop images are limited to 300,000 pixels for width or height. Here we resize an image to a quarter million pixels square:</p>
-<pre class="highlight"><code>convert logo: -resize 250000x250000 logo.miff
+<pre class="highlight"><code>magick logo: -resize 250000x250000 logo.miff
</code></pre>
<p>For large images, memory resources will likely be exhausted and ImageMagick will instead create a pixel cache on disk. Make sure you have plenty of temporary disk space. If your default temporary disk partition is too small, tell ImageMagick to use another partition with plenty of free space. For example:</p>
-<pre class="highlight"><code>convert -define registry:temporary-path=/data/tmp logo: \ <br/> -resize 250000x250000 logo.miff
+<pre class="highlight"><code>magick -define registry:temporary-path=/data/tmp logo: \ <br/> -resize 250000x250000 logo.miff
</code></pre>
<p>To ensure large images do not consume all the memory on your system, force the image pixels to memory-mapped disk with resource limits:</p>
-<pre class="highlight"><code>convert -define registry:temporary-path=/data/tmp -limit memory 16mb \
+<pre class="highlight"><code>magick -define registry:temporary-path=/data/tmp -limit memory 16mb \
logo: -resize 250000x250000 logo.miff
</code></pre>
<p>Here we force all image pixels to disk:</p>
-<pre class="highlight"><code>convert -define registry:temporary-path=/data/tmp -limit area 0 \
+<pre class="highlight"><code>magick -define registry:temporary-path=/data/tmp -limit area 0 \
logo: -resize 250000x250000 logo.miff
</code></pre>
<p>Caching pixels to disk is about 1000 times slower than memory. Expect long run times when processing large images on disk with ImageMagick. You can monitor progress with this command:</p>
-<pre class="highlight"><code>convert -monitor -limit memory 2GiB -limit map 4GiB -define registry:temporary-path=/data/tmp \
+<pre class="highlight"><code>magick -monitor -limit memory 2GiB -limit map 4GiB -define registry:temporary-path=/data/tmp \
logo: -resize 250000x250000 logo.miff
</code></pre>
<p>For really large images, or if there is limited resources on your host, you can utilize a distributed pixel cache on one or more remote hosts:</p>
-<pre class="highlight"><code>convert -distribute-cache 6668 & // start on 192.168.100.50
+<pre class="highlight"><code>magick -distribute-cache 6668 & // start on 192.168.100.50
convert -distribute-cache 6668 & // start on 192.168.100.51
convert -limit memory 2mb -limit map 2mb -limit disk 2gb \
-define registry:cache:hosts=192.168.100.50:6668,192.168.100.51:6668 \
@@ -693,7 +704,7 @@
<p>If so, run this command to realize a significant speed-up for image convolution:</p>
-<pre class="highlight"><code>convert image.png -convolve '-1, -1, -1, -1, 9, -1, -1, -1, -1' convolve.png
+<pre class="highlight"><code>magick image.png -convolve '-1, -1, -1, -1, 9, -1, -1, -1, -1' convolve.png
</code></pre>
<p>If an accelerator is not available or if the accelerator fails to respond, ImageMagick reverts to the non-accelerated convolution algorithm.</p>
@@ -1187,7 +1198,7 @@
}</code></pre>
<p>To invoke the custom coder from the command line, use these commands:</p>
-<pre class="highlight"><code>convert logo: logo.mgk
+<pre class="highlight"><code>magick logo: logo.mgk
display logo.mgk
</code></pre>
@@ -1444,7 +1455,7 @@
<p>To invoke the custom filter from the command line, use this command:</p>
-<pre class="highlight"><code>convert logo: -process \"analyze\" -verbose info:
+<pre class="highlight"><code>magick logo: -process \"analyze\" -verbose info:
Image: logo:
Format: LOGO (ImageMagick Logo)
Class: PseudoClass
@@ -1479,12 +1490,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:41 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/binary-releases.html b/www/binary-releases.html
index 118c9db..440f27b 100644
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -447,7 +447,7 @@
</p>
<p><a href="binary-releases.html#">Back to top</a> •
<a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="www/www/www/www/www/www/www/www/www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a></p>
+ <a href="www/www/www/www/www/www/www/www/www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a></p>
<p><small>© 1999-2016 ImageMagick Studio LLC</small></p>
</footer>
</div><!-- /.container -->
diff --git a/www/changelog.html b/www/changelog.html
index d1c7bcc..8543184 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -86,7 +86,67 @@
<main class="container">
<div class="magick-template">
-<div class="magick-header"><dl><dt>2020-01-04 7.0.9-14 Cristy <quetzlzacatenango@image...></dt>
+<div class="magick-header"><dl><dt>2020-02-21 7.0.9-25 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-25, GIT revision 16931:2a56db8:20200221</li>
+<dt>2020-02-18 7.0.9-25 Cristy <quetzlzacatenango@image...></dt>
+ <li> Adapt to a change in command-line options in the SVG inkscape delegate.</li>
+ <li> No percent sign in lab() color.</li>
+<dt>2020-02-17 7.0.9-24 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-24, GIT revision 16919:41efef9de:20200217</li>
+<dt>2020-02-15 7.0.9-24 Cristy <quetzlzacatenango@image...></dt>
+ <li> Support connected-components:eccentricity-threshold, connected-components:major-axis-threshold, connected-components:minor-axis-threshold, connected-components:angle-threshold.</li>
+ <li> Set the alpha channel if the write mask is not enabled.</li>
+ <li> Corrected ellipse orientation when computing image moments.</li>
+<dt>2020-02-14 7.0.9-23 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-23, GIT revision 16884:acb56cd:20200214</li>
+<dt>2020-02-08 7.0.9-23 Cristy <quetzlzacatenango@image...></dt>
+ <li> Report gray(127.5) as gray(50%).</li>
+ <li> Support -define connected-components:perimeter-threshold=min-max</li>
+<dt>2020-02-07 7.0.9-22 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-22, GIT revision 16855:8733f3e:20200207</li>
+<dt>2020-02-03 7.0.9-22 Cristy <quetzlzacatenango@image...></dt>
+ <li> More work on connect components, e.g. keep-colors, remove-colors, keep-topids.</li>
+ <li> Initialize mutex before locking if its not already initialized.</li>
+ <li> Support 24-bit TIFF images.</li>
+<dt>2020-02-01 7.0.9-21 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-21, GIT revision 16823:290cb93:20200201.</li>
+<dt>2020-01-27 7.0.9-21 Cristy <quetzlzacatenango@image...></dt>
+ <li> Support additional connected components defines.</li>
+ <li> Refresh cache morphology when writing MPC images.</li>
+<dt>2020-01-26 7.0.9-19 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-19, GIT revision 16789:bac6ecc:20200126</li>
+<dt>2020-01-26 7.0.9-19 Cristy <quetzlzacatenango@image...></dt>
+ <li> Make PNG creation reproducible (reference https://github.com/ImageMagick/ImageMagick/pull/1270).</li>
+ <li> Refactor uninitialize variable patch for -fx "while(,)" expression.</li>
+<dt>2020-01-25 7.0.9-18 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-18, GIT revision 16780:08beae5:20200125</li>
+<dt>2020-01-19 7.0.9-18 Cristy <quetzlzacatenango@image...></dt>
+ <li> Alpha draw primitive no longer returns a parser exception.</li>
+ <li> Support 32-bit tiled TIFF images.</li>
+ <li> New -connected-component options (reference ../www/connected-components.html).</li>
+ https://imagemagick.org/discourse-server//viewtopic.html?f=1&t=37391).<dt>2020-01-18 7.0.9-17 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-17, GIT revision 16753:c300b3a:20200118</li>
+<dt>2020-01-12 7.0.9-17 Cristy <quetzlzacatenango@image...></dt>
+ <li> Allow larger negative interline spacing (reference https://imagemagick.org/discourse-server//viewtopic.html?f=1&t=37391).</li>
+ <li> Conditional compile for huge xml pages for RSVG delegate library.</li>
+ <li> Put "width" property in the PNG namespace (reference https://github.com/ImageMagick/ImageMagick/issues/1833).</li>
+ <li> -combine -colorspace sRGB no longer returns grayscale output (reference https://github.com/ImageMagick/ImageMagick/issues/1835).</li>
+ <li> Support Jzazbz colorspace (contributed by snibgo @ http://im.snibgo.com/jzazbz.htm).</li>
+<dt>2020-01-12 7.0.9-16 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-16, GIT revision 16719:fefd765:20200112.</li>
+<dt>2020-01-12 7.0.9-16 Cristy <quetzlzacatenango@image...></dt>
+ <li> Fixed three failing Magick.NET unit tests.</li>
+<dt>2020-01-11 7.0.9-15 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.9-15, GIT revision 16709:0000f6d:20200111.</li>
+<dt>2020-01-11 7.0.9-15 Dirk Lemstra <dirk@lem.....org></dt>
+ <li> Also support svg:xml-parse-huge when using librsvg.</li>
+<dt>2020-01-10 7.0.9-15 Cristy <quetzlzacatenango@image...></dt>
+ <li> Optimize -evaluate-sequence option (reference https://github.com/ImageMagick/ImageMagick/issues/1824).</li>
+ <li> Support Fx do() iterator.</li>
+ <li> `magick -size 100x100 xc:black black.pnm` no longer creates a white image (reference https://github.com/ImageMagick/ImageMagick/issues/1817).</li>
+ <li> setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=37379).</li>
+ <li> Permit compositing in the CMYK colorspace (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=37368).</li>
+<dt>2020-01-04 7.0.9-14 Cristy <quetzlzacatenango@image...></dt>
<li> Release ImageMagick version 7.0.9-14, GIT revision 16654:89ef7ea:20200104.</li>
<dt>2020-01-01 7.0.9-14 Cristy <quetzlzacatenango@image...></dt>
<li> Support extended Fx assignment operators (e.g. *=, /=, ++, --, etc.)</li>
@@ -1134,12 +1194,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:27 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/cipher.html b/www/cipher.html
index 2d9fbb8..d2742af 100644
--- a/www/cipher.html
+++ b/www/cipher.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -97,19 +97,19 @@
<p>Use the <a href="command-line-options.html#encipher">-encipher</a> option to scramble your image so that it is unrecognizable. The option requires a filename that contains your passphrase. In this example we scramble an image and save it in the PNG format:</p>
-<pre class="highlight"><code>convert rose.jpg -encipher passphrase.txt rose.png
+<pre class="highlight"><code>magick rose.jpg -encipher passphrase.txt rose.png
</code></pre>
<p>Here we encipher an image using another image as the passphrase:</p>
-<pre class="highlight"><code>convert rose.jpg -encipher smiley.gif rose.png
+<pre class="highlight"><code>magick rose.jpg -encipher smiley.gif rose.png
</code></pre>
<h2><a class="anchor" id="decipher"></a>Decipher an Image</h2>
<p>Use the <a href="command-line-options.html#decipher">-decipher</a> option to unscramble your image so that it is recognizable once again. The option requires a filename that contains your passphrase. In this example we unscramble an image and save it in the JPEG format:</p>
-<pre class="highlight"><code>convert rose.png -decipher passphrase.txt rose.jpg
+<pre class="highlight"><code>magick rose.png -decipher passphrase.txt rose.jpg
</code></pre>
<h2><a class="anchor" id="caveats"></a>Encipher and Decipher Caveats</h2>
@@ -138,7 +138,7 @@
<p>ImageMagick uses the <a
href="http://en.wikipedia.org/wiki/Advanced_Encryption_Standard">AES</a>
-cipher in Counter mode. We use the the first half of your passphrase to derive the nonce. The second half is the cipher key. When used correctly, AES-CTR provides a high level of confidentiality. To avoid information leaks, you must use a fresh passphrase for each image your encrypt.</p>
+cipher in Counter mode. We use the first half of your passphrase to derive the nonce. The second half is the cipher key. When used correctly, AES-CTR provides a high level of confidentiality. To avoid information leaks, you must use a fresh passphrase for each image your encrypt.</p>
<p>Currently only ImageMagick can restore your enciphered image content. We
use a standard cipher and mode so other vendors could support enciphered image content.</p>
@@ -163,12 +163,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:33 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/clahe.html b/www/clahe.html
index 4fc8ae2..f1a3847 100644
--- a/www/clahe.html
+++ b/www/clahe.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="../www/www/https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -133,12 +133,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:07 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:38 -->
\ No newline at end of file
diff --git a/www/color-management.html b/www/color-management.html
index db74802..3501c1d 100644
--- a/www/color-management.html
+++ b/www/color-management.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -160,12 +160,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:32 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/color-thresholding.html b/www/color-thresholding.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/www/color-thresholding.html
diff --git a/www/color.html b/www/color.html
index 6039513..3358885 100644
--- a/www/color.html
+++ b/www/color.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -4967,12 +4967,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:13 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:42 -->
\ No newline at end of file
diff --git a/www/command-line-options.html b/www/command-line-options.html
index 13cf01d..3e1a2d4 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -146,7 +146,7 @@
who have used the standard <code>printf()</code>' C-library function. As an
example, the command</p>
-<pre class="highlight"><code>convert logo: rose: -morph 15 my%02dmorph.jpg
+<pre class="highlight"><code>magick logo: rose: -morph 15 my%02dmorph.jpg
</code></pre>
<p>will create a sequence of 17 images (the two given plus 15 more created by
@@ -281,7 +281,7 @@
<dt class="col-md-4">Extract</dt>
<dd class="col-md-8">
Copies the alpha channel values into all the color channels and turns
- 'Off' the the image's transparency, so as to generate
+ 'Off' the image's transparency, so as to generate
a grayscale mask of the image's shape. The alpha channel data is left
intact just deactivated. This is the inverse of 'Copy'.
</dd>
@@ -789,7 +789,7 @@
"<code><a href="command-line-options.html#set">-set</a> caption</code>". </p>
<p>The caption can contain special format characters listed in the <a
-href="../www/escape.html">Format and
+href="escape.html">Format and
Print Image Properties</a>. These attributes are expanded when the caption
is finally assigned to the individual images. </p>
@@ -994,10 +994,10 @@
<p>A channel without an operation symbol implies separate (i.e, semicolon).</p>
<p>Here we take an sRGB image and a grayscale image and inject the grayscale image into the alpha channel:</p>
-<pre class="highlight"><code>convert wizard.png mask.pgm -channel-fx '| gray=>alpha' wizard-alpha.png
+<pre class="highlight"><code>magick wizard.png mask.pgm -channel-fx '| gray=>alpha' wizard-alpha.png
</code></pre>
<p>Use a similar command to define a read mask:</p>
-<pre class="highlight"><code>convert wizard.png mask.pgm -channel-fx '| gray=>read-mask' wizard-mask.png
+<pre class="highlight"><code>magick wizard.png mask.pgm -channel-fx '| gray=>read-mask' wizard-mask.png
</code></pre>
<p>Add <code>-debug pixel</code> prior to the <code>-channel-fx</code> option to track the channel morphology.</p>
@@ -1057,7 +1057,7 @@
<p>For example, in the command</p>
-<pre class="highlight"><code>convert cockatoo.tif -clip -negate negated.tif
+<pre class="highlight"><code>magick cockatoo.tif -clip -negate negated.tif
</code></pre>
<p>only the pixels within the clipping path are negated.</p>
@@ -1244,7 +1244,7 @@
<p>As an example, to add contrast to an image with offsets, try this command:</p>
-<pre class="highlight"><code>convert kittens.jpg -color-matrix \
+<pre class="highlight"><code>magick kittens.jpg -color-matrix \
" 1.5 0.0 0.0 0.0, 0.0, -0.157 \
0.0 1.5 0.0 0.0, 0.0, -0.157 \
0.0 0.0 1.5 0.0, 0.0, -0.157 \
@@ -1262,12 +1262,13 @@
<pre class="highlight"><code>CMY CMYK Gray HCL
HCLp HSB HSI HSL
-HSV HWB Lab LCHab
-LCHuv LMS Log Luv
-OHTA Rec601YCbCr Rec709YCbCr RGB
-scRGB sRGB Transparent xyY
-XYZ YCbCr YCC YDbDr
-YIQ YPbPr YUV Undefined
+HSV HWB Jzazbz Lab
+LCHab LCHuv LMS Log
+Luv OHTA Rec601YCbCr Rec709YCbCr
+RGB scRGB sRGB Transparent
+xyY XYZ YCbCr YCC
+YDbDr YIQ YPbPr YUV
+Undefined
</code></pre>
<p>To print a complete list of colorspaces, use <a href="command-line-options.html#list">-list colorspace</a>.</p>
@@ -1394,7 +1395,7 @@
Thus, in the following example, the final image should be a copy of the
original. </p>
-<pre class="highlight"><code>convert original.png -channel RGB -separate sepimage.png
+<pre class="highlight"><code>magick original.png -channel RGB -separate sepimage.png
convert sepimage-0.png sepimage-1.png sepimage-2.png -channel RGB \
-combine imagecopy.png
</code></pre>
@@ -1410,7 +1411,7 @@
"<code><a href="command-line-options.html#set">-set</a> comment</code>". </p>
<p>The comment can contain special format characters listed in the <a
-href="../www/escape.html">Format and
+href="escape.html">Format and
Print Image Properties</a>. These attributes are expanded when the comment
is finally assigned to the individual images. </p>
@@ -1439,12 +1440,12 @@
<p>This is a convert version of "<code>compare</code>" for two same sized images. The syntax is as follows, but other metrics are allowed.</p>
-<pre class="highlight"><code>convert image.png reference.png -metric RMSE -compare \ <br/> difference.png
+<pre class="highlight"><code>magick image.png reference.png -metric RMSE -compare \ <br/> difference.png
</code></pre>
<p>To get the metric value use the string format "%[distortion]".</p>
-<pre class="highlight"><code>convert image.png reference.png -metric RMSE -compare -format \
+<pre class="highlight"><code>magick image.png reference.png -metric RMSE -compare -format \
"%[distortion]" info:
</code></pre>
@@ -1583,7 +1584,7 @@
<p>For a more pronounced effect you can repeat the option:</p>
-<pre class="highlight"><code>convert rose: -contrast -contrast rose_c2.png
+<pre class="highlight"><code>magick rose: -contrast -contrast rose_c2.png
</code></pre>
<div style="margin: auto;">
@@ -1736,7 +1737,7 @@
<p>For example, to log cache and blob events, use.</p>
-<pre class="highlight"><code>convert -debug "Cache,Blob" rose: rose.png
+<pre class="highlight"><code>magick -debug "Cache,Blob" rose: rose.png
</code></pre>
<p>The <code>User</code> domain is normally empty, but developers can log user
@@ -1807,7 +1808,7 @@
existing definitions.</p>
<p>The same 'artifact' settings can also be defined using the <a
-href="command-line-options.html#set" >-set "option:<var>key</var>" "<var>value</var>"</a> option, which also allows the use of <a href="../www/escape.html" >Format and Print Image
+href="command-line-options.html#set" >-set "option:<var>key</var>" "<var>value</var>"</a> option, which also allows the use of <a href="escape.html" >Format and Print Image
Properties</a> in the defined value. </p>
<p>The <var>option</var> and <var>key</var> are case-independent (they are
@@ -2052,14 +2053,14 @@
<tr>
<td>jp2:quality=<var>value,value...</var></td>
<td>Sets the quality layer PSNR, given in dB. The order is from left to
- right in ascending order. The default is a single lossless quality layer.
+ right in ascending order. The default is a single lossless quality layer.
Same for JPT, JC2, and J2K.</td>
</tr>
<tr>
<td>jp2:rate=<var>value</var></td>
<td>Specify the compression factor to use while writing JPEG-2000 files.
- The compression factor is the reciprocal of the compression ratio. The
+ The compression factor is the reciprocal of the compression ratio. The
valid range is 0.0 to 1.0, with 1.0 indicating lossless compression. If
defined, this value overrides the -quality setting. A quality setting
of 75 results in a rate value of 0.06641. Same for JPT, JC2, and J2K.</td>
@@ -2094,7 +2095,7 @@
jpeg:extent=400KB</code>. The JPEG encoder will search for the highest
compression quality level that results in an output file that does not
exceed the value. The <code>-quality</code> option also will be respected
- starting with version 6.9.2-5. Between 6.9.1-0 and 6.9.2-4, add -quality
+ starting with version 6.9.2-5. Between 6.9.1-0 and 6.9.2-4, add -quality
100 in order for the jpeg:extent to work properly. Prior to 6.9.1-0, the
-quality setting was ignored.</td>
</tr>
@@ -2423,26 +2424,26 @@
all additional information that is not related to the geometry of the
image. The 'all' option should only be used when the geometry of the
image has not been changed. This option is helpful when transferring
- non-simple layers, such as adjustment layers from the input PSD file to
- the output PSD file. If this option is not used, the additional
- information will not be preserved. This define is available as of
+ non-simple layers, such as adjustment layers from the input PSD file to
+ the output PSD file. If this option is not used, the additional
+ information will not be preserved. This define is available as of
Imagemagick version 6.9.5-8.
</td>
</tr>
<tr>
<td>psd:alpha-unblend=off</td>
- <td>Disables new automatic un-blending of transparency with the base image
- for the flattened layer 0 before adding the alpha channel to the output
- image. This define must be placed before the input psd image. (Available
- as of IM 6.9.2.5). The automatic un-blending is new to IM 6.9.2.5 and
- prevents the transparency from being applied twice in the output
+ <td>Disables new automatic un-blending of transparency with the base image
+ for the flattened layer 0 before adding the alpha channel to the output
+ image. This define must be placed before the input psd image. (Available
+ as of IM 6.9.2.5). The automatic un-blending is new to IM 6.9.2.5 and
+ prevents the transparency from being applied twice in the output
image. This option should be set before reading the image.</td>
</tr>
<tr>
<td>psd:preserve-opacity-mask=true</td>
- <td>This option should only be used when converting from a PSD file to
+ <td>This option should only be used when converting from a PSD file to
another PSD file. It will preserve the opacity mask of a layer and add it
back to the layer when the image is saved. Setting this to 'true' will
enable this feature. This define is available as of Imagemagick version
@@ -2570,7 +2571,7 @@
<p>For example, to create a postscript file that will render only the black
pixels of a bilevel image, use:</p>
-<pre class="highlight"><code>convert bilevel.tif -define ps:imagemask eps3:stencil.ps
+<pre class="highlight"><code>magick bilevel.tif -define ps:imagemask eps3:stencil.ps
</code></pre>
<p>Set attributes of the image registry by prefixing the value with
@@ -3004,7 +3005,7 @@
All arguments are optional. With <var>Rmin</var> defaulting to zero, the
center to the center of the image, and the angles going from -180 (top)
to +180 (top). If <var>Rmax</var> is given the special value of
- '0', the the distance from the center to the nearest edge
+ '0', the distance from the center to the nearest edge
is used for the radius of the output image, which will ensure the whole
image is visible (though scaled smaller). However a special value of
'-1' will use the distance from the center to the furthest
@@ -3132,7 +3133,7 @@
used to group the 4 sets of coordinate pairs, to make it easier to read and
understand.</p>
-<pre class="highlight"><code>convert rose: -virtual-pixel black \
+<pre class="highlight"><code>magick rose: -virtual-pixel black \
-distort Perspective '0,0,0,0 0,45,0,45 69,0,60,10 69,45,60,35' \
rose_3d_rotated.gif"
</code></pre>
@@ -3156,7 +3157,7 @@
using '<code>perspective</code>' distortion. For example here we view
a infinitely tiled 'plane' all the way to the horizon. </p>
-<pre class="highlight"><code>convert -size 90x90 pattern:checkerboard -normalize -virtual-pixel tile \
+<pre class="highlight"><code>magick -size 90x90 pattern:checkerboard -normalize -virtual-pixel tile \
-distort perspective '0,0,5,45 89,0,45,46 0,89,0,89 89,89,89,89' \
checks_tiled.jpg
</code></pre>
@@ -3227,7 +3228,7 @@
colors (generated or user defined) to an image. </p>
<p>Dithering is turned on by default, to turn it off use the plus form of the
-setting, <a href="command-line-options.html#dither">+dither</a>. This will also also render PostScript
+setting, <a href="command-line-options.html#dither">+dither</a>. This will also render PostScript
without text or graphic aliasing. Disabling dithering often (but not always)
leads to faster process, a smaller number of colors, but more cartoon like
image coloring. Generally resulting in 'color banding' effects in areas with
@@ -3335,7 +3336,7 @@
<p>The <code>arc</code> primitive is used to inscribe an elliptical segment in
to a given rectangle. An <code>arc</code> requires the two corners used for
<code>rectangle</code> (see above) followed by the start and end angles of the
-arc of the segment segment (e.g. 130,30 200,100 45,90). The start and end
+arc of the segment (e.g. 130,30 200,100 45,90). The start and end
points produced are then joined with a line segment and the resulting segment
of an ellipse is filled.</p>
@@ -3736,7 +3737,7 @@
display. If the aspect ratio of the input image isn't exactly 4:3, then the
image is centered on an 800x600 black canvas: </p>
-<pre class="highlight"><code>convert input.jpg -resize 800x600 -background black -compose Copy \
+<pre class="highlight"><code>magick input.jpg -resize 800x600 -background black -compose Copy \
-gravity center -extent 800x600 -quality 92 output.jpg
</code></pre>
@@ -3751,7 +3752,7 @@
<p>This option is most useful for extracting a subregion of a very large raw
image. Note that these two commands are equivalent:</p>
-<pre class="highlight"><code>convert -size 16000x16000 -depth 8 -extract 640x480+1280+960 \
+<pre class="highlight"><code>magick -size 16000x16000 -depth 8 -extract 640x480+1280+960 \
image.rgb image.png",
convert -size 16000x16000 -depth 8 'image.rgb[640x480+1280+960]' \
image.rgb image.png"
@@ -3759,14 +3760,14 @@
<p>If you omit the offsets, as in</p>
-<pre class="highlight"><code>convert -size 16000x16000 -depth 8 -extract 640x480 \
+<pre class="highlight"><code>magick -size 16000x16000 -depth 8 -extract 640x480 \
image.rgb image.png
</code></pre>
<p>the image is <var>resized</var> to the specified dimensions instead,
equivalent to:</p>
-<pre class="highlight"><code>convert -size 16000x16000 -depth 8 -resize 640x480 image.rgb image.png
+<pre class="highlight"><code>magick -size 16000x16000 -depth 8 -resize 640x480 image.rgb image.png
</code></pre>
<p>See <a href="command-line-processing.html#geometry">Image Geometry</a> for complete details about the <em class="arg">geometry</em> argument.</p>
@@ -3835,13 +3836,13 @@
PFM, EXR and PNG are the recommended image formats to use. All of these
formats, except PNG support multi-frame images. So for example,</p>
-<pre class="highlight"><code>convert image.png -fft fft_image.miff
+<pre class="highlight"><code>magick image.png -fft fft_image.miff
</code></pre>
<p>generates a magnitude image as <code>fft_image.miff[0]</code> and a phase
image as <code>fft_image.miff[1]</code>. Similarly,</p>
-<pre class="highlight"><code>convert image.png -fft fft_image.png
+<pre class="highlight"><code>magick image.png -fft fft_image.png
</code></pre>
<p>generates a magnitude image as <code>fft_image-0.png</code> and a phase image
@@ -3867,7 +3868,7 @@
enhance the darker values more in comparison to the lighter values. This can
be done, for example, as follows:</p>
-<pre class="highlight"><code>convert fft_image.miff[0] -contrast-stretch 0 \
+<pre class="highlight"><code>magick fft_image.miff[0] -contrast-stretch 0 \
-evaluate log 1000 fft_image_spectrum.png"
</code></pre>
@@ -4098,7 +4099,7 @@
<p>For example, to get a 8 lobe jinc windowed sinc filter (Genseng filter?):</p>
-<pre class="highlight"><code>convert image.png \
+<pre class="highlight"><code>magick image.png \
-filter sinc \
-set filter:window=jinc \
-set filter:lobes=8 \
@@ -4107,7 +4108,7 @@
<p>Or a raw un-windowed Sinc filter with 4 lobes:</p>
-<pre class="highlight"><code>convert image.png \
+<pre class="highlight"><code>magick image.png \
-set filter:filter=sinc \
-set filter:lobes=4 \
-resize 150% image.jpg"
@@ -4117,7 +4118,7 @@
a '<code>Box</code>' filter. For example the '<code>Welch</code> parabolic
windowing function. </p>
-<pre class="highlight"><code>convert null: -define filter:filter=Box \
+<pre class="highlight"><code>magick null: -define filter:filter=Box \
-define filter:window=Welch \
-define filter:support=1.0 \
-define filter:verbose=1 \
@@ -4236,7 +4237,7 @@
<p class="magick-description">output formatted image characteristics.</p>
-<p>See <a href="../www/escape.html">Format and Print Image
+<p>See <a href="escape.html">Format and Print Image
Properties</a> for an explanation on how to specify the argument to this
option.</p>
@@ -4498,7 +4499,7 @@
display gamma; e.g., if your image is sRGB and you want to write a PNG gAMA
chunk, use</p>
-<pre class="highlight"><code>convert input.png +gamma .45455 output.png
+<pre class="highlight"><code>magick input.png +gamma .45455 output.png
</code></pre>
<p>(0.45455 is 1/2.2)</p>
@@ -4587,7 +4588,7 @@
region itself, which is <var>centered</var> at the pixel
coordinate (60,70). (See <a href="command-line-processing.html#geometry">Image Geometry</a> for complete details about the <em class="arg">geometry</em> argument.)</p>
-<pre class="highlight"><code>convert image.png -gravity Center -region 10x10-40+20 \
+<pre class="highlight"><code>magick image.png -gravity Center -region 10x10-40+20 \
-negate output.png
</code></pre>
@@ -4613,27 +4614,27 @@
<p>For example, to convert an image to (linear) Rec709Luminance grayscale, type:</p>
-<pre class="highlight"><code>convert in.png -grayscale Rec709Luminance out.png
+<pre class="highlight"><code>magick in.png -grayscale Rec709Luminance out.png
</code></pre>
<p>which is equivalent to:</p>
<pre class="highlight">
-<code>convert in.png -colorspace RGB -colorspace Gray out.png</code>
+<code>magick in.png -colorspace RGB -colorspace Gray out.png</code>
or
-<code>convert in.png -colorspace LinearGray out.png</code>
+<code>magick in.png -colorspace LinearGray out.png</code>
</pre>
<p>Note that LinearGray is new as of Imagemagick 6.9.9-29 and 7.0.7-17.</p>
<p>Similarly, to convert an image to (non-linear) Rec709Luma grayscale, type:</p>
-<pre class="highlight"><code>convert in.png -grayscale Rec709Luma out.png
+<pre class="highlight"><code>magick in.png -grayscale Rec709Luma out.png
</code></pre>
<p>which is equivalent to:</p>
-<pre class="highlight"><code>convert in.png -colorspace Gray out.png
+<pre class="highlight"><code>magick in.png -colorspace Gray out.png
</code></pre>
<p>Note that a 'colorspace' intensity method will produce the same result
@@ -4664,7 +4665,7 @@
can apply any color transformation to the Hald image and then use this option
to apply the transform to the image. </p>
-<pre class="highlight"><code>convert image.png hald.png -hald-clut transform.png
+<pre class="highlight"><code>magick image.png hald.png -hald-clut transform.png
</code></pre>
<p>This option provides a convenient method for you to use Gimp or Photoshop
@@ -4772,12 +4773,12 @@
<p>For example, depending upon the image format used to store the result of
the <a href="command-line-options.html#fft">-fft</a>, one would use either</p>
-<pre class="highlight"><code>convert fft_image.miff -ift fft_image_ift.png
+<pre class="highlight"><code>magick fft_image.miff -ift fft_image_ift.png
</code></pre>
<p>or</p>
-<pre class="highlight"><code>convert fft_image-0.png fft_image-1.png -ift fft_image_ift.png
+<pre class="highlight"><code>magick fft_image-0.png fft_image-1.png -ift fft_image_ift.png
</code></pre>
<p>The resulting image may need to be cropped due to padding introduced when
@@ -5046,7 +5047,7 @@
image. </p>
<p>You can include the image filename, type, width, height, or other image
-attribute by embedding special format character. See <a href="../www/escape.html">Format and Print Image
+attribute by embedding special format character. See <a href="escape.html">Format and Print Image
Properties</a> for details of the percent escape codes.</p>
<p>For example,</p>
@@ -5333,7 +5334,7 @@
image sequence, then adjust the offsets so all images are contained on
a minimal positive canvas. None of the image data is modified or
merged, only the individual image virtual canvas size and offset.
- All the images is given the same canvas size, and and will have
+ All the images is given the same canvas size, and will have
a positive offset, but will remain in the same position relative to
each other. As a result of the minimal canvas size at least one image
will touch every edge of that canvas. The image data touching those
@@ -5405,7 +5406,7 @@
<p class="magick-description">adjust the level of an image using the provided dash separated colors.</p>
<p>This function is exactly like <a href="command-line-options.html#level">-level</a>, except that the
-value value for each color channel is determined by the
+value for each color channel is determined by the
'<code>black_color</code>' and '<code>white_color</code>' colors given (as
described under the <a href="command-line-options.html#fill">-fill</a> option). </p>
@@ -5686,7 +5687,7 @@
<p>For example:</p>
-<pre class="highlight"><code>convert -debug coder -log "%u %m:%l %e" in.gif out.png
+<pre class="highlight"><code>magick -debug coder -log "%u %m:%l %e" in.gif out.png
</code></pre>
<p>The default behavior is to print all of the components.</p>
@@ -5913,7 +5914,7 @@
>option:modulate:colorspace</code>' to specify which colorspace to
modulate. Choose from <code>HCL</code>, <code>HCLp</code>, <code>HSB</code>, <code>HSI</code>, <code>HSL</code> (the default), <code>HSV</code>, <code>HWB</code>, or <code>LCH</code> (LCHuv). For example,</p>
-<pre class="highlight"><code>convert image.png -set option:modulate:colorspace hsb -modulate 120,90 modulate.png
+<pre class="highlight"><code>magick image.png -set option:modulate:colorspace hsb -modulate 120,90 modulate.png
</code></pre>
<div style="margin: auto;">
@@ -6328,7 +6329,7 @@
<p>Some simple uses are:</p>
<ul>
-<li>A weighted sum of each image provided all weights add to unity and all exponents=1. If the the weights are all equal to 1/(number of images), then this is equivalent to <a href="command-line-options.html#profile">-evaluate-sequence</a> <var>mean</var>.</li>
+<li>A weighted sum of each image provided all weights add to unity and all exponents=1. If the weights are all equal to 1/(number of images), then this is equivalent to <a href="command-line-options.html#profile">-evaluate-sequence</a> <var>mean</var>.</li>
<li>The sum of squares of two or more images, provided the weights are equal (and sum to 1 to avoid clamping) and the exponents equal 2.</li>
</ul>
@@ -6359,7 +6360,7 @@
<p class="magick-description">image preview type.</p>
<p>Use this option to affect the preview operation of an image (e.g.
-<code>convert file.png -preview Gamma Preview:gamma.png</code>). Choose from
+<code>magick file.png -preview Gamma Preview:gamma.png</code>). Choose from
these previews:</p>
<pre class="pre-scrollable"><code>
@@ -6442,7 +6443,7 @@
<p>For example, to extract the Exif data (which is stored in JPEG files in the
<var>APP1</var> profile), use.</p>
-<pre class="highlight"><code>convert cockatoo.jpg profile.exif
+<pre class="highlight"><code>magick cockatoo.jpg profile.exif
</code></pre>
<p>It is important to note that results may depend on whether or not the
@@ -6452,7 +6453,7 @@
command-line. For instance, in the following example, if the original image is
CMYK with profile, a CMYK-CMYK-RGB conversion results.</p>
-<pre class="highlight"><code>convert CMYK.tif -profile "CMYK.icc" -profile "RGB.icc" RGB.tiff
+<pre class="highlight"><code>magick CMYK.tif -profile "CMYK.icc" -profile "RGB.icc" RGB.tiff
</code></pre>
<p>Furthermore, since ICC profiles are not necessarily symmetric, extra
@@ -6757,7 +6758,7 @@
coding. If your image is gamma-corrected, you can remove the nonlinear gamma
correction, apply the transform, then restore it like this:</p>
-<pre class="highlight"><code>convert portrait.jpg -gamma .45455 -resize 25% -gamma 2.2 \
+<pre class="highlight"><code>magick portrait.jpg -gamma .45455 -resize 25% -gamma 2.2 \
-quality 92 passport.jpg
</code></pre>
@@ -6984,7 +6985,7 @@
<p>This includes string 'properties' that are set by and assigned to images
using the options <a href="command-line-options.html#comment" >-comment</a>, <a href="command-line-options.html#label"
>-label</a>, <a href="command-line-options.html#caption" >-caption</a>. These options actually assign
-a global 'artifact' which are automatically assigned (and any <a href="../www/escape.html" >Format Percent
+a global 'artifact' which are automatically assigned (and any <a href="escape.html" >Format Percent
Escapes</a> expanded) to images as they are read in. For example:</p>
<pre class="highlight"><code>-> convert rose: -set comment 'Rose is a rose is a rose is a rose' rose.png
@@ -6992,7 +6993,7 @@
Rose is a rose is a rose is a rose
</code></pre>
-<p>The set value can also make use of <a href="../www/escape.html" >Format and Print Image
+<p>The set value can also make use of <a href="escape.html" >Format and Print Image
Properties</a> in the defined value. For example:</p>
<pre class="highlight"><code>-> convert rose: -set origsize '%wx%h' -resize 50% \
@@ -7014,14 +7015,14 @@
<p>This option can also associate a colorspace or profile with your image.
For example,</p>
-<pre class="highlight"><code>convert image.psd -set profile ISOcoated_v2_eci.icc image-icc.psd
+<pre class="highlight"><code>magick image.psd -set profile ISOcoated_v2_eci.icc image-icc.psd
</code></pre>
<p>Some 'properties' must be defined in a specific way to be used. For
example only 'properties' prefixed with "<code>filename:</code>" can be used to
modify the output filename of an image. For example</p>
-<pre class="highlight"><code>convert rose: -set filename:mysize '%wx%h' 'rose_%[filename:mysize].png'
+<pre class="highlight"><code>magick rose: -set filename:mysize '%wx%h' 'rose_%[filename:mysize].png'
</code></pre>
<p>If the setting value is prefixed with "<code>option:</code>" the setting will
@@ -7031,11 +7032,11 @@
in a way that allows you to use them in a completely different image, even if
the original image has long since been modified or destroyed. For example: </p>
-<pre class="highlight"><code>convert rose: -set option:rosesize '%wx%h' -delete 0 \
+<pre class="highlight"><code>magick rose: -set option:rosesize '%wx%h' -delete 0 \
label:'%[rosesize]' label_size_of_rose.gif"
</code></pre>
-<p>Note that <a href="../www/escape.html" >Format Percent Escapes</a> will only match
+<p>Note that <a href="escape.html" >Format Percent Escapes</a> will only match
a 'artifact' if the given <var>key</var> does not match an existing
'attribute' or 'property'. </p>
@@ -7047,7 +7048,7 @@
the commandline option as shown below or by setting the profile via a
programming interface:</p>
-<pre class="highlight"><code>convert in.png -set profile PNG-chunk-x:<filename> out.png
+<pre class="highlight"><code>magick in.png -set profile PNG-chunk-x:<filename> out.png
</code></pre>
<p>where <var>x</var> is a location flag and
@@ -7062,7 +7063,7 @@
subsequent profiles from overwriting the preceding ones, e.g.,</p>
-<pre class="highlight"><code>convert in.png -set profile PNG-chunk-b01:file01 \
+<pre class="highlight"><code>magick in.png -set profile PNG-chunk-b01:file01 \
-profile PNG-chunk-b02:file02 out.png
</code></pre>
@@ -7141,7 +7142,7 @@
<var>commute</var>, i.e., the order matters in a sequence of shears. For
example, the following two commands are not equivalent.</p>
-<pre class="highlight"><code>convert logo: -shear 20x0 -shear 0x60 logo-sheared.png
+<pre class="highlight"><code>magick logo: -shear 20x0 -shear 0x60 logo-sheared.png
convert logo: -shear 0x60 -shear 20x0 logo-sheared.png
</code></pre>
@@ -7149,7 +7150,7 @@
for the amount of empty space created; the command that follows generates
a smaller image, and so is a better choice in terms of time and space.</p>
-<pre class="highlight"><code>convert logo: -shear 20x60 logo-sheared.png
+<pre class="highlight"><code>magick logo: -shear 20x60 logo-sheared.png
</code></pre>
<div style="margin: auto;">
@@ -7335,7 +7336,7 @@
<p>If the exact same <var>geometry</var> and <a
href="command-line-options.html#gravity">-gravity</a> is later used with <a href="command-line-options.html#chop">-chop</a> the
-added added all splices removed. </p>
+added all splices removed. </p>
<div style="margin: auto;">
<h3><a class="anchor" id="spread"></a>-spread <var>amount</var></h3>
@@ -7586,7 +7587,7 @@
channel. The green, blue, and alpha channels (if present) would be unchanged.
</p>
-<pre class="highlight"><code>convert in.png -channel red -threshold 50% out.png
+<pre class="highlight"><code>magick in.png -channel red -threshold 50% out.png
</code></pre>
<p>As (possibly) impractical but instructive examples, the following would
@@ -7594,7 +7595,7 @@
input image.</p>
-<pre class="highlight"><code>convert in.png -channel RGB -threshold 100% black.png
+<pre class="highlight"><code>magick in.png -channel RGB -threshold 100% black.png
convert in.png -channel RGB -threshold -1 white.png
</code></pre>
@@ -7689,7 +7690,7 @@
<p>This option applies the transformation matrix from a previous <a href="command-line-options.html#affine">-affine</a> option.</p>
-<pre class="highlight"><code>convert -affine 2,2,-2,2,0,0 -transform bird.ppm bird.jpg
+<pre class="highlight"><code>magick -affine 2,2,-2,2,0,0 -transform bird.ppm bird.jpg
</code></pre>
@@ -7820,7 +7821,7 @@
example, to prevent a JPEG from being written in grayscale format even though
only gray pixels are present, use.</p>
-<pre class="highlight"><code>convert bird.png -type TrueColor bird.jpg
+<pre class="highlight"><code>magick bird.png -type TrueColor bird.jpg
</code></pre>
<p>Similarly, use <a href="command-line-options.html#type">-type TrueColorAlpha</a> to force the
@@ -8129,12 +8130,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:16 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:37 -->
\ No newline at end of file
diff --git a/www/command-line-processing.html b/www/command-line-processing.html
index cabb980..3b04921 100644
--- a/www/command-line-processing.html
+++ b/www/command-line-processing.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -146,6 +146,7 @@
<li>zero, one, or more image sequence operators.</li>
<li>zero, one, or more image stacks.</li>
<li>zero or one output image filenames (required by
+<a href="magick.html">magick</a>,
<a href="convert.html">convert</a>,
<a href="composite.html">composite</a>,
<a href="montage.html">montage</a>,
@@ -208,12 +209,12 @@
<h5>STDIN, STDOUT, and file descriptors</h5>
<p>Unix and Windows permit the output of one command to be piped to the input of another. ImageMagick permits image data to be read and written from the <a href="http://en.wikipedia.org/wiki/Standard_streams">standard streams</a> STDIN (<var>standard in</var>) and STDOUT (<var>standard out</var>), respectively, using a pseudo-filename of <code>-</code>. In this example we pipe the output of
- <a href="convert.html">convert</a> to the <a href="display.html">display</a> program:
+ <a href="magick.html">magick</a> to the <a href="display.html">display</a> program:
</p>
<pre class="highlight"><code>magick logo: gif:- | display gif:-</code></pre>
-<p>The second explicit format "<code>gif:</code>" is optional in the preceding example. The GIF image format has a unique signature within the image so ImageMagick's <a href="display.html">display</a> command can readily recognize the format as GIF. The <a href="convert.html">convert</a> program also accepts STDIN as input in this way:
+<p>The second explicit format "<code>gif:</code>" is optional in the preceding example. The GIF image format has a unique signature within the image so ImageMagick's <a href="display.html">display</a> command can readily recognize the format as GIF. The <a href="magick.html">magick</a> program also accepts STDIN as input in this way:
</p>
<pre class="highlight"><code>magick rose: gif:- | magick - -resize "200%" bigrose.jpg'</code></pre>
@@ -551,7 +552,7 @@
</p>
-<h4 class="magick-header"><a class="anchor" id="stack"></a>Image Stack</h5>
+<h4 class="magick-header"><a class="anchor" id="stack"></a>Image Stack</h4>
<p>In school, your teacher probably permitted you to work on problems on a scrap of paper and then copy the results to your test paper. An image stack is similar. It permits you to work on an image or image sequence in isolation and subsequently introduce the results back into the command-line. The image stack is delineated with parenthesis. Image operators only affect images in the current stack. For example, we can limit the image rotation to just the wizard image like this:</p>
@@ -593,7 +594,7 @@
<h5>Standard Out</h5>
- <p>Unix permits the output of one command to be piped to another. ImageMagick permits piping one command to another with a filename of <code>-</code>. In this example we pipe the output of <a href="convert.html">convert</a> to the <a href="display.html">display</a> program:
+ <p>Unix permits the output of one command to be piped to another. ImageMagick permits piping one command to another with a filename of <code>-</code>. In this example we pipe the output of <a href="magick.html">magick</a> to the <a href="display.html">display</a> program:
</p>
<pre class="highlight"><code>magick logo: gif:- | display gif:-</code></pre>
@@ -643,12 +644,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:21 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:37 -->
\ No newline at end of file
diff --git a/www/command-line-tools.html b/www/command-line-tools.html
index 1da80ed..bab9f86 100644
--- a/www/command-line-tools.html
+++ b/www/command-line-tools.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -100,17 +100,18 @@
</dl>
<p>We also support tools for compatibility with ImageMagick <a href="http://legacy.imagemagick.org">version 6</a>:</p>
<dl class="row">
- <dt class="col-md-4"><a href="animate.html">animate</a></dt><dd class="col-md-8">animate an image sequence on any X server.</dd>
- <dt class="col-md-4"><a class="anchor" id="compare"></a><a href="compare.html">compare</a></dt><dd class="col-md-8">mathematically and visually annotate the difference between an image and its reconstruction.</dd>
- <dt class="col-md-4"><a class="anchor" id="composite"></a><a href="composite.html">composite</a></dt><dd class="col-md-8">overlap one image over another.</dd>
- <dt class="col-md-4"><a class="anchor" id="conjure"></a><a href="conjure.html">conjure</a></dt><dd class="col-md-8">interpret and execute scripts written in the Magick Scripting Language (MSL).</dd>
- <dt class="col-md-4"><a class="anchor" id="convert"></a><a href="convert.html">convert</a></dt><dd class="col-md-8">convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.</dd>
- <dt class="col-md-4"><a class="anchor" id="display"></a><a href="display.html">display</a></dt><dd class="col-md-8">display an image or image sequence on any X server.</dd>
- <dt class="col-md-4"><a class="anchor" id="identify"></a><a href="identify.html">identify</a></dt><dd class="col-md-8">describe the format and characteristics of one or more image files.</dd>
- <dt class="col-md-4"><a class="anchor" id="import"></a><a href="import.html">import</a></dt><dd class="col-md-8">save any visible window on an X server and outputs it as an image file. You can capture a single window, the entire screen, or any rectangular portion of the screen.</dd>
- <dt class="col-md-4"><a class="anchor" id="mogrify"></a><a href="mogrify.html">mogrify</a></dt><dd class="col-md-8">resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. Mogrify overwrites the original image file, whereas, <a href="convert.html">convert</a> writes to a different image file.</dd>
- <dt class="col-md-4"><a class="anchor" id="montage"></a><a href="montage.html">montage</a></dt><dd class="col-md-8">create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more.</dd>
- <dt class="col-md-4"><a class="anchor" id="stream"></a><a href="stream.html">stream</a></dt><dd class="col-md-8">a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making <code>stream</code> desirable when working with large images or when you require raw pixel components.</dd>
+ <dt class="col-md-4"><a href="animate.html">magick animate</a></dt><dd class="col-md-8">animate an image sequence on any X server.</dd>
+ <dt class="col-md-4"><a class="anchor" id="compare"></a><a href="compare.html">magick compare</a></dt><dd class="col-md-8">mathematically and visually annotate the difference between an image and its reconstruction.</dd>
+ <dt class="col-md-4"><a class="anchor" id="composite"></a><a href="composite.html">magick composite</a></dt><dd class="col-md-8">overlap one image over another.</dd>
+ <dt class="col-md-4"><a class="anchor" id="conjure"></a><a href="conjure.html">magick conjure</a></dt><dd class="col-md-8">interpret and execute scripts written in the Magick Scripting Language (MSL).</dd>
+ <dt class="col-md-4"><a class="anchor" id="convert"></a><a href="convert.html">magick convert</a></dt><dd class="col-md-8">convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.</dd>
+ <dt class="col-md-4"><a class="anchor" id="display"></a><a href="display.html">magick display</a></dt><dd class="col-md-8">display an image or image sequence on any X server.</dd>
+ <dt class="col-md-4"><a class="anchor" id="identify"></a><a href="identify.html">magick identify</a></dt><dd class="col-md-8">describe the format and characteristics of one or more image files.</dd>
+ <dt class="col-md-4"><a class="anchor" id="import"></a><a href="import.html">magick import</a></dt><dd class="col-md-8">save any visible window on an X server and outputs it as an image file. You can capture a single window, the entire screen, or any rectangular portion of the screen.</dd>
+ <dt class="col-md-4"><a class="anchor" id="magick"></a><a href="magick.html">magick</a></dt><dd class="col-md-8">magick between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.</dd>
+ <dt class="col-md-4"><a class="anchor" id="mogrify"></a><a href="mogrify.html">magick mogrify</a></dt><dd class="col-md-8">resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. Mogrify overwrites the original image file, whereas, <a href="magick.html">magick</a> writes to a different image file.</dd>
+ <dt class="col-md-4"><a class="anchor" id="montage"></a><a href="montage.html">magick montage</a></dt><dd class="col-md-8">create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more.</dd>
+ <dt class="col-md-4"><a class="anchor" id="stream"></a><a href="stream.html">magick stream</a></dt><dd class="col-md-8">a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making <code>stream</code> desirable when working with large images or when you require raw pixel components.</dd>
</dl>
<p>If these tools are not available on your computer, you can instead utilize them as a subcommand of the <code>magick</code> command. For example,</p>
<pre class="highlight"><code>magick identify -verbose myImage.png</code></pre>
@@ -131,12 +132,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:24 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:38 -->
\ No newline at end of file
diff --git a/www/compare.html b/www/compare.html
index 51903d6..195acf8 100644
--- a/www/compare.html
+++ b/www/compare.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -448,12 +448,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/compose.html b/www/compose.html
index 23c1f6a..4c11be3 100644
--- a/www/compose.html
+++ b/www/compose.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -484,7 +484,7 @@
>-compose</a> methods, those the argument and the method both need to be set
separately. For example... </p>
-<pre class="highlight"><code>convert ... -compose blend -define compose:args=50,50 -composite ...
+<pre class="highlight"><code>magick ... -compose blend -define compose:args=50,50 -composite ...
</code></pre>
<p>The following is a table of these special 'argumented' compose methods,
@@ -647,12 +647,14 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:12 -->
\ No newline at end of file
diff --git a/www/composite.html b/www/composite.html
index 7a307cb..7b61695 100644
--- a/www/composite.html
+++ b/www/composite.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -550,12 +550,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:25 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/conjure.html b/www/conjure.html
index 15fd1f5..e357fa1 100644
--- a/www/conjure.html
+++ b/www/conjure.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -1159,12 +1159,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:31 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/connected-components.html b/www/connected-components.html
index 20b0ecb..4442d20 100644
--- a/www/connected-components.html
+++ b/www/connected-components.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -107,6 +107,7 @@
4: 21x23+0+45 8.8,55.9 409 srgb(255,255,255)
1: 4x10+252+0 253.9,4.1 31 srgb(255,255,255)
</code></pre>
+<p>Add <code>-define connected-components:exclude-header=true</code> to show the objects without the header-line.</p>
<p>Use <code>-connected-components 8</code> to visit 8 neighbors rather than 4. By default, neighbor colors must be exact to be part of a unique object. Use the <a href="command-line-options.html#fuzz">-fuzz</a> option to include pixels as part of an object that are <var>close</var> in color.</p>
<p>You might want to eliminate small objects by merging them with their larger neighbors. If so, use this command:</p>
<pre class="highlight"><code>magick objects.gif -define connected-components:area-threshold=410 -connected-components 4 \
@@ -121,7 +122,18 @@
2: 120x135+104+18 159.5,106.5 8690 srgb(255,255,255)
3: 50x36+129+44 154.2,63.4 1529 srgb(0,0,0)</code></pre>
<p>By default, the labeled image is grayscale. You can instead replace the object color in the labeled image with the mean-color from the source image. Simply add this setting, <code>-define connected-components:mean-color=true</code>, to your command line.</p>
-<p>You may want to remove certain objects by making them transparent. Use <code>-define connected-components:remove=<em>list-of-ids</em></code> (e.g. -define connected-components:remove=2,4-5). Or use <code>-define connected-components:keep=<em>list-of-ids</em></code> to keep these objects and make all others transparent.</p>
+<p>Thresholds can optionally include ranges, e.g. <code>-define connected-components:area-threshold=410-1600</code>. To keep the background object, identify it with <code>-define connected-components:background-id=<var>object-id</var></code>. The default background object is the object with the largest area.</p>
+<p>In addition to area, there is support for these thresholding metrics:</p>
+<ul>
+<li>connected-components:angle-threshold (from equivalent ellipse)</li>
+<li>connected-components:circularity-threshold (4*pi*area/perimeter^2)</li>
+<li>connected-components:diameter-threshold (sqrt(4*area/pi))</li>
+<li>connected-components:eccentricity-threshold (from equivalent ellipse)</li>
+<li>connected-components:major-axis-threshold (diameter from equivalent ellipse)</li>
+<li>connected-components:minor-axis-threshold (diameter from equivalent ellipse)</li>
+<li>connected-components:perimeter-threshold</li>
+</ul>
+<p>You may want to remove certain objects. Use <code>-define connected-components:remove-ids=<em>list-of-ids</em></code> (e.g. -define connected-components:remove-ids=2,4-5). Or use <code>-define connected-components:keep-ids=<em>list-of-ids</em></code> to keep these objects and merge all others. For convenience, you can keep the top objects with this option: <code>-define connected-components:keep-top=<em>number-of-objects</em></code>. Rather than object ids, you can instead remove or keep objects identified by there color, e.g. <code>-define connected-components:keep-colors=<em>red;green;blue</em></code>.</p>
<p>Objects in your image may look homogeneous but have slightly different color values. By default, only pixels that match exactly are considered as part of a particular object. For slight variations of color in an object, use <code>-fuzz</code>. For example,</p>
<pre class="highlight"><code>magick star-map.png -fuzz 5% -define connected-components:verbose=true \
-define connected-components:mean-color=true -connected-components 4 stars.gif</code></pre>
@@ -141,12 +153,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 09:15 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/contact.html b/www/contact.html
index df1af8a..ce9d939 100644
--- a/www/contact.html
+++ b/www/contact.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -88,11 +88,11 @@
<div class="magick-template">
<div class="magick-header">
<div>
- <p class="lead magick-description">Post here for any of the issues listed below. You can expect a response from our team if your issue is a sponsorship, <a href="license.html">license</a>, security, or paid support issue. If you require a response for any other issue, post to the ImageMagick public <a href="https://imagemagick.org/discourse-server/">forums</a>. You can also post bug reports to the <a href="https://github.com/ImageMagick/ImageMagick/issues">issues</a> forum. Note, we do <u>not</u> offer sponsored links <u>nor do we respond to solicitations</u>.</p>
+ <p class="lead magick-description">Post here for any of the issues listed below. You can expect a response from our team if your issue is a sponsorship, <a href="../www/license.html">license</a>, security, or paid support issue. If you require a response for any other issue, post to the ImageMagick public <a href="https://imagemagick.org/discourse-server/">forums</a>. You can also post bug reports to the <a href="https://github.com/ImageMagick/ImageMagick/issues">issues</a> forum. Note, we do <u>not</u> offer sponsored links <u>nor do we respond to solicitations</u>.</p>
<fieldset>
<h2>Contact the Wizards</h2>
<p>Enter this code, <code>
-040d70</code>, in the Authenticate field and fill in the remaining fields. Press Send to forward your message to the ImageMagick wizards:</p>
+1bf0c1</code>, in the Authenticate field and fill in the remaining fields. Press Send to forward your message to the ImageMagick wizards:</p>
<br/>
<form method="post" name="post" id="post" action="https://imagemagick.org/script/contact.php" enctype="application/x-www-form-urlencoded">
<div class="table-responsive" style="font-size:87.5% !important;">
@@ -160,11 +160,14 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
diff --git a/www/convert.html b/www/convert.html
index 66cb58c..0d073d5 100644
--- a/www/convert.html
+++ b/www/convert.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -87,9 +87,9 @@
<main class="container">
<div class="magick-template">
<div class="magick-header">
-<p class="lead magick-description">Use the <code>convert</code> program to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <code>convert</code> command or see below for example usages of the command.</p>
+<p class="lead magick-description">Use the <code>magick</code> program to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <code>magick</code> command or see below for example usages of the command.</p>
-<p>We list a few examples of the <code>convert</code> command here to illustrate its usefulness and ease of use. To get started, lets convert an image in the JPEG format to PNG:</p>
+<p>We list a few examples of the <code>magick</code> command here to illustrate its usefulness and ease of use. To get started, lets convert an image in the JPEG format to PNG:</p>
<pre class="highlight"><code>magick convert rose.jpg rose.png
</code></pre>
@@ -127,11 +127,11 @@
-resize 400% -sigmoidal-contrast 11.6933 -colorspace sRGB output.png');
</code></pre>
-<p>You can find additional examples of using <code>convert</code> in <a href="../Usage/">Examples of ImageMagick Usage</a>.</p>
+<p>You can find additional examples of using <code>magick</code> in <a href="../Usage/">Examples of ImageMagick Usage</a>.</p>
<h2><a class="anchor" id="options"></a>Option Summary</h2>
-<p>The <code>convert</code> command recognizes these options. Click on an option to get more details about how that option works.</p>
+<p>The <code>magick</code> command recognizes these options. Click on an option to get more details about how that option works.</p>
<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
@@ -1364,12 +1364,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:13 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:36 -->
\ No newline at end of file
diff --git a/www/develop.html b/www/develop.html
index e0c04d5..80eefe7 100644
--- a/www/develop.html
+++ b/www/develop.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -227,12 +227,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:47 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:37 -->
\ No newline at end of file
diff --git a/www/display.html b/www/display.html
index 479a501..b89ede2 100644
--- a/www/display.html
+++ b/www/display.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -590,12 +590,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:43 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:38 -->
\ No newline at end of file
diff --git a/www/distribute-pixel-cache.html b/www/distribute-pixel-cache.html
index 84dae97..152f25e 100644
--- a/www/distribute-pixel-cache.html
+++ b/www/distribute-pixel-cache.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/www/distribute-pixel-cache.html" rel="canonical" />
- <link href="../www/images/wand.png" rel="icon" />
- <link href="../www/images/wand.ico" rel="shortcut icon" />
- <link href="../www/assets/magick.css" rel="stylesheet" />
+ <link href="../www/distribute-pixel-cache.html" rel="canonical" />
+ <link href="../images/wand.png" rel="icon" />
+ <link href="../images/wand.ico" rel="shortcut icon" />
+ <link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../www/index.html">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/download.html">Download</a>
+ <a class="nav-link" href="download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../www/www/https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -94,7 +94,7 @@
</pre>
<p>Here we create two distributed pixel caches and utilize them from our desktop:</p>
-<pre class="highlight"><code>convert -distribute-cache 6668 & # start on 192.168.100.50
+<pre class="highlight"><code>magick -distribute-cache 6668 & # start on 192.168.100.50
convert -distribute-cache 6668 & # start on 192.168.100.51
convert -limit memory 1GiB -limit map 2GiB -limit disk 4GiB \
-define registry:cache:hosts=192.168.100.50:6668,192.168.100.51:6668 \
@@ -107,24 +107,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/www/security-policy.html">Security</a> •
- <a href="../www/www/architecture.html">Architecture</a>
+ <p><a href="security-policy.html">Security</a> •
+ <a href="architecture.html">Architecture</a>
- <a href="distribute-pixel-cache.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../www/images/wand.ico"/></a>
+ <a href="distribute-pixel-cache.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/www/links.html">Related</a> •
- <a href="../www/www/sitemap.html">Sitemap</a>
+ <a href="links.html">Related</a> •
+ <a href="sitemap.html">Sitemap</a>
<br/>
- <a href="../www/www/support.html">Donate</a> •
+ <a href="support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:06 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/download.html b/www/download.html
index 0886397..f9764d4 100644
--- a/www/download.html
+++ b/www/download.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -115,16 +115,16 @@
</tr>
<tr>
- <td>ImageMagick-7.0.9-14.x86_64.rpm</td>
- <td><a href= "https://imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.9-14.x86_64.rpm">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-7.0.9-14.x86_64.rpm">download</a></td>
+ <td>ImageMagick-7.0.9-25.x86_64.rpm</td>
+ <td><a href= "https://imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.9-25.x86_64.rpm">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-7.0.9-25.x86_64.rpm">download</a></td>
<td>Redhat / CentOS 7.1 x86_64 RPM</td>
</tr>
<tr>
- <td>ImageMagick-libs-7.0.9-14.x86_64.rpm</td>
- <td><a href= "https://imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.9-14.x86_64.rpm">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-libs-7.0.9-14.x86_64.rpm">download</a></td>
+ <td>ImageMagick-libs-7.0.9-25.x86_64.rpm</td>
+ <td><a href= "https://imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.9-25.x86_64.rpm">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-libs-7.0.9-25.x86_64.rpm">download</a></td>
<td>Redhat / CentOS 7.1 x86_64 RPM</td>
</tr>
@@ -161,8 +161,8 @@
<p>ImageMagick RPM's are self-installing. Simply type the following command and you're ready to start using ImageMagick:</p>
-<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>rpm -Uvh ImageMagick-7.0.9-14.x86_64.rpm</span></pre><p>You'll need the libraries as well:</p>
-<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>rpm -Uvh ImageMagick-libs-7.0.9-14.x86_64.rpm</span></pre>
+<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>rpm -Uvh ImageMagick-7.0.9-25.x86_64.rpm</span></pre><p>You'll need the libraries as well:</p>
+<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>rpm -Uvh ImageMagick-libs-7.0.9-25.x86_64.rpm</span></pre>
<p>Note, if there are missing dependencies, install them from the <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a> repo.</p>
<p>For other systems, create (or choose) a directory to install the package into and change to that directory, for example:</p>
@@ -279,7 +279,7 @@
<p>To run the script:</p>
<pre class="highlight"><code>./imagemagick_compile.sh <var>VERSION</var></code></pre>
-<p>where <var>VERSION</var> is the version of ImageMagick you want to compile (i.e.: 7.0.9-14, svn, ...)</p>
+<p>where <var>VERSION</var> is the version of ImageMagick you want to compile (i.e.: 7.0.9-25, svn, ...)</p>
<p>This script compiles ImageMagick as a static library to be included in iOS projects and adds support for</p>
<ul>
@@ -328,9 +328,9 @@
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q16-x64-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q16-x64-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q16-x64-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q16-x64-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q16-x64-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q16-x64-dll.exe">download</a></td>
<td>Win64 dynamic at 16 bits-per-pixel component</td>
</tr>
</table></div>
@@ -348,93 +348,93 @@
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q16-x64-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q16-x64-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q16-x64-static.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q16-x64-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q16-x64-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q16-x64-static.exe">download</a></td>
<td>Win64 static at 16 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q8-x64-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q8-x64-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q8-x64-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q8-x64-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q8-x64-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q8-x64-dll.exe">download</a></td>
<td>Win64 dynamic at 8 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q8-x64-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q8-x64-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q8-x64-static.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q8-x64-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q8-x64-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q8-x64-static.exe">download</a></td>
<td>Win64 static at 8 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q16-HDRI-x64-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q16-HDRI-x64-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q16-HDRI-x64-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q16-HDRI-x64-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q16-HDRI-x64-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q16-HDRI-x64-dll.exe">download</a></td>
<td>Win64 dynamic at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q16-HDRI-x64-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q16-HDRI-x64-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q16-HDRI-x64-static.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q16-HDRI-x64-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q16-HDRI-x64-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q16-HDRI-x64-static.exe">download</a></td>
<td>Win64 static at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q16-x86-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q16-x86-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q16-x86-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q16-x86-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q16-x86-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q16-x86-dll.exe">download</a></td>
<td>Win32 dynamic at 16 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q16-x86-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q16-x86-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q16-x86-static.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q16-x86-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q16-x86-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q16-x86-static.exe">download</a></td>
<td>Win32 static at 16 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q8-x86-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q8-x86-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q8-x86-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q8-x86-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q8-x86-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q8-x86-dll.exe">download</a></td>
<td>Win32 dynamic at 8 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q8-x86-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q8-x86-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q8-x86-static.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q8-x86-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q8-x86-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q8-x86-static.exe">download</a></td>
<td>Win32 static at 8 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q16-HDRI-x86-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q16-HDRI-x86-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q16-HDRI-x86-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q16-HDRI-x86-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q16-HDRI-x86-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q16-HDRI-x86-dll.exe">download</a></td>
<td>Win32 dynamic at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-Q16-HDRI-x86-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-Q16-HDRI-x86-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-Q16-HDRI-x86-static.exe">download</a></td>
+ <td>ImageMagick-7.0.9-25-Q16-HDRI-x86-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-Q16-HDRI-x86-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-Q16-HDRI-x86-static.exe">download</a></td>
<td>Win32 static at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-portable-Q16-x86.zip</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-portable-Q16-x86.zip">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-portable-Q16-x86.zip">download</a></td>
+ <td>ImageMagick-7.0.9-25-portable-Q16-x86.zip</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-portable-Q16-x86.zip">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-portable-Q16-x86.zip">download</a></td>
<td>Portable Win32 static at 16 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries).</td>
</tr>
<tr>
- <td>ImageMagick-7.0.9-14-portable-Q16-x64.zip</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-14-portable-Q16-x64.zip">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-14-portable-Q16-x64.zip">download</a></td>
+ <td>ImageMagick-7.0.9-25-portable-Q16-x64.zip</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.9-25-portable-Q16-x64.zip">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.9-25-portable-Q16-x64.zip">download</a></td>
<td>Portable Win64 static at 16 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries).</td>
</tr>
</table></div>
@@ -474,12 +474,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:11 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:36 -->
\ No newline at end of file
diff --git a/www/escape.html b/www/escape.html
index 09ef638..a0a89c7 100644
--- a/www/escape.html
+++ b/www/escape.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="escape.html" rel="canonical" />
+ <link href="../www/escape.html" rel="canonical" />
<link href="../images/wand.png" rel="icon" />
<link href="../images/wand.ico" rel="shortcut icon" />
<link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,35 +44,35 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/download.html">Download</a>
+ <a class="nav-link" href="download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/resources.html">Resources</a>
+ <a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/develop.html">Develop</a>
+ <a class="nav-link" href="develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
- <script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
+ <script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
@@ -87,7 +87,7 @@
<main class="container">
<div class="magick-template">
<div class="magick-header">
-<p class="lead magick-description">There are copious amounts of extra data associated with images (metadata), beyond the actual image pixels. This metadata can be useful, either for display, or for various calculations, or in modifying the behavior of later image processing operations. You can utilize percent escapes in a number of options, for example in <a href="../www/command-line-options.html#format_identify_">-format</a> or in montage <a href="../www/command-line-options.html#label" >-label</a>, to print various properties and other settings associated with an image.</p>
+<p class="lead magick-description">There are copious amounts of extra data associated with images (metadata), beyond the actual image pixels. This metadata can be useful, either for display, or for various calculations, or in modifying the behavior of later image processing operations. You can utilize percent escapes in a number of options, for example in <a href="command-line-options.html#format_identify_">-format</a> or in montage <a href="command-line-options.html#label" >-label</a>, to print various properties and other settings associated with an image.</p>
<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-striped">
@@ -445,7 +445,7 @@
</tr>
<tr>
<td>%[distortion]</td>
- <td>how well an image resembles a reference image (<a href="../www/command-line-options.html#compare" >-compare</a>)</td>
+ <td>how well an image resembles a reference image (<a href="command-line-options.html#compare" >-compare</a>)</td>
</tr>
<tr>
<td>%[entropy]</td>
@@ -596,16 +596,16 @@
<h3>Properties</h3>
<p>All other long forms of percent escapes (not single letter long form) are
-handled in a case insensitive manner. Such escapes will will attempt to look
+handled in a case insensitive manner. Such escapes will attempt to look
up that name specific data sources. </p>
<p>The primary search space (if not a specific attribute listed above) is
a free-form property string. Such strings are associated and saved with
-images, and are typically set using either the <a href="../www/command-line-options.html#set" >-set</a>
+images, and are typically set using either the <a href="command-line-options.html#set" >-set</a>
CLI option (or API equivalent), or from special convenience options
-(such as <a href="../www/command-line-options.html#label"
->-label</a>, <a href="../www/command-line-options.html#comment"
->-comment</a>, <a href="../www/command-line-options.html#caption"
+(such as <a href="command-line-options.html#label"
+>-label</a>, <a href="command-line-options.html#comment"
+>-comment</a>, <a href="command-line-options.html#caption"
>-caption</a>). </p>
<p>These convenience options are globally saved (as 'global options' so thay can
@@ -614,7 +614,7 @@
percent escape present is then handled. </p>
<p>To change a property of an image already in memory, you need to use <a
-href="../www/command-line-options.html#set" >-set</a>.
+href="command-line-options.html#set" >-set</a>.
</p>
<p>Note that properties, like attributes (and profiles), are saved with
@@ -637,7 +637,7 @@
such is possible). </p>
<p>For example when you use <code>-define 'distort:viewport=100x100'</code> you
-are in fact generating a global option, which the <a href="../www/command-line-options.html#distort"
+are in fact generating a global option, which the <a href="command-line-options.html#distort"
>-distort</a> operator will use to modify its behavior (distorted output
image 'view'). </p>
@@ -681,7 +681,7 @@
now list all free-form string properties, artifacts, and options, (but not
specific image attributes) using...</p>
-<pre class="highlight"><code>convert ... \
+<pre class="highlight"><code>magick ... \
-print "__Properties__\n%[*]" \
-print "__Artifacts__\n%[artifact:*]" \
-print "__Options__\n%[option:*]" \
@@ -698,13 +698,13 @@
<p>There are some special prefixes (before the first ':') which performs
calculations based on the user provided string that follows that prefix. For
example you can do a numerical calculation use <code>%[fx:...]</code> to
-evaluate the given <a href="../www/fx.html">FX</a> expressions:</p>
+evaluate the given <a href="fx.html">FX</a> expressions:</p>
<pre class="highlight"><code>%[fx:<var>expression</var>]
</code></pre>
<p>Use <code>pixel:</code> or <code>hex:</code> to evaluate a pixel color as defined by the <a
-href="../www/fx.html">FX</a>
+href="fx.html">FX</a>
expression:</p>
<pre class="highlight"><code>%[pixel:<var>expression</var>]
@@ -910,24 +910,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/security-policy.html">Security</a> •
- <a href="../www/architecture.html">Architecture</a>
+ <p><a href="security-policy.html">Security</a> •
+ <a href="architecture.html">Architecture</a>
<a href="escape.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/links.html">Related</a> •
- <a href="../www/sitemap.html">Sitemap</a>
+ <a href="links.html">Related</a> •
+ <a href="sitemap.html">Sitemap</a>
<br/>
- <a href="../www/support.html">Donate</a> •
+ <a href="support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:21 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/examples.html b/www/examples.html
index 0676334..be103e8 100644
--- a/www/examples.html
+++ b/www/examples.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -106,12 +106,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:01 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/exception.html b/www/exception.html
index 371cfd7..3c58f95 100644
--- a/www/exception.html
+++ b/www/exception.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -295,12 +295,14 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:09 -->
\ No newline at end of file
diff --git a/www/export.html b/www/export.html
index 2298507..30a13f4 100644
--- a/www/export.html
+++ b/www/export.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/www/export.html" rel="canonical" />
- <link href="../www/images/wand.png" rel="icon" />
- <link href="../www/images/wand.ico" rel="shortcut icon" />
- <link href="../www/assets/magick.css" rel="stylesheet" />
+ <link href="../www/export.html" rel="canonical" />
+ <link href="../images/wand.png" rel="icon" />
+ <link href="../images/wand.ico" rel="shortcut icon" />
+ <link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,35 +44,35 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../www/">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/download.html">Download</a>
+ <a class="nav-link" href="download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../www/www/https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
- <script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
+ <script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
@@ -94,24 +94,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/www/security-policy.html">Security</a> •
- <a href="../www/www/architecture.html">Architecture</a>
+ <p><a href="security-policy.html">Security</a> •
+ <a href="architecture.html">Architecture</a>
- <a href="export.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../www/images/wand.ico"/></a>
+ <a href="export.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/www/links.html">Related</a> •
- <a href="../www/www/sitemap.html">Sitemap</a>
+ <a href="links.html">Related</a> •
+ <a href="sitemap.html">Sitemap</a>
<br/>
- <a href="../www/www/support.html">Donate</a> •
+ <a href="support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:33 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/formats.html b/www/formats.html
index a6f183f..c39e2f8 100644
--- a/www/formats.html
+++ b/www/formats.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -114,7 +114,7 @@
</code></pre>
OR use the appropriate percent escape
-<pre class="highlight"><code>-> convert image.jpg -print "%[colorspace]\n" null:
+<pre class="highlight"><code>-> magick image.jpg -print "%[colorspace]\n" null:
sRGB
</code></pre>
@@ -125,7 +125,7 @@
results in linear RGB (essentially sRGB with the gamma function removed). For
example,</p>
-<pre class="highlight"><code>convert image.jpg -colorspace RGB -resize 50% -colorspace sRGB resize.jpg
+<pre class="highlight"><code>magick image.jpg -colorspace RGB -resize 50% -colorspace sRGB resize.jpg
</code></pre>
<p>As of IM 6.7.8-2 one can properly work in LAB colorspace whether or not
@@ -133,7 +133,7 @@
B channels are stored with a 50% gray bias, to allow it to handle the
negatives required by the format.</p>
-<pre class="highlight"><code>convert lab.tif -resize 50% resize.jpg
+<pre class="highlight"><code>magick lab.tif -resize 50% resize.jpg
</code></pre>
<p>Again, it may not make sense for some image processing operators to work
@@ -146,7 +146,7 @@
operator. Afterward you can transform back to the LAB colorspace. For
example,</p>
-<pre class="highlight"><code> convert lab.tif -colorspace RGB -resize 50% -colorspace Lab resize.jpg
+<pre class="highlight"><code> magick lab.tif -colorspace RGB -resize 50% -colorspace Lab resize.jpg
</code></pre>
<h2><a class="anchor" id="supported"></a>Supported Image Formats</h2>
@@ -689,7 +689,7 @@
<td>RW</td>
<td>Magick Persistent Registry</td>
<td>This format permits you to write to and read images from memory. The image persists until the program exits. For example, let's use the MPR to create a checkerboard:
-<pre class="highlight"><code>convert \( -size 15x15 canvas:black canvas:white -append \) \
+<pre class="highlight"><code>magick \( -size 15x15 canvas:black canvas:white -append \) \
\( +clone -flip \) +append -write mpr:checkers +delete \
-size 240x240 tile:mpr:checkers board.png
</code></pre></td>
@@ -720,7 +720,7 @@
<td><a href="magick-vector-graphics.html">MVG</a></td>
<td>RW</td>
<td>Magick Vector Graphics.</td>
- <td>The native ImageMagick vector metafile format. A text file containing vector drawing commands accepted by <a href="convert.html">convert</a>'s <a href="command-line-options.html#draw">-draw</a> option.</td>
+ <td>The native ImageMagick vector metafile format. A text file containing vector drawing commands accepted by <a href="magick.html">magick</a>'s <a href="command-line-options.html#draw">-draw</a> option.</td>
</tr>
<tr>
@@ -943,7 +943,7 @@
<td>POCKETMOD</td>
<td>RW</td>
<td>Pocketmod personal organizer format</td>
- <td>Example usage: <code>convert -density 300 pages?.pdf pocketmod:organize.pdf</code> </td>
+ <td>Example usage: <code>magick -density 300 pages?.pdf pocketmod:organize.pdf</code> </td>
</tr>
<tr>
@@ -1382,7 +1382,7 @@
<td>INLINE</td>
<td>RW</td>
<td>Base64-encoded inline image</td>
- <td>The inline image look similar to <code>inline:data:;base64,/9j/4AAQSk...knrn//2Q==</code>. If the inline image exceeds 5000 characters, reference it from a file (e.g. <code>inline:inline.txt</code>). You can also write a base64-encoded image. Embed the mime type in the filename, for example, <code>convert myimage inline:jpeg:myimage.txt</code>.</td>
+ <td>The inline image look similar to <code>inline:data:;base64,/9j/4AAQSk...knrn//2Q==</code>. If the inline image exceeds 5000 characters, reference it from a file (e.g. <code>inline:inline.txt</code>). You can also write a base64-encoded image. Embed the mime type in the filename, for example, <code>magick myimage inline:jpeg:myimage.txt</code>.</td>
</tr>
<tr>
@@ -1563,7 +1563,7 @@
<td> NETSCAPE</td>
<td>R</td>
<td>image using colors in Netscape 216 (6x6x6 ) color cube, 216x144</td>
- <td>Most commonly used with the <a href="convert.html">convert</a> and <a href="mogrify.html">mogrify</a> programs with the <a href="command-line-options.html#map">-map</a> option to create <var>web safe</var> images.</td>
+ <td>Most commonly used with the <a href="magick.html">magick</a> and <a href="mogrify.html">magick mogrify</a> programs with the <a href="command-line-options.html#map">-map</a> option to create <var>web safe</var> images.</td>
</tr>
<tr>
@@ -2021,14 +2021,14 @@
<td>RW</td>
<td>International Color Consortium color profile</td>
<td>Also known as <code>ICM</code>. To read, use <a href="command-line-options.html#profile">-profile</a> with
- <a href="convert.html">convert</a>.</td>
+ <a href="magick.html">magick</a>.</td>
</tr>
<tr>
<td>IPTC</td>
<td>RW</td>
<td>IPTC Newsphoto (binary)</td>
- <td>To read, use <a href="command-line-options.html#profile">-profile</a> with <a href="convert.html">convert</a></td>
+ <td>To read, use <a href="command-line-options.html#profile">-profile</a> with <a href="magick.html">magick</a></td>
</tr>
<tr>
@@ -2056,12 +2056,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:31 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:41 -->
\ No newline at end of file
diff --git a/www/fx.html b/www/fx.html
index 6a9e5c3..af0939b 100644
--- a/www/fx.html
+++ b/www/fx.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -189,8 +189,9 @@
<dd class="col-md-8"> E (Euler's number), Epsilon, QuantumRange, QuantumScale, Opaque, Phi (golden ratio), Pi, Transparent</dd>
<dt class="col-md-4"> FX operators (in order of precedence): </dt>
<dd class="col-md-8"> ^ (power), unary -, *, /, % (modulo), +, -,
- <<, >>, <, <=, >, >=, +=, -=, *=, /=, ++, --,
- ==, !=, & (bitwise AND), | (bitwise OR),
+ <<, >>, <, <=, >, >=, +=, -=, *=, /=, %=, <<=
+, >>=,
+ &=, |=, ++, --, ==, !=, & (bitwise AND), | (bitwise OR),
&& (logical AND), || (logical OR),
~ (logical NOT), ?: (ternary conditional)</dd>
<dt class="col-md-4"> math functions: </dt>
@@ -256,7 +257,7 @@
<dd><code>kurtosis</code>: image kurtosis</dd>
<dd><code>skewness</code>: image skewness (add a channel specifier to compute a statistic for that channel, e.g. depth.r)</dd></dl></dd>
<dt class="col-md-4"> iterators:</dt>
- <dd class="col-md-8"> for(), while()</dd>
+ <dd class="col-md-8"> do(), for(), while()</dd>
<dt class="col-md-4"> image attributes:</dt>
<dd class="col-md-8"> image.depth, image.kurtosis, image.maxima, image.minima, image.resolution.x, image.resolution.y, image.skewness, image.standard_deviation</dd>
</dl>
@@ -321,6 +322,7 @@
<dt class="col-md-4"> <code>cos(</code><var>x</var><code>)</code></dt><dd class="col-md-8"> cosine function</dd>
<dt class="col-md-4"> <code>cosh(</code><var>x</var><code>)</code></dt><dd class="col-md-8"> hyperbolic cosine function</dd>
<dt class="col-md-4"> <code>debug(</code><var>x</var><code>)</code></dt><dd class="col-md-8"> print <var>x</var> (useful for debugging your expression)</dd>
+<dt class="col-md-4"> <code>do(</code><var>expression</var>, <var>condition test</var><code>)</code></dt><dd class="col-md-8"> iterate while the condition is not equal to 0</dd>
<dt class="col-md-4"> <code>drc(</code><var>x</var>,<var>y</var><code>)</code></dt><dd class="col-md-8"> dynamic range compression (knee curve); drc(<var>x</var>,<var>y</var>)=(<var>x</var>)/(<var>y</var>*(<var>x</var>-1)+1); -1<<var>y</var><1 </dd>
<dt class="col-md-4"> <code>erf(</code><var>x</var><code>)</code></dt><dd class="col-md-8"> error function</dd>
<dt class="col-md-4"> <code>exp(</code><var>x</var><code>)</code></dt><dd class="col-md-8"> natural exponential function (<var>e<sup>x</sup></var>)</dd>
@@ -463,12 +465,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:43 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/gradient.html b/www/gradient.html
index 7b245b3..f5153e1 100644
--- a/www/gradient.html
+++ b/www/gradient.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -266,12 +266,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:38 -->
\ No newline at end of file
diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html
index d9aed7b..13fb81f 100644
--- a/www/high-dynamic-range.html
+++ b/www/high-dynamic-range.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -97,6 +97,8 @@
<li>apply tone-mapping for specific display</li>
</ul>
+<p>ImageMagick supports the Jzazbc colorspace, for applications that require wide color gamut and high dynamic range.</p>
+
<h2><a class="anchor" id="enable"></a>Enabling HDRI in ImageMagick</h2>
<p>By default, image pixels in ImageMagick version 7 are stored in a floating-point representation that range from 0 to the quantum depth, which is typically 16-bits (Q16). With HDRI enabled, the pixels can include negative values as well as values that exceed the quantum depth. A majority of digital image formats do not support HDRI, and for those images any pixels outside the quantum range are clamped before they are stored.</p>
@@ -131,12 +133,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/history.html b/www/history.html
index bd9316b..48e99c5 100644
--- a/www/history.html
+++ b/www/history.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="history.html" rel="canonical" />
+ <link href="../www/history.html" rel="canonical" />
<link href="../images/wand.png" rel="icon" />
<link href="../images/wand.ico" rel="shortcut icon" />
<link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,35 +44,35 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/download.html">Download</a>
+ <a class="nav-link" href="download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/resources.html">Resources</a>
+ <a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/develop.html">Develop</a>
+ <a class="nav-link" href="develop.html">Develop</a>
</li>
<li class="nav-item">
- <a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server//">Community</a>
+ <a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
- <script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
+ <script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
@@ -111,17 +111,20 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/security-policy.html">Security</a> •
- <a href="../www/architecture.html">Architecture</a>
+ <p><a href="security-policy.html">Security</a> •
+ <a href="architecture.html">Architecture</a>
<a href="history.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/links.html">Related</a> •
- <a href="../www/sitemap.html">Sitemap</a>
+ <a href="links.html">Related</a> •
+ <a href="sitemap.html">Sitemap</a>
<br/>
- <a href="../www/support.html">Donate</a> •
+ <a href="support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
@@ -131,4 +134,4 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 28th November 2019 09:11 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/identify.html b/www/identify.html
index d41c63f..d28739f 100644
--- a/www/identify.html
+++ b/www/identify.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -454,12 +454,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:38 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:41 -->
\ No newline at end of file
diff --git a/www/import.html b/www/import.html
index ba5ac4e..281a8c6 100644
--- a/www/import.html
+++ b/www/import.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -451,12 +451,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:24 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/index.html b/www/index.html
index 80cd568..2af71f6 100644
--- a/www/index.html
+++ b/www/index.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="index.html" rel="canonical" />
+ <link href="../www/index.html" rel="canonical" />
<link href="../images/wand.png" rel="icon" />
<link href="../images/wand.ico" rel="shortcut icon" />
<link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,35 +44,35 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
- <a class="nav-link" href="../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/download.html">Download</a>
+ <a class="nav-link" href="download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/resources.html">Resources</a>
+ <a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/develop.html">Develop</a>
+ <a class="nav-link" href="develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
- <script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
+ <script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
@@ -90,17 +90,17 @@
<p class="text-center"><a href="index.html#features">Features and Capabilities</a> • <a href="index.html#news">News</a> • <a href="index.html#community">Community</a></p>
<p class="lead magick-description"><a href="../images/wizard.png" title="And Now a Touch of Magick"><img class="img-fluid magick-icon" id="logo" alt="And Now a Touch of Magick" width="265" height="352" src="../images/wizard.jpg" /></a>
-Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&entry=78333969">®</a></sup> to create, edit, compose, or convert bitmap images. It can read and write images in a variety of <a href="../www/formats.html">formats</a> (over 200) including PNG, JPEG, GIF, HEIC, TIFF, <a href="../www/motion-picture.html">DPX</a>, <a href="../www/high-dynamic-range.html">EXR</a>, WebP, Postscript, PDF, and SVG. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.</p>
+Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&entry=78333969">®</a></sup> to create, edit, compose, or convert bitmap images. It can read and write images in a variety of <a href="formats.html">formats</a> (over 200) including PNG, JPEG, GIF, HEIC, TIFF, <a href="motion-picture.html">DPX</a>, <a href="high-dynamic-range.html">EXR</a>, WebP, Postscript, PDF, and SVG. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.</p>
-<p>ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may use, copy, modify, and distribute in both open and proprietary applications. It is distributed under a derived Apache 2.0 <a href="license.html">license</a>.</p>
+<p>ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may use, copy, modify, and distribute in both open and proprietary applications. It is distributed under a derived Apache 2.0 <a href="../www/license.html">license</a>.</p>
<p>ImageMagick utilizes multiple computational threads to increase performance and can read, process, or write mega-, giga-, or tera-pixel image sizes.</p>
-<p>The current release is ImageMagick <a href="../www/download.html">7.0.9-14</a>. It runs on <a href="../www/download.html#unix">Linux</a>, <a href="../www/download.html#windows">Windows</a>, <a href="../www/download.html#macosx">Mac Os X</a>, <a href="../www/download.html#iOS">iOS</a>, <a href="https://github.com/cherryleafroad/Android-ImageMagick7">Android</a> OS, and others.</p>
+<p>The current release is ImageMagick <a href="download.html">7.0.9-25</a>. It runs on <a href="download.html#unix">Linux</a>, <a href="download.html#windows">Windows</a>, <a href="download.html#macosx">Mac Os X</a>, <a href="download.html#iOS">iOS</a>, <a href="https://github.com/cherryleafroad/Android-ImageMagick7">Android</a> OS, and others.</p>
<p>The authoritative ImageMagick web site is <a href="../">https://imagemagick.org</a>. The authoritative source code repository is <a href="https://github.com/ImageMagick" target="_blank">https://github.com/ImageMagick</a>. We maintain a source code mirror at <a href="https://gitlab.com/ImageMagick" target="_blank">https://gitlab.com/ImageMagick</a>. We continue to maintain the legacy release of ImageMagick, version 6, at <a href="https://legacy.imagemagick.org/">https://legacy.imagemagick.org</a>.</p>
<h2><a class="anchor" id="features"></a>Features and Capabilities</h2>
-<p>Here are just a few <a href="../www/examples.html">examples</a> of what ImageMagick can do for you:</p>
+<p>Here are just a few <a href="examples.html">examples</a> of what ImageMagick can do for you:</p>
<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
@@ -108,11 +108,11 @@
<td>create a GIF animation sequence from a group of images.</td>
</tr>
<tr>
- <td><a href="../www/color-management.html">Color management</a></td>
+ <td><a href="color-management.html">Color management</a></td>
<td>accurate color management with color profiles or in lieu of-- built-in gamma compression or expansion as demanded by the colorspace.</td>
</tr>
<tr>
- <td><a href="../www/command-line-processing.html">Command-line processing</a></td>
+ <td><a href="command-line-processing.html">Command-line processing</a></td>
<td>utilize ImageMagick from the command-line.</td>
</tr>
<tr>
@@ -120,11 +120,11 @@
<td>bidirectional text support and shaping.</td>
</tr>
<tr>
- <td><a href="../www/composite.html">Composite</a></td>
+ <td><a href="composite.html">Composite</a></td>
<td>overlap one image over another.</td>
</tr>
<tr>
- <td><a href="../www/connected-components.html">Connected component labeling</a></td>
+ <td><a href="connected-components.html">Connected component labeling</a></td>
<td>uniquely label connected regions in an image.</td>
</tr>
<tr>
@@ -140,7 +140,7 @@
<td>implements the forward and inverse <a href="https://en.wikipedia.org/wiki/Discrete_Fourier_transform">DFT</a>.</td>
</tr>
<tr>
- <td><a href="../www/distribute-pixel-cache.html">Distributed pixel cache</a></td>
+ <td><a href="distribute-pixel-cache.html">Distributed pixel cache</a></td>
<td>offload intermediate pixel storage to one or more remote servers.</td>
</tr>
<tr>
@@ -148,51 +148,51 @@
<td>add shapes or text to an image.</td>
</tr>
<tr>
- <td><a href="../www/cipher.html">Encipher or decipher an image</a></td>
+ <td><a href="cipher.html">Encipher or decipher an image</a></td>
<td>convert ordinary images into unintelligible gibberish and back again.</td>
</tr>
<tr>
- <td><a href="../www/convert.html">Format conversion</a></td>
- <td>convert an image from one <a href="../www/formats.html">format </a> to another (e.g. PNG to JPEG).</td>
+ <td><a href="convert.html">Format conversion</a></td>
+ <td>convert an image from one <a href="formats.html">format </a> to another (e.g. PNG to JPEG).</td>
</tr>
<tr>
<td><a href="../Usage/distorts/">Generalized pixel distortion</a></td>
<td>correct for, or induce image distortions including perspective.</td>
</tr>
<tr>
- <td><a href="../www/architecture.html#distributed">Heterogeneous distributed processing</a></td>
- <td>certain algorithms are <a href="../www/opencl.html">OpenCL</a>-enabled to take advantage of speed-ups offered by executing in concert across heterogeneous platforms consisting of CPUs, GPUs, and other processors.</td>
+ <td><a href="architecture.html#distributed">Heterogeneous distributed processing</a></td>
+ <td>certain algorithms are <a href="opencl.html">OpenCL</a>-enabled to take advantage of speed-ups offered by executing in concert across heterogeneous platforms consisting of CPUs, GPUs, and other processors.</td>
</tr>
<tr>
- <td><a href="../www/high-dynamic-range.html">High dynamic-range images</a></td>
+ <td><a href="high-dynamic-range.html">High dynamic-range images</a></td>
<td>accurately represent the wide range of intensity levels found in real scenes ranging from the brightest direct sunlight to the deepest darkest shadows.</td>
</tr>
<tr>
- <td><a href="../www/clahe.html">Histogram Equalization</a></td>
+ <td><a href="clahe.html">Histogram Equalization</a></td>
<td>Use adaptive histogram equalization to improve contrast in images.</td>
</tr>
<tr>
- <td><a href="../www/fx.html">Image calculator</a></td>
+ <td><a href="fx.html">Image calculator</a></td>
<td>apply a mathematical expression to an image, image sequence, or image channels.</td>
</tr>
<tr>
- <td><a href="../www/gradient.html">Image gradients</a></td>
+ <td><a href="gradient.html">Image gradients</a></td>
<td>create a gradual blend of two colors whose shape is horizontal, vertical, circular, or elliptical.</td>
</tr>
<tr>
- <td><a href="../www/identify.html">Image identification</a></td>
+ <td><a href="identify.html">Image identification</a></td>
<td>describe the format and attributes of an image.</td>
</tr>
<tr>
- <td><a href="../www/download.html#iOS">ImageMagick on the iPhone</a></td>
+ <td><a href="download.html#iOS">ImageMagick on the iPhone</a></td>
<td>convert, edit, or compose images on your <a href="https://www.apple.com/ios/">iOS</a> device such as the iPhone or iPad.</td>
</tr>
<tr>
- <td><a href="../www/architecture.html#tera-pixel">Large image support</a></td>
+ <td><a href="architecture.html#tera-pixel">Large image support</a></td>
<td>read, process, or write mega-, giga-, or tera-pixel image sizes.</td>
</tr>
<tr>
- <td><a href="../www/montage.html">Montage</a></td>
+ <td><a href="montage.html">Montage</a></td>
<td>juxtapose image thumbnails on an image canvas.</td>
</tr>
<tr>
@@ -200,7 +200,7 @@
<td>extract features, describe shapes, and recognize patterns in images.</td>
</tr>
<tr>
- <td><a href="../www/motion-picture.html">Motion picture support</a></td>
+ <td><a href="motion-picture.html">Motion picture support</a></td>
<td>read and write the common image formats used in digital film work.</td>
</tr>
<tr>
@@ -220,8 +220,8 @@
<td>insert descriptive or artistic text in an image.</td>
</tr>
<tr>
- <td><a href="../www/architecture.html#threads">Threads of execution support</a></td>
- <td>ImageMagick is thread safe and most internal algorithms execute in <a href="../www/openmp.html">parallel</a> to take advantage of speed-ups offered by multicore processor chips.</td>
+ <td><a href="architecture.html#threads">Threads of execution support</a></td>
+ <td>ImageMagick is thread safe and most internal algorithms execute in <a href="openmp.html">parallel</a> to take advantage of speed-ups offered by multicore processor chips.</td>
</tr>
<tr>
<td><a href="../Usage/resize/">Transform</a></td>
@@ -232,19 +232,21 @@
<td>render portions of an image invisible.</td>
</tr>
<tr>
- <td><a href="../www/architecture.html#virtual-pixels">Virtual pixel support</a></td>
+ <td><a href="architecture.html#virtual-pixels">Virtual pixel support</a></td>
<td>convenient access to pixels outside the image boundaries.</td>
</tr>
</table>
</div>
-<p><a href="../Usage/" target="_blank">Examples of ImageMagick Usage</a> shows how to use ImageMagick from the <a href="../www/command-line-processing.html">command-line</a> to accomplish any of these tasks and much more. Also, see <a href="http://www.fmwconcepts.com/imagemagick/" target="_blank">Fred's ImageMagick Scripts</a>: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations. With <a href="https://github.com/dlemstra/Magick.NET">Magick.NET</a>, use ImageMagick without having to install ImageMagick on your server or desktop.</p>
+<p><a href="../Usage/" target="_blank">Examples of ImageMagick Usage</a> shows how to use ImageMagick from the <a href="command-line-processing.html">command-line</a> to accomplish any of these tasks and much more. Also, see <a href="http://www.fmwconcepts.com/imagemagick/" target="_blank">Fred's ImageMagick Scripts</a>: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations. With <a href="https://github.com/dlemstra/Magick.NET">Magick.NET</a>, use ImageMagick without having to install ImageMagick on your server or desktop.</p>
<h2><a class="anchor" id="news"></a>News</h2>
-<p>Now that ImageMagick version 7 is released, we continue to maintain the legacy release of ImageMagick, version 6, at <a href="https://legacy.imagemagick.org/">https://legacy.imagemagick.org</a>. Learn how ImageMagick version 7 differs from previous versions with our <a href="../www/porting.html">porting guide</a>.</p>
+<p>Now that ImageMagick version 7 is released, we continue to maintain the legacy release of ImageMagick, version 6, at <a href="https://legacy.imagemagick.org/">https://legacy.imagemagick.org</a>. Learn how ImageMagick version 7 differs from previous versions with our <a href="porting.html">porting guide</a>.</p>
-<p>ImageMagick best practices <strong>strongly</strong> encourages you to configure a <a href="../www/security-policy.html">security policy</a> that suits your local environment.</p>
+<p>We discovered a bug in the pseudo-random generator prior to ImageMagick 7.0.9-11, the first 3 values repeated because the random state was not initialized properly. As a consequence of the fix, expect a different numerical sequence when seeding (-seed).</p>
+
+<p>ImageMagick best practices <strong>strongly</strong> encourages you to configure a <a href="security-policy.html">security policy</a> that suits your local environment.</p>
<p>The ImageMagick development process ensures a stable API and <a href="https://abi-laboratory.pro/tracker/timeline/imagemagick/">ABI</a>. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="https://github.com/google/sanitizers/wiki/AddressSanitizer">memory error</a>, <a href="https://github.com/google/sanitizers/wiki/ThreadSanitizer">thread data race</a> detection, and continuous <a href="https://github.com/google/oss-fuzz">fuzzing</a> to detect and prevent security vulnerabilities.</p>
@@ -253,12 +255,12 @@
<p>Want more performance from ImageMagick? Try these options:</p>
<ul>
-<li>add more memory to your system, see <a href="../www/architecture.html#cache">the pixel cache</a>;</li>
-<li>add more cores to your system, see <a href="../www/architecture.html#threads">threads of execution support</a>;</li>
+<li>add more memory to your system, see <a href="architecture.html#cache">the pixel cache</a>;</li>
+<li>add more cores to your system, see <a href="architecture.html#threads">threads of execution support</a>;</li>
<li>reduce lock contention with the <a href="http://goog-perftools.sourceforge.net/doc/tcmalloc.html">tcmalloc</a> memory allocation library;</li>
-<li>push large images to a solid-state drive, see <a href="../www/architecture.html#tera-pixel">large image support</a>.</li>
+<li>push large images to a solid-state drive, see <a href="architecture.html#tera-pixel">large image support</a>.</li>
</ul>
-<p>If these options are prohibitive, you can reduce the quality of the image results. The default build is Q16 HDRI. If you disable <a href="../www/high-dynamic-range.html">HDRI</a>, you use half the memory and instead of predominately floating point operations, you use the typically more efficient integer operations. The tradeoff is reduced precision and you cannot process out of range pixel values (e.g. negative). If you build the Q8 non-HDRI version of ImageMagick, you again reduce the memory requirements in half-- and once again there is a tradeoff, even less precision and no out of range pixel values. For a Q8 non-HDRI build of ImageMagick, use these <code>configure</code> script options: <code>--with-quantum-depth=8 --disable-hdri</code>.</p>
+<p>If these options are prohibitive, you can reduce the quality of the image results. The default build is Q16 HDRI. If you disable <a href="high-dynamic-range.html">HDRI</a>, you use half the memory and instead of predominately floating point operations, you use the typically more efficient integer operations. The tradeoff is reduced precision and you cannot process out of range pixel values (e.g. negative). If you build the Q8 non-HDRI version of ImageMagick, you again reduce the memory requirements in half-- and once again there is a tradeoff, even less precision and no out of range pixel values. For a Q8 non-HDRI build of ImageMagick, use these <code>configure</code> script options: <code>--with-quantum-depth=8 --disable-hdri</code>.</p>
<h2><a class="anchor" id="community"></a>Community</h2>
<p>To join the ImageMagick community, try the <a target="_blank" href="https://imagemagick.org/discourse-server/">discourse server</a>. You can review questions or comments (with informed responses) posed by ImageMagick users or ask your own questions. If you want to contribute image processing algorithms, other enhancements, or bug fixes, open an <a href="https://github.com/ImageMagick/ImageMagick/issues">issue</a>. </p>
@@ -266,24 +268,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/security-policy.html">Security</a> •
- <a href="../www/architecture.html">Architecture</a>
+ <p><a href="security-policy.html">Security</a> •
+ <a href="architecture.html">Architecture</a>
<a href="index.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/links.html">Related</a> •
- <a href="../www/sitemap.html">Sitemap</a>
+ <a href="links.html">Related</a> •
+ <a href="sitemap.html">Sitemap</a>
<br/>
- <a href="../www/support.html">Donate</a> •
+ <a href="support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:10 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:36 -->
\ No newline at end of file
diff --git a/www/install-source.html b/www/install-source.html
index df5d511..39c1baa 100644
--- a/www/install-source.html
+++ b/www/install-source.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -181,12 +181,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:38 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/jp2.html b/www/jp2.html
index 24bf79f..f70fed1 100644
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -183,12 +183,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:31 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/license.html b/www/license.html
index bbcf69a..576bc5e 100644
--- a/www/license.html
+++ b/www/license.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="license.html" rel="canonical" />
+ <link href="../www/license.html" rel="canonical" />
<link href="../images/wand.png" rel="icon" />
<link href="../images/wand.ico" rel="shortcut icon" />
<link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,35 +44,35 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/download.html">Download</a>
+ <a class="nav-link" href="download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/resources.html">Resources</a>
+ <a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/develop.html">Develop</a>
+ <a class="nav-link" href="develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
- <script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
+ <script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
@@ -216,24 +216,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/security-policy.html">Security</a> •
- <a href="../www/architecture.html">Architecture</a>
+ <p><a href="security-policy.html">Security</a> •
+ <a href="architecture.html">Architecture</a>
<a href="license.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/links.html">Related</a> •
- <a href="../www/sitemap.html">Sitemap</a>
+ <a href="links.html">Related</a> •
+ <a href="sitemap.html">Sitemap</a>
<br/>
- <a href="../www/support.html">Donate</a> •
+ <a href="support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 09:49 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/links.html b/www/links.html
index c83c6ba..3e5bee8 100644
--- a/www/links.html
+++ b/www/links.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -187,12 +187,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:49 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:40 -->
\ No newline at end of file
diff --git a/www/magick++.html b/www/magick++.html
index 1668ac8..126160e 100644
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -210,12 +210,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 09:41 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/magick-core.html b/www/magick-core.html
index e6744bf..bd2d71d 100644
--- a/www/magick-core.html
+++ b/www/magick-core.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -355,12 +355,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 09:22 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/magick-script.html b/www/magick-script.html
index 3fab3aa..cda9167 100644
--- a/www/magick-script.html
+++ b/www/magick-script.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -87,7 +87,7 @@
<main class="container">
<div class="magick-template">
<div class="magick-header">
-<p class="lead magick-description">Use the <code>magick-script</code> scripting language to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <code>convert</code> command or see below for example usages of the command.</p>
+<p class="lead magick-description">Use the <code>magick-script</code> scripting language to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <code>magick</code> command or see below for example usages of the command.</p>
<p>Here is an example script:</p>
@@ -1307,12 +1307,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html
index ac529e3..972f29e 100644
--- a/www/magick-vector-graphics.html
+++ b/www/magick-vector-graphics.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -92,7 +92,7 @@
<p class="lead magick-description">This specification defines the features and syntax for Magick Vector Graphics (MVG), a modularized language for describing two-dimensional vector and mixed vector/raster graphics in ImageMagick. You can use the language to draw from the
command line, from an MVG file, from an <a href="http://www.w3.org/TR/SVG/">SVG -- Scalable Vector Graphics</a> file or from one of the ImageMagick <a href="../www/api.html">program interfaces</a>. Use this command, for example, to render an arc:</p>
-<pre class="highlight"><code>convert -size 100x60 canvas:skyblue -fill white -stroke black \
+<pre class="highlight"><code>magick -size 100x60 canvas:skyblue -fill white -stroke black \
-draw "path 'M 30,40 A 30,20 20 0,0 70,20 A 30,20 20 1,0 30,40 Z '" \
arc.png
</code></pre>
@@ -259,7 +259,7 @@
<p>to render a pie chart with this command:</p>
-<pre class="highlight"><code>convert mvg:piechart.mvg piechart.png
+<pre class="highlight"><code>magick mvg:piechart.mvg piechart.png
</code></pre>
<p>which produces this rendering:</p>
@@ -270,7 +270,7 @@
<p>However, in general, MVG is sufficiently difficult to work with that you probably want to use a program to generate your graphics in the SVG format. ImageMagick automagically converts SVG to MVG and renders your image, for example, we render <a href="https://imagemagick.org/source/piechart.svg">piechart.svg</a> with this command:</p>
-<pre class="highlight"><code>convert mvg:piechart.svg piechart.jpg
+<pre class="highlight"><code>magick mvg:piechart.svg piechart.jpg
</code></pre>
@@ -905,12 +905,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:32 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/magick-wand.html b/www/magick-wand.html
index d5b2252..477ecc7 100644
--- a/www/magick-wand.html
+++ b/www/magick-wand.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -407,12 +407,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:50 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/magick.html b/www/magick.html
index 9af3b98..3eefd05 100644
--- a/www/magick.html
+++ b/www/magick.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -87,7 +87,7 @@
<main class="container">
<div class="magick-template">
<div class="magick-header">
-<p class="lead magick-description">Use the <code>magick</code> program to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <code>convert</code> command or see below for example usages of the command.</p>
+<p class="lead magick-description">Use the <code>magick</code> program to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <code>magick</code> command or see below for example usages of the command.</p>
<p>We list a few examples of the <code>magick</code> command here to illustrate its usefulness and ease of use. To get started, lets convert an image in the JPEG format to PNG:</p>
@@ -1350,12 +1350,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:38 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/miff.html b/www/miff.html
index fd35593..79bb6b9 100644
--- a/www/miff.html
+++ b/www/miff.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -270,12 +270,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:31 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/mirror.html b/www/mirror.html
index 6793c72..fa97d21 100644
--- a/www/mirror.html
+++ b/www/mirror.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -88,7 +88,7 @@
<div class="magick-template">
<div class="magick-header">
<p class="lead magick-description">ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below. ImageMagick stable and development source releases are also available from <a href="https://github.com/ImageMagick">Git</a>. Before you download, you may want to review recent <a href="changelog.html">changes</a> to the ImageMagick distribution. The authoritative source code repository is <a href="https://github.com/ImageMagick">https://github.com/ImageMagick</a>.</p>
-<p>The latest release of ImageMagick is version 7.0.9-14.</p>
+<p>The latest release of ImageMagick is version 7.0.9-25.</p>
<dl>
<dt>Germany</dt>
<dd><a href="http://mirror.checkdomain.de/imagemagick/">http://mirror.checkdomain.de/imagemagick/</a></dd>
@@ -134,12 +134,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:31 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/mogrify.html b/www/mogrify.html
index cbda0e7..103768e 100644
--- a/www/mogrify.html
+++ b/www/mogrify.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -89,7 +89,7 @@
<div class="magick-header">
<p class="text-center"><a href="mogrify.html#usage">Example Usage</a> • <a href="mogrify.html#options">Option Summary</a></p>
-<p class="lead magick-description">Use the <code>mogrify</code> program to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to <a href="convert.html">convert</a> except that the original image file is <em>overwritten</em> (unless you change the file suffix with the <a href="command-line-options.html#format">-format</a> option) with any changes you request. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <code>mogrify</code> command or see below for sample usages of the command.</p>
+<p class="lead magick-description">Use the <code>magick mogrify</code> program to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to <a href="convert.html">magick convert</a> except that the original image file is <em>overwritten</em> (unless you change the file suffix with the <a href="command-line-options.html#format">-format</a> option) with any changes you request. See <a href="command-line-processing.html">Command Line Processing</a> for advice on how to structure your <code>mogrify</code> command or see below for sample usages of the command.</p>
<h2><a class="anchor" id="usage"></a>Example Usage</h2>
@@ -1345,12 +1345,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:37 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:38 -->
\ No newline at end of file
diff --git a/www/montage.html b/www/montage.html
index 7350de9..a04a95a 100644
--- a/www/montage.html
+++ b/www/montage.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -667,12 +667,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:13 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/motion-picture.html b/www/motion-picture.html
index 780d957..33ea139 100644
--- a/www/motion-picture.html
+++ b/www/motion-picture.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -185,7 +185,7 @@
<p>Finally, to set a property:</p>
-<pre class="highlight"><code>convert bluebells.dpx -define dpx:television.time.code=10:00:02:15 bluebells-001.dpx
+<pre class="highlight"><code>magick bluebells.dpx -define dpx:television.time.code=10:00:02:15 bluebells-001.dpx
</code></pre>
<h2><a class="anchor" id="settings"></a>DPX Settings</h2>
@@ -216,12 +216,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:06 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:39 -->
\ No newline at end of file
diff --git a/www/opencl.html b/www/opencl.html
index 492db1b..2f09e45 100644
--- a/www/opencl.html
+++ b/www/opencl.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -133,12 +133,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:14 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/openmp.html b/www/openmp.html
index 290439a..e115dc7 100644
--- a/www/openmp.html
+++ b/www/openmp.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -124,12 +124,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 09:50 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/perl-magick.html b/www/perl-magick.html
index 87bb826..1d38f3f 100644
--- a/www/perl-magick.html
+++ b/www/perl-magick.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -798,7 +798,7 @@
<tr>
<td>Identify</td>
- <td>file=><i>file</i>, features=><i>distance</i>, unique=>{True, False}</td>
+ <td>file=><i>file</i>, features=><i>distance</i>, moments=>{True, False}, unique=>{True, False}</td>
<td>identify the attributes of an image</td>
</tr>
@@ -1328,7 +1328,7 @@
<p>You can optionally add <i>Image</i> to any method name. For example, TrimImage() is an alias for method Trim().</p>
-<p>Most of the attributes listed above have an analog in <a href="convert.html">convert</a>. See the documentation for a more detailed description of these attributes.</p>
+<p>Most of the attributes listed above have an analog in <a href="magick.html">magick</a>. See the documentation for a more detailed description of these attributes.</p>
<h2><a class="anchor" id="set-attribute"></a>Set an Image Attribute</h2>
@@ -1645,6 +1645,12 @@
</tr>
<tr>
+ <td>precision</td>
+ <td><i>integer</i></td>
+ <td>set the maximum number of significant digits to be printed</td>
+ </tr>
+
+ <tr>
<td>quality</td>
<td><i>integer</i></td>
<td>JPEG/MIFF/PNG compression level</td>
@@ -1741,7 +1747,7 @@
<p>SetAttribute() is an alias for method Set().</p>
<p>Most of the attributes listed above have an analog in
-<a href="convert.html">convert</a>. See the documentation for a more detailed description of these attributes.</p>
+<a href="magick.html">magick</a>. See the documentation for a more detailed description of these attributes.</p>
<h2><a class="anchor" id="get-attribute"></a>Get an Image Attribute</h2>
@@ -2013,7 +2019,7 @@
<p>GetAttribute() is an alias for method Get().</p>
<p>Most of the attributes listed above have an analog in
-<a href="convert.html">convert</a>. See the documentation for a more detailed description of these attributes.</p>
+<a href="magick.html">magick</a>. See the documentation for a more detailed description of these attributes.</p>
<h2><a class="anchor" id="compare"></a>Compare an Image to its Reconstruction</h2>
@@ -2594,12 +2600,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:48 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/porting.html b/www/porting.html
index 8ae306f..fbea8bc 100644
--- a/www/porting.html
+++ b/www/porting.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -306,7 +306,7 @@
Rec709Luma
Rec709Luminance</code></pre>
<p>For example,</p>
-<pre class="highlight"><code>convert myImage.png -intensity Rec709Luminance -colorspace gray myImage.jpg</code></pre>
+<pre class="highlight"><code>magick myImage.png -intensity Rec709Luminance -colorspace gray myImage.jpg</code></pre>
<h2><a class="anchor" id="grayscale"></a>Grayscale</h2>
<p>Previously, grayscale images were Rec601Luminance and consumed 4 channels: red, green, blue, and alpha. With version 7, grayscale consumes only 1 channel requiring far less resources as a result.</p>
@@ -316,7 +316,7 @@
<p>In this example, we compute the distortion of a masked reconstructed image:</p>
<pre class="highlight"><code>compare -metric rmse -read-mask hat_mask.png hat.png wizard.png difference.png</code></pre>
<p>Here we protect certain pixels from change:</p>
-<pre class="highlight"><code>convert rose: -write-mask rose_bg_mask.png -modulate 110,100,33.3 +mask rose_blue.png</code></pre>
+<pre class="highlight"><code>magick rose: -write-mask rose_bg_mask.png -modulate 110,100,33.3 +mask rose_blue.png</code></pre>
<p>A mask associated with an image persists until it is modified or removed. This may produce unexpected results for complex command-lines. Here we only want to clip when applying the alpha option, not the resize:</p>
<pre class="highlight">
@@ -407,7 +407,7 @@
channels. Most operators will blend alpha the other color channels, but other
operators (and situations) may require this blending to be disabled, and is
currently done by removing alpha from the active channels via
-<code>-channel</code> option. (e.g. <code>convert castle.gif -channel RGB
+<code>-channel</code> option. (e.g. <code>magick castle.gif -channel RGB
-negate castle.png</code>). </p>
<p>Reading gray-scale images generate an image with only one channel. If
@@ -421,7 +421,7 @@
<dl class="row">
<dt class="col-md-4">magick</dt>
<dd class="col-md-8">The "<code>magick</code>" command is the new primary command of the Shell
- API, replacing the old "<code>convert</code>" command. This allows you to
+ API, replacing the old "<code>magick</code>" command. This allows you to
create a 'magick script' of the form "<code>#!/path/to/command/magick
-script</code>", or pipe options into a command "<code>magick -script
-</code>, as abackground process. </dd>
@@ -436,15 +436,15 @@
a "one argument she-bang bug" that is common on most UNIX systems
(including Linux, but not MacOSX).</dd>
<dt class="col-md-4">animate, compare, composite, conjure, convert, display, identify, import, mogrify, montage, stream</dt>
-<dd class="col-md-8">To reduce the footprint of the command-line utilities, these utilities are symbolic links to the <code>magick</code> utility. You can also invoke them from the <code>magick</code> utility, for example, use <code>magick convert logo: logo.png</code> to invoke the <code>convert</code> utility.
+<dd class="col-md-8">To reduce the footprint of the command-line utilities, these utilities are symbolic links to the <code>magick</code> utility. You can also invoke them from the <code>magick</code> utility, for example, use <code>magick convert logo: logo.png</code> to invoke the <code>magick</code> utility.
</dd></dl>
<h3>Behavioral Changes</h3>
<p>Image settings are applied to each image on the command line. To associate a setting with a particular image, use parenthesis to remove ambiguity. In this example we assign a unique page offset to each image:</p>
-<pre class="highlight"><code>convert \( -page +10+20 first.png \) \( -page +100+200 second.png \) ...</code></pre>
+<pre class="highlight"><code>magick \( -page +10+20 first.png \) \( -page +100+200 second.png \) ...</code></pre>
<p>By default, image operations such as convolution blends alpha with each channel. To convolve each channel independently, deactivate the alpha channel as follows:</p>
-<pre class="highlight"><code>convert ... -alpha discrete -blur 0x1 ...</code></pre>
+<pre class="highlight"><code>magick ... -alpha discrete -blur 0x1 ...</code></pre>
<p>To remove the alpha values from your image, use <code>-alpha off</code>. If you want to instead persist the alpha channel but not blend the alpha pixels for certain image processing operations, use <code>-alpha deactivate</code> instead.</p>
<p>Some options have changed in ImageMagick version 7. These include:</p>
<dl>
@@ -509,9 +509,9 @@
<p>A channel without an operation symbol implies separate (i.e, semicolon).</p>
<p>Here we take an sRGB image and a grayscale image and inject the grayscale image into the alpha channel:</p>
-<pre class="highlight"><code>convert wizard.png mask.pgm -channel-fx '| gray=>alpha' wizard-alpha.png</code></pre>
+<pre class="highlight"><code>magick wizard.png mask.pgm -channel-fx '| gray=>alpha' wizard-alpha.png</code></pre>
<p>Use a similar command to define a read mask:</p>
-<pre class="highlight"><code>convert wizard.png mask.pgm -channel-fx '| gray=>read-mask' wizard-mask.png</code></pre>
+<pre class="highlight"><code>magick wizard.png mask.pgm -channel-fx '| gray=>read-mask' wizard-mask.png</code></pre>
<p>Add <code>-debug pixel</code> prior to the <code>-channel-fx</code> option to track the channel morphology.</p>
@@ -675,12 +675,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:01 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/quantize.html b/www/quantize.html
index a3fd631..56291f1 100644
--- a/www/quantize.html
+++ b/www/quantize.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -191,7 +191,7 @@
<p>The normalized error measurement can be used to compare images. In general, the closer the mean error is to zero the more the quantized image resembles the source image. Ideally, the error should be perceptually-based, since the human eye is the final judge of quantization quality.</p>
-<p>These errors are measured and printed when the <a href="../www/command-line-options.html#colors">-colors</a> and <a href="../www/command-line-options.html#verbose">-verbose</a> options are specified on the <a href="../www/convert.html">convert</a> command line:</p>
+<p>These errors are measured and printed when the <a href="../www/command-line-options.html#colors">-colors</a> and <a href="../www/command-line-options.html#verbose">-verbose</a> options are specified on the <a href="../www/magick.html">magick</a> command line:</p>
<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
@@ -225,12 +225,14 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:34 -->
\ No newline at end of file
diff --git a/www/resources.html b/www/resources.html
index da9e86c..d52a500 100644
--- a/www/resources.html
+++ b/www/resources.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -388,12 +388,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:21 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:42 -->
\ No newline at end of file
diff --git a/www/search.html b/www/search.html
index 21dbccd..bef6fb9 100644
--- a/www/search.html
+++ b/www/search.html
@@ -36,7 +36,7 @@
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,35 +44,35 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/download.html">Download</a>
+ <a class="nav-link" href="download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/resources.html">Resources</a>
+ <a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/develop.html">Develop</a>
+ <a class="nav-link" href="develop.html">Develop</a>
</li>
<li class="nav-item">
- <a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server//">Community</a>
+ <a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
- <script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
+ <script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
@@ -126,17 +126,20 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/security-policy.html">Security</a> •
- <a href="../www/architecture.html">Architecture</a>
+ <p><a href="security-policy.html">Security</a> •
+ <a href="architecture.html">Architecture</a>
<a href="https://imagemagick.org/script/search.php#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/links.html">Related</a> •
- <a href="../www/sitemap.html">Sitemap</a>
+ <a href="links.html">Related</a> •
+ <a href="sitemap.html">Sitemap</a>
<br/>
- <a href="../www/support.html">Donate</a> •
+ <a href="support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
diff --git a/www/security-policy.html b/www/security-policy.html
index c4bcb68..83ea29a 100644
--- a/www/security-policy.html
+++ b/www/security-policy.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -263,12 +263,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:35 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/sitemap.html b/www/sitemap.html
index a03aafb..700ffde 100644
--- a/www/sitemap.html
+++ b/www/sitemap.html
@@ -29,14 +29,14 @@
<meta property='og:site_name' content='ImageMagick' />
<meta property='og:description' content="Convert, Edit, or Compose Bitmap Images" />
<meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4" />
- <link href="../www/www/sitemap.html" rel="canonical" />
- <link href="../www/images/wand.png" rel="icon" />
- <link href="../www/images/wand.ico" rel="shortcut icon" />
- <link href="../www/assets/magick.css" rel="stylesheet" />
+ <link href="../www/sitemap.html" rel="canonical" />
+ <link href="../images/wand.png" rel="icon" />
+ <link href="../images/wand.ico" rel="shortcut icon" />
+ <link href="assets/magick.css" rel="stylesheet" />
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../www/images/wand.ico"/></a>
+ <a class="navbar-brand" href="../index.html"><img class="d-block" id="icon" alt="ImageMagick" width="32" height="32" src="../images/wand.ico"/></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMagick" aria-controls="navbarsMagick" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -44,32 +44,32 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="../www/index.html">Home <span class="sr-only">(current)</span></a>
+ <a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/download.html">Download</a>
+ <a class="nav-link" href="download.html">Download</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-tools.html">Tools</a>
+ <a class="nav-link" href="command-line-tools.html">Tools</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/command-line-processing.html">Command-line</a>
+ <a class="nav-link" href="command-line-processing.html">Command-line</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/resources.html">Resources</a>
+ <a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item ">
- <a class="nav-link" href="../www/www/develop.html">Develop</a>
+ <a class="nav-link" href="develop.html">Develop</a>
</li>
<li class="nav-item">
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
- <form class="form-inline my-2 my-lg-0" action="../www/www/https://imagemagick.org/script/search.php">
+ </div>
+ <form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -89,30 +89,30 @@
<div class="magick-header">
<p class="text-center"><a href="sitemap.html#overview">ImageMagick Overview</a> • <a href="sitemap.html#download">Download ImageMagick</a> • <a href="sitemap.html#install">Install ImageMagick</a> • <a href="sitemap.html#command-line">Command-line Tools</a> • <a href="sitemap.html#program-interfaces">Program Interfaces</a> • <a href="sitemap.html#formats">Image Formats</a> • <a href="sitemap.html#help">Getting Help</a> • <a href="sitemap.html#support">Support ImageMagick</a> • <a href="sitemap.html#miscellaneous">Miscellaneous Topics</a></p>
-<p class="lead magick-description">Use this ImageMagick sitemap to quickly jump to one of the areas of interest listed below. If you can't find what you want on this page, try our <a href="../www/www/https://imagemagick.org/script/search.php">site search</a>.</p>
+<p class="lead magick-description">Use this ImageMagick sitemap to quickly jump to one of the areas of interest listed below. If you can't find what you want on this page, try our <a href="https://imagemagick.org/script/search.php">site search</a>.</p>
<h2><a class="anchor" id="overview"></a>ImageMagick Overview</h2>
<dl class="magick-list-unstyled">
- <li><a href="../www/www/index.html">Introduction</a>: convert, edit, or compose images from the command-line or program interface.</li>
- <li><a href="../www/www/examples.html">Examples of ImageMagick usage</a>: a few examples that show what you can do with an image using ImageMagick.</li>
+ <li><a href="index.html">Introduction</a>: convert, edit, or compose images from the command-line or program interface.</li>
+ <li><a href="examples.html">Examples of ImageMagick usage</a>: a few examples that show what you can do with an image using ImageMagick.</li>
<li><a href="../Usage/">Anthony Thyssen's examples of ImageMagick usage</a>: a comprehensive tutorial of using ImageMagick from the command line.</li>
- <li><a href="../www/www/color.html">Color names</a>: how to specify a color name, a hex color, or a numerical RGB, RGBA, HSL, HSLA, CMYK, or CMYKA color.</li>
- <li><a href="../www/www/color-management.html">Color management</a>: accurate color management with color profiles or in lieu of-- built-in gamma compression or expansion as demanded by the colorspace.</li>
- <li><a href="../www/www/resources.html">Resources</a>: ImageMagick depends on external resources including configuration files, loadable modules, fonts, and environment variables.</li>
- <li><a href="../www/www/openmp.html">Parallel execution</a>: ImageMagick is threaded to take advantage of speed-ups offered by the multicore processor chips.</li>
- <li><a href="../www/www/security-policy.html">Security policy</a>: best practices strongly encourages you to configure a security policy that suits your local environment.</li>
- <li><a href="../www/www/architecture.html">Architecture</a>: get to know more about the software and algorithms behind ImageMagick.</li>
- <li><a href="../www/www/license.html">License</a>: the legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick.</li>
- <li><a href="../www/www/export.html">Export classification</a>: export control status of ImageMagick.</li>
- <li><a href="../www/www/porting.html">ImageMagick version 7</a>: learn how ImageMagick version 7 differs from previous versions.</li>
- <li><a href="../www/www/history.html">History</a>: how ImageMagick was conceived and developed.</li>
+ <li><a href="color.html">Color names</a>: how to specify a color name, a hex color, or a numerical RGB, RGBA, HSL, HSLA, CMYK, or CMYKA color.</li>
+ <li><a href="color-management.html">Color management</a>: accurate color management with color profiles or in lieu of-- built-in gamma compression or expansion as demanded by the colorspace.</li>
+ <li><a href="resources.html">Resources</a>: ImageMagick depends on external resources including configuration files, loadable modules, fonts, and environment variables.</li>
+ <li><a href="openmp.html">Parallel execution</a>: ImageMagick is threaded to take advantage of speed-ups offered by the multicore processor chips.</li>
+ <li><a href="security-policy.html">Security policy</a>: best practices strongly encourages you to configure a security policy that suits your local environment.</li>
+ <li><a href="architecture.html">Architecture</a>: get to know more about the software and algorithms behind ImageMagick.</li>
+ <li><a href="license.html">License</a>: the legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick.</li>
+ <li><a href="export.html">Export classification</a>: export control status of ImageMagick.</li>
+ <li><a href="porting.html">ImageMagick version 7</a>: learn how ImageMagick version 7 differs from previous versions.</li>
+ <li><a href="history.html">History</a>: how ImageMagick was conceived and developed.</li>
</dl>
<h2><a class="anchor" id="download"></a>Download ImageMagick</h2>
<dl class="magick-list-unstyled">
- <li><a href="../www/www/download.html">Download ImageMagick</a>: ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors.</li>
+ <li><a href="download.html">Download ImageMagick</a>: ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors.</li>
<li> <dl class="magick-list-unstyled">
<li><a href="../download">Unix source</a>: Unix source distributions.</li>
<li><a href="https://imagemagick.org/download/windows">Windows source</a>: Windows source distributions.</li>
@@ -127,37 +127,38 @@
<p>You can install ImageMagick from source. However, if you don't have a proper development environment or if you're anxious to get started, download a ready-to-run Unix or Windows executable.</p>
<dl class="magick-list-unstyled">
- <li><a href="../www/www/install-source.html">Install from source</a>: ImageMagick builds under Windows, Mac OS X, and Linux.</li>
- <li><a href="../www/www/download.html">Install from a binary distribution</a>: install a ready-to-run Unix or Windows executable.</li>
- <li><a href="../www/www/ImageMagickObject.html">Install ImageMagickObject COM+ component</a>: install the Windows ImageMagick COM+ component.</li>
+ <li><a href="install-source.html">Install from source</a>: ImageMagick builds under Windows, Mac OS X, and Linux.</li>
+ <li><a href="download.html">Install from a binary distribution</a>: install a ready-to-run Unix or Windows executable.</li>
+ <li><a href="ImageMagickObject.html">Install ImageMagickObject COM+ component</a>: install the Windows ImageMagick COM+ component.</li>
</dl>
<h2><a class="anchor" id="command-line"></a>Command-line Tools</h2>
<dl class="magick-list-unstyled">
- <li><a href="../www/www/command-line-tools.html">Command-line tools</a>: overview of the ImageMagick commands.</li>
+ <li><a href="command-line-tools.html">Command-line tools</a>: overview of the ImageMagick commands.</li>
<li> <dl class="magick-list-unstyled">
- <li><a href="../www/www/animate.html">animate</a>: animates an image sequence on any X server.</li>
- <li><a href="../www/www/compare.html">compare</a>: mathematically and visually annotate the difference between an image and its reconstruction.</li>
- <li><a href="../www/www/composite.html">composite</a>: overlaps one image over another.</li>
- <li><a href="../www/www/conjure.html">conjure</a>: interprets and executes scripts written in the Magick Scripting Language (MSL).</li>
- <li><a href="../www/www/convert.html">convert</a>: convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and more.</li>
- <li><a href="../www/www/display.html">display</a>: displays an image or image sequence on any X server.</li>
- <li><a href="../www/www/identify.html">identify</a>: describes the format and characteristics of one or more image files.</li>
- <li><a href="../www/www/import.html">import</a>: saves any visible window on an X server and outputs it as an image file.</li>
- <li><a href="../www/www/mogrify.html">mogrify</a>: resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and more.</li>
- <li><a href="../www/www/montage.html">montage</a>: create a composite image by combining several separate images.</li>
- <li><a href="../www/www/stream.html">stream</a>: a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats.</li>
+ <li><a href="animate.html">animate</a>: animates an image sequence on any X server.</li>
+ <li><a href="compare.html">compare</a>: mathematically and visually annotate the difference between an image and its reconstruction.</li>
+ <li><a href="composite.html">composite</a>: overlaps one image over another.</li>
+ <li><a href="conjure.html">conjure</a>: interprets and executes scripts written in the Magick Scripting Language (MSL).</li>
+ <li><a href="convert.html">convert</a>: convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and more.</li>
+ <li><a href="display.html">display</a>: displays an image or image sequence on any X server.</li>
+ <li><a href="identify.html">identify</a>: describes the format and characteristics of one or more image files.</li>
+ <li><a href="import.html">import</a>: saves any visible window on an X server and outputs it as an image file.</li>
+ <li><a href="magick.html">magick</a>: convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and more.</li>
+ <li><a href="mogrify.html">mogrify</a>: resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and more.</li>
+ <li><a href="montage.html">montage</a>: create a composite image by combining several separate images.</li>
+ <li><a href="stream.html">stream</a>: a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats.</li>
</dl></li>
- <li><a href="../www/www/command-line-processing.html">Command line processing</a>: the anatomy of the command line.</li>
- <li><a href="../www/www/command-line-options.html">Command line options</a>: annotated list of all options that can appear on the command-line.</li>
- <li><a href="../www/www/fx.html">Fx</a>: apply a mathematical expression to an image or image channels.</li>
+ <li><a href="command-line-processing.html">Command line processing</a>: the anatomy of the command line.</li>
+ <li><a href="command-line-options.html">Command line options</a>: annotated list of all options that can appear on the command-line.</li>
+ <li><a href="fx.html">Fx</a>: apply a mathematical expression to an image or image channels.</li>
<li><a href="http://www.fmwconcepts.com/imagemagick/">Fred's ImageMagick Scripts</a>: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.</li>
</dl>
<h2><a class="anchor" id="program-interfaces"></a>Program Interfaces</h2>
<dl class="magick-list-unstyled">
- <li><a href="../www/www/develop.html">Program interfaces</a>: application programming interfaces.</li>
+ <li><a href="develop.html">Program interfaces</a>: application programming interfaces.</li>
<li> <dl class="magick-list-unstyled">
<li><a href="../ChMagick">ChMagick</a>: is a <a href="http://www.softintegration.com/">Ch</a> an embeddable MagickCore C/C++ interpreter for cross-platform scripting.</li>
<li><a href="http://common-lisp.net/project/cl-magick/">CL-Magick</a>: provides a Common Lisp interface to the ImageMagick library.</li>
@@ -165,12 +166,12 @@
<li><a href="../Magick++">Magick++</a>: provides an object-oriented C++ interface to ImageMagick.</li>
<li><a href="http://pecl.html.net/package/imagick">IMagick</a>: is a native PHP extension to create and modify images using the ImageMagick API.</li>
<li><a href="https://github.com/techblue/jmagick">JMagick</a>: provides an object-oriented Java interface to ImageMagick.</li>
- <li><a href="../www/www/magick-core.html">MagickCore</a>: C API, recommended for wizard-level developers.</li>
- <li><a href="../www/www/magick-wand.html">MagickWand</a>: convert, compose, and edit images from the C language.</li>
+ <li><a href="magick-core.html">MagickCore</a>: C API, recommended for wizard-level developers.</li>
+ <li><a href="magick-wand.html">MagickWand</a>: convert, compose, and edit images from the C language.</li>
<li><a href="http://www.magickwand.org/">MagickWand for PHP</a>: a native PHP-extension to the ImageMagick MagickWand API.</li>
<li><a href="http://code.google.com/p/nmagick">nMagick</a>: is a port of the ImageMagick library to the haXe and Neko platforms.</li>
<li><a href="http://wiki.freepascal.org/PascalMagick">PascalMagick</a>: a Pascal binding for the MagickWand API and also the low-level MagickCore library.</li>
- <li><a href="../www/www/perl-magick.html">PerlMagick</a>: convert, compose, and edit images from the Perl language.</li>
+ <li><a href="perl-magick.html">PerlMagick</a>: convert, compose, and edit images from the Perl language.</li>
<li><a href="https://imagemagick.org/download/python/">PythonMagick</a>: an object-oriented Python interface to ImageMagick.</li>
<li><a href="http://rmagick.rubyforge.org/">RMagick</a>: is an interface between the Ruby programming language and ImageMagick.</li>
<li><a href="http://tclmagick.sourceforge.net/">TclMagick</a>: a native Tcl-extension to the ImageMagick MagickWand API.</li>
@@ -179,11 +180,11 @@
<h2><a class="anchor" id="format"></a>Image Formats</h2>
<dl class="magick-list-unstyled">
- <li><a href="../www/www/formats.html">Supported image formats</a>: annotated list of all image formats that ImageMagick can read and/or write.</li>
- <li><a href="../www/www/motion-picture.html">Motion picture digital images</a>: use SMPTE DPX Version 2.0 to process images used by the motion picture (film and high-definition) industry.</li>
- <li><a href="../www/www/high-dynamic-range.html">High dynamic-range images</a>: accurately represent the wide range of intensity levels found in real scenes ranging from the brightest direct sunlight to the deepest darkest shadows.</li>
- <li><a href="../www/www/magick-vector-graphics.html">Magick Vector Graphics</a>: a modularized language for describing two-dimensional vector and mixed vector/raster graphics in ImageMagick.</li>
- <li><a href="../www/www/miff.html">Magick Image File Format</a>: MIFF is ImageMagick's own platform-independent format for storing bitmap images.</li>
+ <li><a href="formats.html">Supported image formats</a>: annotated list of all image formats that ImageMagick can read and/or write.</li>
+ <li><a href="motion-picture.html">Motion picture digital images</a>: use SMPTE DPX Version 2.0 to process images used by the motion picture (film and high-definition) industry.</li>
+ <li><a href="high-dynamic-range.html">High dynamic-range images</a>: accurately represent the wide range of intensity levels found in real scenes ranging from the brightest direct sunlight to the deepest darkest shadows.</li>
+ <li><a href="magick-vector-graphics.html">Magick Vector Graphics</a>: a modularized language for describing two-dimensional vector and mixed vector/raster graphics in ImageMagick.</li>
+ <li><a href="miff.html">Magick Image File Format</a>: MIFF is ImageMagick's own platform-independent format for storing bitmap images.</li>
</dl>
<h2><a class="anchor" id="help"></a>Getting Help</h2>
@@ -192,14 +193,14 @@
<li><a href="http://www.amazon.com/exec/obidos/redirect?link_code=ur2&camp=1789&tag=imagemagick-20&creative=9325&path=tg/detail/-/1590595904/qid=1123551819/sr=8-1/ref=pd_bbs_sbs_1?v=glance%26s=books%26n=507846">Definitive Guide to ImageMagick</a>: this book explains ImageMagick in a practical, learn-by-example fashion.</li>
<li><a href="http://www.amazon.com/exec/obidos/redirect?link_code=ur2&camp=1789&tag=imagemagick-20&creative=9325&path=tg/detail/-/1904811868/qid=1123551819/sr=8-1/ref=pd_bbs_sbs_1?v=glance%26s=books%26n=507846">ImageMagick Tricks</a>: this book is packed with examples of photo manipulations, logo creation, animations, and complete web projects.</li>
<li><a href="https://imagemagick.org/discourse-server/">Discourse server</a>: get help from fellow ImageMagick users and developers, post to these forums.</li>
- <li><a href="../www/www/https://imagemagick.org/script/contact.php">Contact the Wizards</a>: for bug reports (only if you do not want to sign up to the <a href="https://imagemagick.org/discourse-server/">discourse server</a>), a source or documentation patch, a security or license issue, or if you want to be a sponsor of the ImageMagick project.</li>
+ <li><a href="https://imagemagick.org/script/contact.php">Contact the Wizards</a>: for bug reports (only if you do not want to sign up to the <a href="https://imagemagick.org/discourse-server/">discourse server</a>), a source or documentation patch, a security or license issue, or if you want to be a sponsor of the ImageMagick project.</li>
</dl>
<h2><a class="anchor" id="support"></a>Support ImageMagick</h2>
<dl class="magick-list-unstyled">
- <li><a href="https://imagemagick.org/discourse-server//viewforum.html?f=3">Report bugs and vulnerabilities</a>: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can <a href="../www/www/https://imagemagick.org/script/contact.php">contact the ImageMagick developers</a> with a convenient web form.</li>
- <li><a href="../www/www/support.html">Sponsor ImageMagick</a>: contribute bug fixes, enhancements, hardware, funds, etc. to ensure the ImageMagick project thrives.</li>
+ <li><a href="https://imagemagick.org/discourse-server//viewforum.html?f=3">Report bugs and vulnerabilities</a>: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can <a href="https://imagemagick.org/script/contact.php">contact the ImageMagick developers</a> with a convenient web form.</li>
+ <li><a href="support.html">Sponsor ImageMagick</a>: contribute bug fixes, enhancements, hardware, funds, etc. to ensure the ImageMagick project thrives.</li>
</dl>
<h2><a class="anchor" id="miscellaneous"></a>Miscellaneous Topics</h2>
@@ -207,41 +208,41 @@
<dl class="magick-list-unstyled">
<li><a href="../Usage/anim_basics/">Animation</a>: create a GIF animation sequence from a group of images.</li>
<li><a href="https://imagemagick.org/discourse-server//viewtopic.html?f=4&t=25405">Canny edge detection</a>: extract edges from an image using the Canny technique.</li>
- <li><a href="../www/www/color-management.html">Color management</a>: accurate color management with color profiles or in lieu of-- built-in gamma compression or expansion as demanded by the colorspace.</li>
- <li><a href="../www/www/command-line-processing.html">Command-line processing</a>: utilize ImageMagick from the command line.</li>
- <li><a href="../www/www/composite.html">Composite</a>: overlap one image over another.</li>
- <li><a href="../www/www/connected-components.html">Connected component labeling</a>: uniquely label connected regions in an image.</li>
+ <li><a href="color-management.html">Color management</a>: accurate color management with color profiles or in lieu of-- built-in gamma compression or expansion as demanded by the colorspace.</li>
+ <li><a href="command-line-processing.html">Command-line processing</a>: utilize ImageMagick from the command line.</li>
+ <li><a href="composite.html">Composite</a>: overlap one image over another.</li>
+ <li><a href="connected-components.html">Connected component labeling</a>: uniquely label connected regions in an image.</li>
<li><a href="../Usage/crop/">Decorate</a>: add a border or frame to an image.</li>
<li><a href="../Usage/fourier">Discrete Fourier transform</a>: implements the forward and inverse DFT.</li>
- <li><a href="../www/www/distribute-pixel-cache.html">Distributed pixel cache</a>: offload intermediate pixel storage to one or more remote servers .</li>
+ <li><a href="distribute-pixel-cache.html">Distributed pixel cache</a>: offload intermediate pixel storage to one or more remote servers .</li>
<li><a href="../Usage/draw/">Draw</a>: add shapes or text to an image.</li>
- <li><a href="../www/www/cipher.html">Encipher or decipher an image</a>: convert ordinary images into unintelddgible gibberish and back again.</li>
- <li><a href="../www/www/escape.html">Escapes</a>: utilize percent escapes in a number of options, for example in <a href="../www/www/command-line-options.html#format_identify_"
- >-format</a> or in montage <a href="../www/www/command-line-options.html#label"
+ <li><a href="cipher.html">Encipher or decipher an image</a>: convert ordinary images into unintelddgible gibberish and back again.</li>
+ <li><a href="escape.html">Escapes</a>: utilize percent escapes in a number of options, for example in <a href="command-line-options.html#format_identify_"
+ >-format</a> or in montage <a href="command-line-options.html#label"
>-label</a>, to print various properties and other settings associated with an
image.</li>
- <li><a href="../www/www/convert.html">Format conversion</a>: convert an image from one <a href="../www/www/formats.html">format </a> to another (e.g. PNG to JPEG).</li>
+ <li><a href="convert.html">Format conversion</a>: convert an image from one <a href="formats.html">format </a> to another (e.g. PNG to JPEG).</li>
<li><a href="../Usage/distorts/">Generalized pixel distortion</a>: correct for, or induce image distortions including perspective.</li>
- <li><a href="../www/www/architecture.html#distributed">Heterogeneous distributed processing</a>: <a href="../www/www/opencl.html">certain algorithms</a> are <a href="http://en.wikipedia.org/wiki/OpenCL" target="_blank">OpenCL</a>-enabled to take advantage of speed-ups offered by executing in concert across heterogeneous platforms consisting of CPUs, GPUs, and other processors.</li>
- <li><a href="../www/www/high-dynamic-range.html">High dynamic-range images</a>: accurately represent the wide range of intensity levels found in real scenes ranging from the brightest direct sunlight to the deepest darkest shadows.</li>
- <li><a href="../www/www/clahe.html">Histogram equalization</a>: adaptive histogram equalization can improve contrast in an image.</li>
+ <li><a href="architecture.html#distributed">Heterogeneous distributed processing</a>: <a href="opencl.html">certain algorithms</a> are <a href="http://en.wikipedia.org/wiki/OpenCL" target="_blank">OpenCL</a>-enabled to take advantage of speed-ups offered by executing in concert across heterogeneous platforms consisting of CPUs, GPUs, and other processors.</li>
+ <li><a href="high-dynamic-range.html">High dynamic-range images</a>: accurately represent the wide range of intensity levels found in real scenes ranging from the brightest direct sunlight to the deepest darkest shadows.</li>
+ <li><a href="clahe.html">Histogram equalization</a>: adaptive histogram equalization can improve contrast in an image.</li>
<li><a href="https://imagemagick.org/discourse-server//viewtopic.html?f=4&t=25476">Hough lines</a>: fit straight lines to edges in an image using the Hough transform technique.</li>
- <li><a href="../www/www/fx.html">Image calculator</a>: apply a mathematical expression to an image or image channels.</li>
- <li><a href="../www/www/gradient.html">Image gradients</a>: create a gradual blend of two colors whose shape is horizontal, vertical, circular, or elliptical.</li>
- <li><a href="../www/www/identify.html">Image identification</a>: describe the format and attributes of an image.</li>
- <li><a href="../www/www/download.html#iOS">ImageMagick on the iPhone</a>: convert, edit, or compose images on your iPhone.</li>
+ <li><a href="fx.html">Image calculator</a>: apply a mathematical expression to an image or image channels.</li>
+ <li><a href="gradient.html">Image gradients</a>: create a gradual blend of two colors whose shape is horizontal, vertical, circular, or elliptical.</li>
+ <li><a href="identify.html">Image identification</a>: describe the format and attributes of an image.</li>
+ <li><a href="download.html#iOS">ImageMagick on the iPhone</a>: convert, edit, or compose images on your iPhone.</li>
<li><a href="https://imagemagick.org/discourse-server//viewtopic.html?f=4&t=26480">Kuwahara filter</a>: apply an edge perserving noise and color reduction filter to an image.</li>
- <li><a href="../www/www/architecture.html#tera-pixel">Large image support</a>: read, process, or write mega-, giga-, or tera-pixel image sizes.</li>
+ <li><a href="architecture.html#tera-pixel">Large image support</a>: read, process, or write mega-, giga-, or tera-pixel image sizes.</li>
<li><a href="https://imagemagick.org/discourse-server//viewtopic.html?f=4&t=25504">Mean-shift</a>: apply a color reduction technique to an image.</li>
- <li><a href="../www/www/montage.html">Montage</a>: juxtapose image thumbnails on an image canvas.</li>
+ <li><a href="montage.html">Montage</a>: juxtapose image thumbnails on an image canvas.</li>
<li><a href="../Usage/morphology/">Morphology of shapes</a>: extract features, describe shapes and recognize patterns in images.</li>
- <li><a href="../www/www/motion-picture.html">Motion picture support</a>: read and write the common image formats used in digital film work.</li>
+ <li><a href="motion-picture.html">Motion picture support</a>: read and write the common image formats used in digital film work.</li>
<li><a href="../Usage/blur/">Special effects</a>: blur, sharpen, threshold, or tint an image.</li>
<li><a href="../Usage/text/">Text & comments</a>: insert descriptive or artistic text in an image.</li>
- <li><a href="../www/www/architecture.html#threads">Threads of execution support</a>: ImageMagick is thread safe and most internal algorithms execute in parallel to take advantage of speed-ups offered by multicore processor chips.</li>
+ <li><a href="architecture.html#threads">Threads of execution support</a>: ImageMagick is thread safe and most internal algorithms execute in parallel to take advantage of speed-ups offered by multicore processor chips.</li>
<li><a href="../Usage/resize/">Transform</a>: resize, rotate, crop, or trim an image.</li>
<li><a href="../Usage/masking/">Transparency</a>: render portions of an image invisible.</li>
- <li><a href="../www/www/architecture.html#virtual-pixels">Virtual pixel support</a>: convenient access to pixels outside the image region.</li>
+ <li><a href="architecture.html#virtual-pixels">Virtual pixel support</a>: convenient access to pixels outside the image region.</li>
</dl>
<h2><a class="anchor" id="legacy"></a>ImageMagick Legacy</h2>
<p>We continue to maintain the legacy release of ImageMagick, version 6, at <a href="https://legacy.imagemagick.org/">https://legacy.imagemagick.org</a></p>
@@ -250,24 +251,27 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="../www/www/security-policy.html">Security</a> •
- <a href="../www/www/architecture.html">Architecture</a>
+ <p><a href="security-policy.html">Security</a> •
+ <a href="architecture.html">Architecture</a>
- <a href="sitemap.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../www/images/wand.ico"/></a>
+ <a href="sitemap.html#"><img class="d-inline" id="wand" alt="And Now a Touch of Magick" width="16" height="16" src="../images/wand.ico"/></a>
- <a href="../www/www/links.html">Related</a> •
- <a href="../www/www/sitemap.html">Sitemap</a>
+ <a href="links.html">Related</a> •
+ <a href="sitemap.html">Sitemap</a>
<br/>
- <a href="../www/www/support.html">Donate</a> •
+ <a href="support.html">Donate</a> •
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="../www/www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
<br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="../www/assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script src="assets/magick.js" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 12:06 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/stream.html b/www/stream.html
index ff50906..dda7cbb 100644
--- a/www/stream.html
+++ b/www/stream.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -295,12 +295,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 10:31 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/support.html b/www/support.html
index 7425ba3..8979607 100644
--- a/www/support.html
+++ b/www/support.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -97,9 +97,6 @@
<dl>
<dt class="col-md-12"><a href="http://www.networkredux.com"> <img class="clearfix" src="../images/networkredux.png" width="140" height="31" alt="[Network Redux]" /></a> We manage everything so you don't have to</dt><br/>
<dt class="col-md-12"><a href="http://www.amd.com"> <img class="clearfix" src="../images/amd.png" width="132" height="31" alt="[AMD]" /></a> Enabling today. Inspiring tomorrow.</dt><br/>
-<!-- Expires 20200101 -->
- <dt class="col-md-12"><a href="http://www.transloadit.com"> <img class="clearfix" src="../images/transloadit.png" width="205" height="52" alt="[TransloadIt]" /></a> The world's most versatile file uploading and processing service</dt><br/>
-<!-- -->
<dt class="col-md-12"><a href="http://cloudinary.com"> <img class="clearfix" src="../images/cloudinary.png" width="344" height="76" alt="[Image And Video Management In The Cloud]" /></a> Image And Video Management In The Cloud.</dt><br/>
<dt class="col-md-12"><a href="https://www.leaderssl.com"> <img class="clearfix" src="../images/leaderssl.png" width="162" height="42" alt="[LeaderSSL]" /></a> We enable secure connections for websites.</dt><br/>
</dl>
@@ -176,12 +173,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:50 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:43 -->
\ No newline at end of file
diff --git a/www/webp.html b/www/webp.html
index 9934219..6950801 100644
--- a/www/webp.html
+++ b/www/webp.html
@@ -65,11 +65,11 @@
<a class="nav-link" target="_blank" href="https://imagemagick.org/discourse-server/">Community</a>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="http://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
@@ -96,7 +96,7 @@
<p>Use this command:</p>
-<pre class="highlight"><code>convert wizard.png -quality 50 -define webp:lossless=true wizard.webp
+<pre class="highlight"><code>magick wizard.png -quality 50 -define webp:lossless=true wizard.webp
</code></pre>
<p>Here is a complete list of WebP encoding options:</p>
@@ -211,12 +211,15 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
+ <a href="https://github.com/imagemagick/imagemagick" target="_blank" rel="noopener" aria-label="GitHub"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 499.36" width="2%" height="2%" role="img" focusable="false"><title>GitHub</title><path fill="currentColor" fill-rule="evenodd" d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z"/></svg></a> •
+ <a href="https://twitter.com/imagemagick" target="_blank" rel="noopener" aria-label="Twitter"><svg xmlns="http://www.w3.org/2000/svg" class="navbar-nav-svg" viewBox="0 0 512 416.32" width="2%" height="2%" role="img" focusable="false"><title>Twitter</title><path fill="currentColor" d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92"/></svg></a>
+ <br/>
<small>© 1999-2020 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
<script src="assets/magick.js" crossorigin="anonymous"></script>
- <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.4.1/jquery.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 5th January 2020 11:13 -->
\ No newline at end of file
+<!-- Magick Cache 21st February 2020 08:39 -->
\ No newline at end of file
