Upgrade ImageMagick to c2d7e6a57d4c74a4a1424db63ba98228abe3e078
Test: None
Change-Id: I4b82259cf9309d5df15b3d7518ddb6650126a61f
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
new file mode 100644
index 0000000..81d3792
--- /dev/null
+++ b/.github/workflows/daily.yml
@@ -0,0 +1,101 @@
+on:
+ schedule:
+ - cron: 0 6 * * *
+
+name: daily
+jobs:
+ build_linux:
+ name: 'Linux Q${{matrix.quantum}}-x64 hdri=${{matrix.hdri}} (${{matrix.modules}})'
+ container:
+ image: ubuntu:bionic
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ quantum: [ 8, 16, 32, 64 ]
+ hdri: [ yes, no ]
+ modules: [ 'with-modules', 'without-modules' ]
+ exclude:
+ - quantum: 8
+ hdri: yes
+ - quantum: 32
+ hdri: no
+ - quantum: 64
+ hdri: no
+
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 1
+
+ - name: Install dependencies
+ run: |
+ apt update
+ sh -c "echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections"
+ apt-get install -y autoconf pkg-config gcc msttcorefonts libfontconfig1-dev libfreetype6-dev libltdl-dev
+ - name: Configure ImageMagick
+ run: |
+ export CFLAGS="-Wno-deprecated-declarations"
+ ./configure --with-quantum-depth=${{matrix.quantum}} --enable-hdri=${{matrix.hdri}} --${{matrix.modules}}
+
+ - name: Build ImageMagick
+ run: |
+ make
+ - name: Test ImageMagick
+ run: |
+ make check || exit_code=$?
+ if [ "$exit_code" != "0" ] ; then cat ./test-suite.log ; fi
+ exit $exit_code
+
+ build_windows:
+ name: 'Windows Q${{matrix.quantum}}-${{matrix.platform}} hdri=${{matrix.hdri}} (${{matrix.buildType}})'
+ runs-on: windows-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ quantum: [ 8, 16, 32, 64 ]
+ hdri: [ yes, no ]
+ buildType: [ dmt, smtd ]
+ platform: [ x64, Win32 ]
+ exclude:
+ - quantum: 8
+ hdri: yes
+ - quantum: 32
+ hdri: no
+ - quantum: 64
+ hdri: no
+
+ steps:
+ - name: Clone ImageMagick-Windows
+ uses: actions/checkout@master
+ with:
+ fetch-depth: 1
+ repository: ImageMagick/ImageMagick-Windows
+ ref: remotes/origin/master
+
+ - name: Clone repositories
+ run: |
+ cd %RUNNER_WORKSPACE%\ImageMagick-Windows
+ CloneRepositories.cmd https://github.com/ImageMagick shallow
+
+ - name: Build configure
+ run: |
+ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
+ cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure
+ devenv /upgrade configure.vcxproj
+ msbuild configure.sln /m /t:Rebuild /p:Configuration=Release,Platform=Win32
+
+ - name: Configure ImageMagick
+ run: |
+ cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure
+ configure.exe /noWizard /VS2019 /${{matrix.platform}} /${{matrix.buildType}}
+
+ - name: Build ImageMagick
+ run: |
+ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
+ cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick
+ dir /B *.sln > solution
+ set /p solution=<solution
+ msbuild %solution% /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.platform}}
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
new file mode 100644
index 0000000..c06f9f8
--- /dev/null
+++ b/.github/workflows/master.yml
@@ -0,0 +1,105 @@
+on:
+ push:
+ branches:
+ - master
+ tags:
+ - '!*'
+ pull_request:
+ branches:
+ - master
+
+name: master
+jobs:
+ build_linux:
+ name: Build Linux
+ container:
+ image: ubuntu:bionic
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: true
+ matrix:
+ compiler: [ gcc, clang ]
+
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 1
+
+ - name: Install dependencies
+ run: |
+ set -e
+ apt-get update -y
+ apt-get install -y autoconf pkg-config ${{matrix.compiler}}
+
+ - name: Configure ImageMagick
+ run: |
+ export CC=${{matrix.compiler}}
+ export CFLAGS="-Wno-deprecated-declarations"
+ ./configure --with-quantum-depth=16 --enable-hdri=no --without-perl --prefix=/usr
+
+ - name: Build ImageMagick
+ run: |
+ set -e
+ make
+ make install
+
+ build_macos:
+ name: Build MacOS
+ runs-on: macos-latest
+
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 1
+
+ - name: Install dependencies
+ run: |
+ set -e
+ export HOMEBREW_NO_AUTO_UPDATE=1
+ brew install autoconf libtool pkg-config libxml2
+
+ - name: Configure ImageMagick
+ run: |
+ export CFLAGS="-Wno-deprecated-declarations"
+ export PKG_CONFIG_PATH="/usr/local/opt/libxml2/lib/pkgconfig"
+ ./configure --with-quantum-depth=16 --enable-hdri=no --without-perl
+
+ - name: Build ImageMagick
+ run: |
+ set -e
+ make install
+
+ build_windows:
+ name: Build Windows
+ runs-on: windows-latest
+
+ steps:
+ - uses: actions/checkout@master
+ with:
+ repository: ImageMagick/ImageMagick-Windows
+ ref: refs/heads/master
+ fetchDepth: 1
+
+ - name: Clone repositories
+ run: |
+ cd %RUNNER_WORKSPACE%\ImageMagick-Windows
+ CloneRepositories.cmd https://github.com/ImageMagick shallow
+
+ - name: Build configure
+ run: |
+ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
+ cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure
+ devenv /upgrade configure.vcxproj
+ msbuild configure.sln /m /t:Rebuild /p:Configuration=Release,Platform=Win32
+
+ - name: Configure ImageMagick
+ run: |
+ cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure
+ configure.exe /noWizard /VS2019 /x64 /smtd
+
+ - name: Build ImageMagick
+ run: |
+ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
+ cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick
+ msbuild VisualStaticMTD.sln /m /t:Rebuild /p:Configuration=Release,Platform=x64
diff --git a/ChangeLog b/ChangeLog
index 6d824ce..c8419b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,42 @@
-2019-08-07 7.0.8-60 Cristy <quetzlzacatenango@image...>
- * Release ImageMagick version 7.0.8-60, GIT revision 15986:c3de0e7:20190804.
+2019-09-02 7.0.8-64 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.8-64, GIT revision 16...
+
+2019-09-02 7.0.8-64 Cristy <quetzlzacatenango@image...>
+ * Support XPM symbolic (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1684).
+ * DilateIntensity is channel independent (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36641).
+
+2019-08-31 7.0.8-63 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.8-63, GIT revision 16088:3b7a33d:20190831.
+
+2019-08-24 7.0.8-63 Cristy <quetzlzacatenango@image...>
+ * Properly identify the DNG and AI image format (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36581).
+
+2019-08-23 7.0.8-62 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.8-62, GIT revision 16061:7525595:20190823.
+
+2019-08-23 7.0.8-62 Dirk Lemstra <dirk@lem.....org>
+ * Added option to limit the maximum point size with -define
+ caption:max-pointsize=pointsize.
+ * Corrected JP2 numresolution calculation (reference:
+ https://github.com/ImageMagick/ImageMagick/issues/1673)
+
+2019-08-19 7.0.8-62 Cristy <quetzlzacatenango@image...>
+ * Conditionally compile call to AcquireCLocale() (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1669).
+ * More robust support for converting bitmap to vector.
+
+2019-08-16 7.0.8-61 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.8-61, GIT revision 16033:0c5808c:20190816.
+
+2019-08-03 7.0.8-61 Cristy <quetzlzacatenango@image...>
+ * Issue with -background and -swirl (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36512).
+
+2019-08-10 7.0.8-60 Cristy <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.8-60, GIT revision 16020:52ff205:20190810.
2019-08-07 7.0.8-60 Cristy <quetzlzacatenango@image...>
* Enable reading EXR image file from stdin.
diff --git a/METADATA b/METADATA
index b385b81..fd48a04 100644
--- a/METADATA
+++ b/METADATA
@@ -9,10 +9,10 @@
type: GIT
value: "https://github.com/ImageMagick/ImageMagick.git"
}
- version: "271623e1de659fddd7b8c66491b0ec9ddfa22ddd"
+ version: "c2d7e6a57d4c74a4a1424db63ba98228abe3e078"
last_upgrade_date {
year: 2019
- month: 8
- day: 7
+ month: 9
+ day: 6
}
}
diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 6bf79af..abec2c4 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -504,6 +504,8 @@
using MagickCore::B44ACompression;
using MagickCore::B44Compression;
using MagickCore::BZipCompression;
+ using MagickCore::DWAACompression;
+ using MagickCore::DWABCompression;
using MagickCore::DXT1Compression;
using MagickCore::DXT3Compression;
using MagickCore::DXT5Compression;
diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index a5f7ba0..ff388d3 100644
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -652,6 +652,11 @@
blurColumnKernel=NULL;
outputReady=MagickFalse;
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickCoreSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
device=RequestOpenCLDevice(clEnv);
queue=AcquireOpenCLCommandQueue(device);
filteredImage=cloneImage(image,exception);
@@ -784,6 +789,8 @@
assert(image != NULL);
assert(exception != (ExceptionInfo *) NULL);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (checkAccelerateCondition(image) == MagickFalse)
return((Image *) NULL);
@@ -837,6 +844,11 @@
gsize[2],
i;
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickCoreSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
contrastKernel=NULL;
imageBuffer=NULL;
outputReady=MagickFalse;
@@ -900,6 +912,8 @@
assert(image != NULL);
assert(exception != (ExceptionInfo *) NULL);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (checkAccelerateCondition(image) == MagickFalse)
return(MagickFalse);
@@ -988,6 +1002,11 @@
*hostPtr,
*inputPixels;
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickCoreSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
histogram=NULL;
stretch_map=NULL;
inputPixels = NULL;
@@ -999,12 +1018,6 @@
queue = NULL;
outputReady = MagickFalse;
-
- assert(image != (Image *) NULL);
- assert(image->signature == MagickCoreSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-
/* exception=(&image->exception); */
/*
@@ -1462,6 +1475,8 @@
assert(image != NULL);
assert(exception != (ExceptionInfo *) NULL);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((checkAccelerateConditionRGBA(image) == MagickFalse) ||
(checkHistogramCondition(image,image->intensity) == MagickFalse))
@@ -2308,6 +2323,11 @@
*hostPtr,
*inputPixels;
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickCoreSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
map=NULL;
histogram=NULL;
equalize_map=NULL;
@@ -2320,11 +2340,6 @@
queue = NULL;
outputReady = MagickFalse;
- assert(image != (Image *) NULL);
- assert(image->signature == MagickCoreSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-
/*
* initialize opencl env
*/
@@ -2669,6 +2684,8 @@
assert(image != NULL);
assert(exception != (ExceptionInfo *) NULL);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((checkAccelerateConditionRGBA(image) == MagickFalse) ||
(checkHistogramCondition(image,image->intensity) == MagickFalse))
@@ -2728,8 +2745,12 @@
gsize[2],
i;
- outputReady=MagickFalse;
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickCoreSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ outputReady=MagickFalse;
imageBuffer=NULL;
functionKernel=NULL;
parametersBuffer=NULL;
@@ -2815,6 +2836,8 @@
assert(image != NULL);
assert(exception != (ExceptionInfo *) NULL);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (checkAccelerateCondition(image) == MagickFalse)
return(MagickFalse);
@@ -2870,12 +2893,15 @@
gsize[2],
i;
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickCoreSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
outputReady=MagickFalse;
imageBuffer=NULL;
grayscaleKernel=NULL;
- assert(image != (Image *) NULL);
- assert(image->signature == MagickCoreSignature);
device=RequestOpenCLDevice(clEnv);
queue=AcquireOpenCLCommandQueue(device);
imageBuffer=GetAuthenticOpenCLBuffer(image,device,exception);
@@ -2937,6 +2963,8 @@
assert(image != NULL);
assert(exception != (ExceptionInfo *) NULL);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((checkAccelerateCondition(image) == MagickFalse) ||
(checkPixelIntensity(image,method) == MagickFalse))
@@ -3368,15 +3396,15 @@
void
*inputPixels;
- inputPixels = NULL;
- imageBuffer = NULL;
- modulateKernel = NULL;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ inputPixels = NULL;
+ imageBuffer = NULL;
+ modulateKernel = NULL;
+
/*
* initialize opencl env
*/
@@ -3504,6 +3532,8 @@
assert(image != NULL);
assert(exception != (ExceptionInfo *) NULL);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (checkAccelerateConditionRGBA(image) == MagickFalse)
return(MagickFalse);
@@ -3602,6 +3632,11 @@
*filteredPixels,
*hostPtr;
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickCoreSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
outputReady = MagickFalse;
filteredImage = NULL;
filteredImage_view = NULL;
@@ -3616,7 +3651,8 @@
/* Create and initialize OpenCL buffers. */
image_view=AcquireAuthenticCacheView(image,exception);
- inputPixels=GetCacheViewAuthenticPixels(image_view,0,0,image->columns,image->rows,exception);
+ inputPixels=GetCacheViewAuthenticPixels(image_view,0,0,image->columns,
+ image->rows,exception);
if (inputPixels == (const void *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),CacheError,
@@ -4535,6 +4571,11 @@
gsize[2],
i;
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickCoreSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
filteredImage=NULL;
imageBuffer=NULL;
filteredImageBuffer=NULL;
@@ -4659,6 +4700,8 @@
assert(image != NULL);
assert(exception != (ExceptionInfo *) NULL);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (checkAccelerateCondition(image) == MagickFalse)
return((Image *) NULL);
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 30ee6bc..bf46879 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -1750,7 +1750,8 @@
/*
Ensure the image matches the pixel cache morphology.
*/
- image->type=UndefinedType;
+ if (image->type != UndefinedType)
+ image->type=UndefinedType;
if (ValidatePixelCacheMorphology(image) == MagickFalse)
{
status=OpenPixelCache(image,IOMode,exception);
@@ -5342,7 +5343,8 @@
}
if (nexus_info->authentic_pixel_cache != MagickFalse)
{
- image->taint=MagickTrue;
+ if (image->taint == MagickFalse)
+ image->taint=MagickTrue;
return(MagickTrue);
}
assert(cache_info->signature == MagickCoreSignature);
@@ -5350,7 +5352,7 @@
if ((cache_info->metacontent_extent != 0) &&
(WritePixelCacheMetacontent(cache_info,nexus_info,exception) == MagickFalse))
return(MagickFalse);
- if (status != MagickFalse)
+ if ((status != MagickFalse) && (image->taint == MagickFalse))
image->taint=MagickTrue;
return(status);
}
diff --git a/MagickCore/color.c b/MagickCore/color.c
index d113a63..a2c5de6 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -2466,7 +2466,8 @@
color->blue=(MagickRealType) ClampToQuantum((MagickRealType)
(scale*geometry_info.xi+(QuantumRange+1)/2.0));
}
- if (LocaleCompare(colorspace,"gray") == 0)
+ if ((LocaleCompare(colorspace,"gray") == 0) ||
+ (LocaleCompare(colorspace,"lineargray") == 0))
{
color->green=color->red;
color->blue=color->red;
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index f53b7be..e659666 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1157,7 +1157,10 @@
if (IsGrayColorspace(colorspace) != MagickFalse)
{
if (colorspace == LinearGRAYColorspace)
- image->gamma=1.000;
+ {
+ image->gamma=1.000;
+ image->intensity=Rec709LuminancePixelIntensityMethod;
+ }
type=GrayscaleType;
}
else
diff --git a/MagickCore/compress.h b/MagickCore/compress.h
index 61ea8e6..c093952 100644
--- a/MagickCore/compress.h
+++ b/MagickCore/compress.h
@@ -47,7 +47,9 @@
ZipCompression,
ZipSCompression,
ZstdCompression,
- WebPCompression
+ WebPCompression,
+ DWAACompression,
+ DWABCompression
} CompressionType;
typedef struct _Ascii85Info
diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index 9456536..4cff21f 100644
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -143,6 +143,9 @@
register ssize_t
i;
+ size_t
+ length;
+
/*
Allocate image structure.
*/
@@ -154,7 +157,8 @@
image=AcquireImage((ImageInfo *) NULL,exception);
if (image == (Image *) NULL)
return((Image *) NULL);
- for (i=0; i < (ssize_t) strlen(map); i++)
+ length=strlen(map);
+ for (i=0; i < (ssize_t) length; i++)
{
switch (map[i])
{
@@ -186,7 +190,7 @@
}
default:
{
- if (strlen(map) == 1)
+ if (length == 1)
image->colorspace=GRAYColorspace;
break;
}
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index c615a18..3bea06d 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1841,6 +1841,8 @@
dash_polygon[0].coordinates=(size_t) j;
dash_polygon[j].primitive=UndefinedPrimitive;
status&=DrawStrokePolygon(image,clone_info,dash_polygon,exception);
+ if (status == MagickFalse)
+ break;
}
if (fabs(draw_info->dash_pattern[n]) >= MagickEpsilon)
n++;
@@ -1855,7 +1857,8 @@
dash_polygon[j].coordinates=1;
j++;
}
- if ((total_length < maximum_length) && ((n & 0x01) == 0) && (j > 1))
+ if ((status != MagickFalse) && (total_length < maximum_length) &&
+ ((n & 0x01) == 0) && (j > 1))
{
dash_polygon[j]=primitive_info[i-1];
dash_polygon[j].point.x+=MagickEpsilon;
@@ -2353,7 +2356,8 @@
n=1;
for (p=q; *p != '\0'; )
{
- (void) GetNextToken(p,&p,extent,token);
+ if (GetNextToken(p,&p,extent,token) < 1)
+ break;
if (*token == '\0')
break;
if (LocaleCompare(token,"pop") == 0)
@@ -3171,7 +3175,8 @@
}
if (LocaleCompare("pop",keyword) == 0)
{
- (void) GetNextToken(q,&q,extent,token);
+ if (GetNextToken(q,&q,extent,token) < 1)
+ break;
if (LocaleCompare("class",token) == 0)
break;
if (LocaleCompare("clip-path",token) == 0)
@@ -3221,7 +3226,8 @@
}
if (LocaleCompare("push",keyword) == 0)
{
- (void) GetNextToken(q,&q,extent,token);
+ if (GetNextToken(q,&q,extent,token) < 1)
+ break;
if (LocaleCompare("class",token) == 0)
{
/*
@@ -3229,7 +3235,8 @@
*/
for (p=q; *q != '\0'; )
{
- (void) GetNextToken(q,&q,extent,token);
+ if (GetNextToken(q,&q,extent,token) < 1)
+ break;
if (LocaleCompare(token,"pop") != 0)
continue;
(void) GetNextToken(q,(const char **) NULL,extent,token);
@@ -3245,10 +3252,11 @@
(void) GetNextToken(q,&q,extent,token);
for (p=q; *q != '\0'; )
{
- GetNextToken(q,&q,extent,token);
+ if (GetNextToken(q,&q,extent,token) < 1)
+ break;
if (LocaleCompare(token,"pop") != 0)
continue;
- GetNextToken(q,(const char **) NULL,extent,token);
+ (void) GetNextToken(q,(const char **) NULL,extent,token);
if (LocaleCompare(token,"clip-path") != 0)
continue;
break;
@@ -3312,7 +3320,8 @@
}
for (p=q; *q != '\0'; )
{
- (void) GetNextToken(q,&q,extent,token);
+ if (GetNextToken(q,&q,extent,token) < 1)
+ break;
if (LocaleCompare(token,"pop") != 0)
continue;
(void) GetNextToken(q,(const char **) NULL,extent,token);
@@ -3413,7 +3422,8 @@
ThrowPointExpectedException(token,exception);
for (p=q; *q != '\0'; )
{
- (void) GetNextToken(q,&q,extent,token);
+ if (GetNextToken(q,&q,extent,token) < 1)
+ break;
if (LocaleCompare(token,"pop") != 0)
continue;
(void) GetNextToken(q,(const char **) NULL,extent,token);
@@ -5696,7 +5706,6 @@
if (stroke_polygon == (PrimitiveInfo *) NULL)
{
status=0;
- stroke_polygon=(PrimitiveInfo *) RelinquishMagickMemory(stroke_polygon);
break;
}
status&=DrawPolygonPrimitive(image,clone_info,stroke_polygon,exception);
@@ -6138,25 +6147,49 @@
for (j=i+1; j < (ssize_t) number_coordinates; j++)
{
alpha=fabs(primitive_info[j].point.x-primitive_info[i].point.x);
+ if (alpha > (double) SSIZE_MAX)
+ {
+ (void) ThrowMagickException(mvg_info->exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'","");
+ return(MagickFalse);
+ }
if (alpha > (double) quantum)
quantum=(size_t) alpha;
alpha=fabs(primitive_info[j].point.y-primitive_info[i].point.y);
+ if (alpha > (double) SSIZE_MAX)
+ {
+ (void) ThrowMagickException(mvg_info->exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'","");
+ return(MagickFalse);
+ }
if (alpha > (double) quantum)
quantum=(size_t) alpha;
}
}
- quantum=(size_t) MagickMin((double) quantum/number_coordinates,
- (double) BezierQuantum);
- control_points=quantum*number_coordinates;
- if (CheckPrimitiveExtent(mvg_info,control_points+1) == MagickFalse)
- return(MagickFalse);
primitive_info=(*mvg_info->primitive_info)+mvg_info->offset;
- coefficients=(double *) AcquireQuantumMemory((size_t)
- number_coordinates,sizeof(*coefficients));
- points=(PointInfo *) AcquireQuantumMemory((size_t) control_points,
+ quantum=MagickMin(quantum/number_coordinates,BezierQuantum);
+ coefficients=(double *) AcquireQuantumMemory(number_coordinates,
+ sizeof(*coefficients));
+ points=(PointInfo *) AcquireQuantumMemory(quantum,number_coordinates*
sizeof(*points));
if ((coefficients == (double *) NULL) || (points == (PointInfo *) NULL))
- ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+ {
+ if (points != (PointInfo *) NULL)
+ points=(PointInfo *) RelinquishMagickMemory(points);
+ if (coefficients != (double *) NULL)
+ coefficients=(double *) RelinquishMagickMemory(coefficients);
+ (void) ThrowMagickException(mvg_info->exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'","");
+ return(MagickFalse);
+ }
+ control_points=quantum*number_coordinates;
+ if (CheckPrimitiveExtent(mvg_info,control_points+1) == MagickFalse)
+ {
+ points=(PointInfo *) RelinquishMagickMemory(points);
+ coefficients=(double *) RelinquishMagickMemory(coefficients);
+ return(MagickFalse);
+ }
+ primitive_info=(*mvg_info->primitive_info)+mvg_info->offset;
/*
Compute bezier points.
*/
@@ -6187,11 +6220,19 @@
for (i=0; i < (ssize_t) control_points; i++)
{
if (TracePoint(p,points[i]) == MagickFalse)
- return(MagickFalse);
+ {
+ points=(PointInfo *) RelinquishMagickMemory(points);
+ coefficients=(double *) RelinquishMagickMemory(coefficients);
+ return(MagickFalse);
+ }
p+=p->coordinates;
}
if (TracePoint(p,end) == MagickFalse)
- return(MagickFalse);
+ {
+ points=(PointInfo *) RelinquishMagickMemory(points);
+ coefficients=(double *) RelinquishMagickMemory(coefficients);
+ return(MagickFalse);
+ }
p+=p->coordinates;
primitive_info->coordinates=(size_t) (p-primitive_info);
primitive_info->closed_subpath=MagickFalse;
@@ -6267,8 +6308,7 @@
y+=360.0;
angle.y=DegreesToRadians(y);
coordinates=ceil((angle.y-angle.x)/step+1.0);
- if ((coordinates > (double) SSIZE_MAX) ||
- (coordinates > (double) GetMaxMemoryRequest()))
+ if (coordinates > (double) SSIZE_MAX)
{
(void) ThrowMagickException(mvg_info->exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'","");
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 58c9146..3d74b07 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -5164,9 +5164,6 @@
canvas_image=CloneImage(image,0,0,MagickTrue,exception);
if (canvas_image == (Image *) NULL)
return((Image *) NULL);
- if ((canvas_image->alpha_trait == UndefinedPixelTrait) &&
- (canvas_image->background_color.alpha != OpaqueAlpha))
- (void) SetImageAlphaChannel(canvas_image,OpaqueAlphaChannel,exception);
swirl_image=CloneImage(canvas_image,0,0,MagickTrue,exception);
if (swirl_image == (Image *) NULL)
{
@@ -5179,6 +5176,8 @@
swirl_image=DestroyImage(swirl_image);
return((Image *) NULL);
}
+ if (swirl_image->background_color.alpha_trait != UndefinedPixelTrait)
+ (void) SetImageAlpha(swirl_image,OnAlphaChannel,exception);
/*
Compute scaling factor.
*/
diff --git a/MagickCore/image.c b/MagickCore/image.c
index b793d79..783f05a 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1765,14 +1765,12 @@
break;
}
}
- for (q=filename; *q != '\0'; q++)
- if ((*q == '%') && (*(q+1) == '%'))
- {
- (void) CopyMagickString(q,q+1,(size_t) (MagickPathExtent-(q-filename)));
- canonical=MagickTrue;
- }
if (canonical == MagickFalse)
(void) CopyMagickString(filename,format,MagickPathExtent);
+ else
+ for (q=filename; *q != '\0'; q++)
+ if ((*q == '%') && (*(q+1) == '%'))
+ (void) CopyMagickString(q,q+1,(size_t) (MagickPathExtent-(q-filename)));
return(strlen(filename));
}
diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index a36880b..717b9db 100644
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -1692,6 +1692,9 @@
{
if (locale_semaphore == (SemaphoreInfo *) NULL)
locale_semaphore=AcquireSemaphoreInfo();
+#if defined(MAGICKCORE_LOCALE_SUPPORT)
+ (void) AcquireCLocale();
+#endif
return(MagickTrue);
}
diff --git a/MagickCore/log.c b/MagickCore/log.c
index 5977189..d71f6d1 100644
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -993,7 +993,7 @@
(void) FormatLocaleString(text,extent,
"<entry>\n"
" <timestamp>%s</timestamp>\n"
- " <elapsed-time>%lu:%02lu.%03lu</elapsed-time>\n"
+ " <elapsed-time>%lu:%02lu.%06lu</elapsed-time>\n"
" <user-time>%0.3f</user-time>\n"
" <process-id>%.20g</process-id>\n"
" <thread-id>%.20g</thread-id>\n"
@@ -1004,7 +1004,7 @@
" <event>%s</event>\n"
"</entry>",timestamp,(unsigned long) (elapsed_time/60.0),
(unsigned long) floor(fmod(elapsed_time,60.0)),(unsigned long)
- (1000.0*(elapsed_time-floor(elapsed_time))+0.5),user_time,
+ (1000000.0*(elapsed_time-floor(elapsed_time))+0.5),user_time,
(double) getpid(),(double) GetMagickThreadSignature(),module,function,
(double) line,domain,event);
return(text);
diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 3768258..269106d 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -870,6 +870,64 @@
% %
% %
% %
++ G e t M a g i c k M o d u l e N a m e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% GetMagickModuleName() returns the magick module name.
+%
+% The format of the GetMagickModuleName method is:
+%
+% const char *GetMagickModuleName(const MagickInfo *magick_info)
+%
+% A description of each parameter follows:
+%
+% o magick_info: The magick info.
+%
+*/
+MagickExport const char *GetMagickModuleName(const MagickInfo *magick_info)
+{
+ assert(magick_info != (MagickInfo *) NULL);
+ assert(magick_info->signature == MagickCoreSignature);
+ return(magick_info->magick_module);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ G e t M a g i c k N a m e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% GetMagickName() returns the magick name.
+%
+% The format of the GetMagickName method is:
+%
+% const char *GetMagickName(const MagickInfo *magick_info)
+%
+% A description of each parameter follows:
+%
+% o magick_info: The magick info.
+%
+*/
+MagickExport const char *GetMagickName(const MagickInfo *magick_info)
+{
+ assert(magick_info != (MagickInfo *) NULL);
+ assert(magick_info->signature == MagickCoreSignature);
+ return(magick_info->name);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
% G e t M a g i c k P r e c i s i o n %
% %
% %
diff --git a/MagickCore/magick.h b/MagickCore/magick.h
index 4bfb15f..9d5d59d 100644
--- a/MagickCore/magick.h
+++ b/MagickCore/magick.h
@@ -25,6 +25,12 @@
#include <stdarg.h>
#include "MagickCore/semaphore.h"
+#if defined(__cplusplus) || defined(c_plusplus)
+# define magick_module _module /* reserved word in C++(20) */
+#else
+# define magick_module module
+#endif
+
typedef enum
{
UndefinedFormatType,
@@ -101,7 +107,9 @@
extern MagickExport const char
*GetMagickDescription(const MagickInfo *),
- *GetMagickMimeType(const MagickInfo *);
+ *GetMagickMimeType(const MagickInfo *),
+ *GetMagickModuleName(const MagickInfo *),
+ *GetMagickName(const MagickInfo *);
extern MagickExport DecodeImageHandler
*GetImageDecoder(const MagickInfo *) magick_attribute((__pure__));
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 1fd4ed4..18b3fc7 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -2855,7 +2855,8 @@
*magick_restrict k;
register const Quantum
- *magick_restrict pixels;
+ *magick_restrict pixels,
+ *magick_restrict quantum_pixels;
register ssize_t
u;
@@ -2878,6 +2879,7 @@
continue;
}
pixels=p;
+ quantum_pixels=(const Quantum *) NULL;
maximum=0.0;
minimum=(double) QuantumRange;
switch (method)
@@ -3101,6 +3103,7 @@
intensity=(double) GetPixelIntensity(image,pixels);
if (intensity < minimum)
{
+ quantum_pixels=pixels;
pixel=(double) pixels[i];
minimum=intensity;
}
@@ -3131,6 +3134,7 @@
if (intensity > maximum)
{
pixel=(double) pixels[i];
+ quantum_pixels=pixels;
maximum=intensity;
}
count++;
@@ -3191,6 +3195,11 @@
}
if (fabs(pixel-p[center+i]) > MagickEpsilon)
changes[id]++;
+ if (quantum_pixels != (const Quantum *) NULL)
+ {
+ SetPixelChannel(morphology_image,channel,quantum_pixels[i],q);
+ continue;
+ }
gamma=PerceptibleReciprocal(gamma);
if (count != 0)
gamma*=(double) kernel->height*kernel->width/count;
diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index 7826722..0ce3322 100644
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -366,7 +366,14 @@
}
}
if (temp == (char *) NULL)
- temp=AcquireString("?");
+ {
+ temp=AcquireString("?");
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),
+ "Cannot use cache directory: \"%s\"",path);
+ }
+ else
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),
+ "Using cache directory: \"%s\"",temp);
cache_directory=temp;
}
UnlockSemaphoreInfo(cache_directory_lock);
@@ -385,6 +392,8 @@
i,
j;
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),
+ "Selecting device for type: %d",(int) type);
for (i = 0; i < clEnv->number_devices; i++)
clEnv->devices[i]->enabled=MagickFalse;
@@ -395,6 +404,8 @@
continue;
device->enabled=MagickTrue;
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),
+ "Selected device: %s",device->name);
for (j = i+1; j < clEnv->number_devices; j++)
{
MagickCLDevice
@@ -709,6 +720,8 @@
kernel;
assert(device != (MagickCLDevice) NULL);
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),"Using kernel: %s",
+ kernel_name);
kernel=openCL_library->clCreateKernel(device->program,kernel_name,
(cl_int *) NULL);
return(kernel);
@@ -905,8 +918,12 @@
profileFile=fopen(filename,"ab");
- if (profileFile == (FILE *)NULL)
- return(MagickFalse);
+ if (profileFile == (FILE *) NULL)
+ {
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),
+ "Unable to save profile to: \"%s\"",filename);
+ return(MagickFalse);
+ }
fclose(profileFile);
return(MagickTrue);
@@ -1182,6 +1199,8 @@
i,
j;
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),
+ "Starting benchmark");
testEnv=AcquireMagickCLEnv();
testEnv->library=openCL_library;
testEnv->devices=(MagickCLDevice *) AcquireCriticalMemory(
@@ -1280,11 +1299,15 @@
status=openCL_library->clGetProgramInfo(device->program,
CL_PROGRAM_BINARIES,sizeof(unsigned char*),&binaryProgram,NULL);
if (status == CL_SUCCESS)
- (void) BlobToFile(filename,binaryProgram,binaryProgramSize,exception);
+ {
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),
+ "Creating cache file: \"%s\"",filename);
+ (void) BlobToFile(filename,binaryProgram,binaryProgramSize,exception);
+ }
binaryProgram=(unsigned char *) RelinquishMagickMemory(binaryProgram);
}
-static MagickBooleanType LoadCachedOpenCLKernel(MagickCLDevice device,
+static MagickBooleanType LoadCachedOpenCLKernels(MagickCLDevice device,
const char *filename)
{
cl_int
@@ -1306,6 +1329,8 @@
sans_exception=DestroyExceptionInfo(sans_exception);
if (binaryProgram == (unsigned char *) NULL)
return(MagickFalse);
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),
+ "Loaded cached kernels: \"%s\"",filename);
device->program=openCL_library->clCreateProgramWithBinary(device->context,1,
&device->deviceID,&length,(const unsigned char**)&binaryProgram,
&binaryStatus,&status);
@@ -1377,7 +1402,7 @@
"%s%s%s_%s_%08x_%.20g.bin",GetOpenCLCacheDirectory(),
DirectorySeparator,"magick_opencl",deviceName,(unsigned int) signature,
(double) sizeof(char*)*8);
- loaded=LoadCachedOpenCLKernel(device,filename);
+ loaded=LoadCachedOpenCLKernels(device,filename);
if (loaded == MagickFalse)
{
/* Binary CL program unavailable, compile the program from source */
@@ -1534,35 +1559,31 @@
FILE
*log;
- MagickCLEnv
- clEnv;
-
size_t
i,
j;
- clEnv=GetCurrentOpenCLEnv();
- if (clEnv == (MagickCLEnv) NULL)
+ if (default_CLEnv == (MagickCLEnv) NULL)
return;
- for (i = 0; i < clEnv->number_devices; i++)
- if (clEnv->devices[i]->profile_kernels != MagickFalse)
+ for (i = 0; i < default_CLEnv->number_devices; i++)
+ if (default_CLEnv->devices[i]->profile_kernels != MagickFalse)
break;
- if (i == clEnv->number_devices)
+ if (i == default_CLEnv->number_devices)
return;
(void) FormatLocaleString(filename,MagickPathExtent,"%s%s%s",
GetOpenCLCacheDirectory(),DirectorySeparator,"ImageMagickOpenCL.log");
- log = fopen_utf8(filename,"wb");
+ log=fopen_utf8(filename,"wb");
if (log == (FILE *) NULL)
return;
- for (i = 0; i < clEnv->number_devices; i++)
+ for (i = 0; i < default_CLEnv->number_devices; i++)
{
MagickCLDevice
device;
- device=clEnv->devices[i];
+ device=default_CLEnv->devices[i];
if ((device->profile_kernels == MagickFalse) ||
(device->profile_records == (KernelProfileRecord *) NULL))
continue;
@@ -1739,7 +1760,7 @@
% %
% %
% %
-+ G e t C u r r u n t O p e n C L E n v %
++ G e t C u r r e n t O p e n C L E n v %
% %
% %
% %
@@ -2386,6 +2407,8 @@
sizeof(cl_ulong),&device->local_memory_size,NULL);
clEnv->devices[next]=device;
+ (void) LogMagickEvent(AccelerateEvent,GetMagickModule(),
+ "Found device: %s",device->name);
}
}
if (next != clEnv->number_devices)
diff --git a/MagickCore/option.c b/MagickCore/option.c
index 0624647..cf0d7ed 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1225,6 +1225,8 @@
{ "B44A", B44ACompression, UndefinedOptionFlag, MagickFalse },
{ "B44", B44Compression, UndefinedOptionFlag, MagickFalse },
{ "BZip", BZipCompression, UndefinedOptionFlag, MagickFalse },
+ { "DWAA", DWAACompression, UndefinedOptionFlag, MagickFalse },
+ { "DWAB", DWABCompression, UndefinedOptionFlag, MagickFalse },
{ "DXT1", DXT1Compression, UndefinedOptionFlag, MagickFalse },
{ "DXT3", DXT3Compression, UndefinedOptionFlag, MagickFalse },
{ "DXT5", DXT5Compression, UndefinedOptionFlag, MagickFalse },
@@ -2848,6 +2850,9 @@
register ssize_t
i;
+ size_t
+ length;
+
ssize_t
channel;
@@ -2855,7 +2860,8 @@
if (channel >= 0)
return(channel);
channel=0;
- for (i=0; i < (ssize_t) strlen(channels); i++)
+ length=strlen(channels);
+ for (i=0; i < (ssize_t) length; i++)
{
switch (channels[i])
{
diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 9b23d65..1721172 100644
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -607,10 +607,11 @@
register PolicyInfo
*p;
- (void) LogMagickEvent(PolicyEvent,GetMagickModule(),
- "Domain: %s; rights=%s; pattern=\"%s\" ...",
- CommandOptionToMnemonic(MagickPolicyDomainOptions,domain),
- CommandOptionToMnemonic(MagickPolicyRightsOptions,rights),pattern);
+ if (IsEventLogging() != MagickFalse)
+ (void) LogMagickEvent(PolicyEvent,GetMagickModule(),
+ "Domain: %s; rights=%s; pattern=\"%s\" ...",
+ CommandOptionToMnemonic(MagickPolicyDomainOptions,domain),
+ CommandOptionToMnemonic(MagickPolicyRightsOptions,rights),pattern);
exception=AcquireExceptionInfo();
policy_info=GetPolicyInfo("*",exception);
exception=DestroyExceptionInfo(exception);
diff --git a/MagickCore/property.c b/MagickCore/property.c
index ea63b14..b602a78 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1640,6 +1640,14 @@
directory_stack[level].entry=entry;
directory_stack[level].offset=tag_offset;
level++;
+ /*
+ Check for duplicate tag.
+ */
+ for (i=0; i < level; i++)
+ if (directory_stack[i].directory == (exif+tag_offset1))
+ break;
+ if (i < level)
+ break; /* duplicate tag */
directory_stack[level].directory=exif+tag_offset1;
directory_stack[level].offset=tag_offset2;
directory_stack[level].entry=0;
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index 812f6d8..40b9745 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -1950,8 +1950,7 @@
/*
Distribute quantization error along a Hilbert curve.
*/
- (void) memset(cube_info->error,0,ErrorQueueLength*
- sizeof(*cube_info->error));
+ (void) memset(cube_info->error,0,ErrorQueueLength*sizeof(*cube_info->error));
cube_info->x=0;
cube_info->y=0;
i=MagickMax((ssize_t) image->columns,(ssize_t) image->rows);
@@ -2053,8 +2052,7 @@
/*
Initialize color cache.
*/
- (void) memset(cube_info->cache,(-1),sizeof(*cube_info->cache)*
- length);
+ (void) memset(cube_info->cache,(-1),sizeof(*cube_info->cache)*length);
/*
Distribute weights along a curve of exponential decay.
*/
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 7f60d00..b5ac99d 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -156,7 +156,7 @@
Refactored by Chantal Racette and Nicolas Robidoux to one trig call and
five flops.
*/
- const double cosine=cos((double) (MagickPI*x));
+ const double cosine = cos((double) (MagickPI*x));
magick_unreferenced(resize_filter);
return(0.34+cosine*(0.5+cosine*0.16));
}
@@ -172,7 +172,7 @@
taking advantage of the fact that the support of Bohman is 1.0 (so that we
know that sin(pi x) >= 0).
*/
- const double cosine=cos((double) (MagickPI*x));
+ const double cosine = cos((double) (MagickPI*x));
const double sine=sqrt(1.0-cosine*cosine);
magick_unreferenced(resize_filter);
return((1.0-x)*cosine+(1.0/MagickPI)*sine);
@@ -201,7 +201,7 @@
Cosine window function:
cos((pi/2)*x).
*/
- return((double)cos((double) (MagickPI2*x)));
+ return(cos((double) (MagickPI2*x)));
}
static double CubicBC(const double x,const ResizeFilter *resize_filter)
@@ -326,7 +326,7 @@
Cosine window function:
0.5+0.5*cos(pi*x).
*/
- const double cosine=cos((double) (MagickPI*x));
+ const double cosine = cos((double) (MagickPI*x));
magick_unreferenced(resize_filter);
return(0.5+0.5*cosine);
}
@@ -338,7 +338,7 @@
Offset cosine window function:
.54 + .46 cos(pi x).
*/
- const double cosine=cos((double) (MagickPI*x));
+ const double cosine = cos((double) (MagickPI*x));
magick_unreferenced(resize_filter);
return(0.54+0.46*cosine);
}
@@ -1501,9 +1501,8 @@
x=(-x);
if (x < 8.0)
return(p*J1(x));
- q=sqrt((double) (2.0/(MagickPI*x)))*(P1(x)*(1.0/sqrt(2.0)*(sin((double) x)-
- cos((double) x)))-8.0/x*Q1(x)*(-1.0/sqrt(2.0)*(sin((double) x)+
- cos((double) x))));
+ q=sqrt((double) (2.0/(MagickPI*x)))*(P1(x)*(1.0/sqrt(2.0)*(sin(x)-
+ cos(x)))-8.0/x*Q1(x)*(-1.0/sqrt(2.0)*(sin(x)+cos(x))));
if (p < 0.0)
q=(-q);
return(q);
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 9d18b7c..acf9348 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -850,7 +850,7 @@
{
PixelChannel channel = GetPixelChannelChannel(image,i);
PixelTrait traits = GetPixelChannelTraits(image,channel);
- PixelTrait rotate_traits=GetPixelChannelTraits(rotate_image,
+ PixelTrait rotate_traits = GetPixelChannelTraits(rotate_image,
channel);
if ((traits == UndefinedPixelTrait) ||
(rotate_traits == UndefinedPixelTrait))
@@ -931,7 +931,7 @@
{
PixelChannel channel = GetPixelChannelChannel(image,i);
PixelTrait traits = GetPixelChannelTraits(image,channel);
- PixelTrait rotate_traits=GetPixelChannelTraits(rotate_image,
+ PixelTrait rotate_traits = GetPixelChannelTraits(rotate_image,
channel);
if ((traits == UndefinedPixelTrait) ||
(rotate_traits == UndefinedPixelTrait))
@@ -1046,7 +1046,7 @@
{
PixelChannel channel = GetPixelChannelChannel(image,i);
PixelTrait traits = GetPixelChannelTraits(image,channel);
- PixelTrait rotate_traits=GetPixelChannelTraits(rotate_image,
+ PixelTrait rotate_traits = GetPixelChannelTraits(rotate_image,
channel);
if ((traits == UndefinedPixelTrait) ||
(rotate_traits == UndefinedPixelTrait))
diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index 35d87f8..06c772f 100644
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -55,12 +55,6 @@
# define STDC
#endif
-#if defined(__cplusplus) || defined(c_plusplus)
-# define magick_module _module /* reserved word in C++(20) */
-#else
-# define magick_module module
-#endif
-
#include <stdarg.h>
#include <stdio.h>
#if defined(MAGICKCORE_HAVE_SYS_STAT_H)
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index c315c4a..6c31f8f 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -820,7 +820,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
- if (IsGrayColorspace(image->colorspace) != MagickFalse)
+ if (IsGrayColorspace(image->colorspace) == MagickFalse)
(void) SetImageColorspace(image,sRGBColorspace,exception);
/*
Bilevel threshold image.
diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index a877a0c..df196ef 100644
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -1740,7 +1740,15 @@
#elif defined(__BEOS__)
snooze(1000*milliseconds);
#else
-# error "Time delay method not defined."
+ {
+ clock_t
+ time_end;
+
+ time_end=clock()+milliseconds*CLOCKS_PER_SEC/1000;
+ while (clock() < time_end)
+ {
+ }
+ }
#endif
}
diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 5937c2f..a49adbb 100644
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -7463,7 +7463,8 @@
% The format of the MagickMorphologyImage method is:
%
% MagickBooleanType MagickMorphologyImage(MagickWand *wand,
-% MorphologyMethod method,const ssize_t iterations,KernelInfo *kernel)
+% const MorphologyMethod method,const ssize_t iterations,
+% const KernelInfo *kernel)
%
% A description of each parameter follows:
%
@@ -7479,7 +7480,8 @@
%
*/
WandExport MagickBooleanType MagickMorphologyImage(MagickWand *wand,
- MorphologyMethod method,const ssize_t iterations,KernelInfo *kernel)
+ const MorphologyMethod method,const ssize_t iterations,
+ const KernelInfo *kernel)
{
Image
*morphology_image;
@@ -10297,8 +10299,9 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- if (filename != (const char *) NULL)
- (void) CopyMagickString(wand->images->filename,filename,MagickPathExtent);
+ if (filename == (const char *) NULL)
+ return(MagickFalse);
+ (void) CopyMagickString(wand->images->filename,filename,MagickPathExtent);
return(MagickTrue);
}
diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index 19e3fb8..9e858f4 100644
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -206,8 +206,8 @@
MagickMinifyImage(MagickWand *),
MagickModeImage(MagickWand *,const double),
MagickModulateImage(MagickWand *,const double,const double,const double),
- MagickMorphologyImage(MagickWand *,MorphologyMethod,const ssize_t,
- KernelInfo *),
+ MagickMorphologyImage(MagickWand *,const MorphologyMethod,const ssize_t,
+ const KernelInfo *),
MagickMotionBlurImage(MagickWand *,const double,const double,const double),
MagickNegateImage(MagickWand *,const MagickBooleanType),
MagickNewImage(MagickWand *,const size_t,const size_t,const PixelWand *),
diff --git a/Makefile.in b/Makefile.in
index 4b648eb..775ee35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3283,6 +3283,7 @@
TAR = @TAR@
THREAD_LIBS = @THREAD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
+TraceEncodeDelegate = @TraceEncodeDelegate@
UINT16_T = @UINT16_T@
UINT32_F = @UINT32_F@
UINT32_T = @UINT32_T@
diff --git a/coders/caption.c b/coders/caption.c
index 80f1a33..929b249 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -173,8 +173,7 @@
if (image->columns == 0)
{
text=AcquireString(caption);
- i=FormatMagickCaption(image,draw_info,split,&metrics,&text,
- exception);
+ i=FormatMagickCaption(image,draw_info,split,&metrics,&text,exception);
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
(void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
@@ -182,8 +181,7 @@
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
- width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5);
- image->columns=width;
+ image->columns=(size_t) floor(metrics.width+draw_info->stroke_width+0.5);
}
if (image->rows == 0)
{
@@ -227,33 +225,44 @@
/*
Auto fit text into bounding box.
*/
- for (n=0; n < 32; n++, draw_info->pointsize*=2.0)
- {
- text=AcquireString(caption);
- i=FormatMagickCaption(image,draw_info,split,&metrics,&text,
- exception);
- (void) CloneString(&draw_info->text,text);
- text=DestroyString(text);
- (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
- -metrics.bounds.x1,metrics.ascent);
- if (draw_info->gravity == UndefinedGravity)
- (void) CloneString(&draw_info->geometry,geometry);
- status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
- if (status == MagickFalse)
- break;
- width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5);
- height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
- if ((image->columns != 0) && (image->rows != 0))
+ option=GetImageOption(image_info,"caption:max-pointsize");
+ if (option != (const char*) NULL)
+ {
+ high=StringToDouble(option,(char**) NULL);
+ if (high < 1.0)
+ high=1.0;
+ high+=1.0;
+ }
+ else
+ {
+ for (n=0; n < 32; n++, draw_info->pointsize*=2.0)
{
- if ((width >= image->columns) && (height >= image->rows))
+ text=AcquireString(caption);
+ i=FormatMagickCaption(image,draw_info,split,&metrics,&text,
+ exception);
+ (void) CloneString(&draw_info->text,text);
+ text=DestroyString(text);
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
+ -metrics.bounds.x1,metrics.ascent);
+ if (draw_info->gravity == UndefinedGravity)
+ (void) CloneString(&draw_info->geometry,geometry);
+ status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
+ if (status == MagickFalse)
break;
+ width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5);
+ height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
+ if ((image->columns != 0) && (image->rows != 0))
+ {
+ if ((width >= image->columns) && (height >= image->rows))
+ break;
+ }
+ else
+ if (((image->columns != 0) && (width >= image->columns)) ||
+ ((image->rows != 0) && (height >= image->rows)))
+ break;
}
- else
- if (((image->columns != 0) && (width >= image->columns)) ||
- ((image->rows != 0) && (height >= image->rows)))
- break;
- }
- high=draw_info->pointsize;
+ high=draw_info->pointsize;
+ }
for (low=1.0; (high-low) > 0.5; )
{
draw_info->pointsize=(low+high)/2.0;
diff --git a/coders/exr.c b/coders/exr.c
index ff71280..e5b79ed 100644
--- a/coders/exr.c
+++ b/coders/exr.c
@@ -160,6 +160,9 @@
ImfRgba
*scanline;
+ int
+ compression;
+
MagickBooleanType
status;
@@ -200,11 +203,39 @@
hdr_info=ImfInputHeader(file);
ImfHeaderDisplayWindow(hdr_info,&display_window.min_x,&display_window.min_y,
&display_window.max_x,&display_window.max_y);
- image->columns=(size_t) (display_window.max_x-display_window.min_x+1UL);
- image->rows=(size_t) (display_window.max_y-display_window.min_y+1UL);
+ image->columns=((size_t) display_window.max_x-display_window.min_x+1UL);
+ image->rows=((size_t) display_window.max_y-display_window.min_y+1UL);
image->alpha_trait=BlendPixelTrait;
(void) SetImageColorspace(image,RGBColorspace,exception);
image->gamma=1.0;
+ image->compression=NoCompression;
+ compression=ImfHeaderCompression(hdr_info);
+ if (compression == IMF_RLE_COMPRESSION)
+ image->compression=RLECompression;
+ if (compression == IMF_ZIPS_COMPRESSION)
+ image->compression=ZipSCompression;
+ if (compression == IMF_ZIP_COMPRESSION)
+ image->compression=ZipCompression;
+ if (compression == IMF_PIZ_COMPRESSION)
+ image->compression=PizCompression;
+ if (compression == IMF_PXR24_COMPRESSION)
+ image->compression=Pxr24Compression;
+#if defined(IMF_B44_COMPRESSION)
+ if (compression == IMF_B44_COMPRESSION)
+ image->compression=B44Compression;
+#endif
+#if defined(IMF_B44A_COMPRESSION)
+ if (compression == IMF_B44A_COMPRESSION)
+ image->compression=B44ACompression;
+#endif
+#if defined(IMF_DWAA_COMPRESSION)
+ if (compression == IMF_DWAA_COMPRESSION)
+ image->compression=DWAACompression;
+#endif
+#if defined(IMF_DWAB_COMPRESSION)
+ if (compression == IMF_DWAB_COMPRESSION)
+ image->compression=DWABCompression;
+#endif
if (image_info->ping != MagickFalse)
{
(void) ImfCloseInputFile(file);
@@ -216,7 +247,7 @@
return(DestroyImageList(image));
ImfHeaderDataWindow(hdr_info,&data_window.min_x,&data_window.min_y,
&data_window.max_x,&data_window.max_y);
- columns=(size_t) (data_window.max_x-data_window.min_x+1UL);
+ columns=((size_t) data_window.max_x-data_window.min_x+1UL);
if ((display_window.min_x > data_window.max_x) ||
(display_window.min_x+(int) image->columns <= data_window.min_x))
scanline=(ImfRgba *) NULL;
@@ -445,6 +476,8 @@
ImfHeaderSetDisplayWindow(hdr_info,0,0,(int) image->columns-1,(int)
image->rows-1);
compression=IMF_NO_COMPRESSION;
+ if (write_info->compression == RLECompression)
+ compression=IMF_RLE_COMPRESSION;
if (write_info->compression == ZipSCompression)
compression=IMF_ZIPS_COMPRESSION;
if (write_info->compression == ZipCompression)
@@ -453,14 +486,22 @@
compression=IMF_PIZ_COMPRESSION;
if (write_info->compression == Pxr24Compression)
compression=IMF_PXR24_COMPRESSION;
-#if defined(B44Compression)
+#if defined(IMF_B44_COMPRESSION)
if (write_info->compression == B44Compression)
compression=IMF_B44_COMPRESSION;
#endif
-#if defined(B44ACompression)
+#if defined(IMF_B44A_COMPRESSION)
if (write_info->compression == B44ACompression)
compression=IMF_B44A_COMPRESSION;
#endif
+#if defined(IMF_DWAA_COMPRESSION)
+ if (write_info->compression == DWAACompression)
+ compression=IMF_DWAA_COMPRESSION;
+#endif
+#if defined(IMF_DWAB_COMPRESSION)
+ if (write_info->compression == DWABCompression)
+ compression=IMF_DWAB_COMPRESSION;
+#endif
channels=0;
value=GetImageOption(image_info,"exr:color-type");
if (value != (const char *) NULL)
diff --git a/coders/html.c b/coders/html.c
index fe97a43..1b9abb3 100644
--- a/coders/html.c
+++ b/coders/html.c
@@ -94,7 +94,7 @@
*/
static MagickBooleanType IsHTML(const unsigned char *magick,const size_t length)
{
- if (length < 5)
+ if (length < 6)
return(MagickFalse);
if (LocaleNCompare((char *) magick+1,"html",5) == 0)
return(MagickTrue);
diff --git a/coders/jp2.c b/coders/jp2.c
index 9478b14..6303071 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -777,6 +777,17 @@
parameters->cp_disto_alloc=1;
}
+static inline int CalculateNumResolutions(size_t width,size_t height)
+{
+ int
+ i;
+
+ for (i=1; i < 6; i++)
+ if ((width < ((size_t) 1UL << i)) || (height < ((size_t) 1UL << i)))
+ break;
+ return(i);
+}
+
static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
ExceptionInfo *exception)
{
@@ -797,7 +808,7 @@
jp2_colorspace;
opj_cparameters_t
- parameters;
+ *parameters;
opj_image_cmptparm_t
jp2_info[5];
@@ -834,22 +845,23 @@
/*
Initialize JPEG 2000 API.
*/
- opj_set_default_encoder_parameters(¶meters);
- for (i=1; i < 6; i++)
- if (((size_t) (1UL << (i+2)) > image->columns) &&
- ((size_t) (1UL << (i+2)) > image->rows))
- break;
- parameters.numresolution=i;
+ parameters=AcquireMagickMemory(sizeof(*parameters));
+ if (parameters == (opj_cparameters_t *) NULL)
+ ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
+ opj_set_default_encoder_parameters(parameters);
option=GetImageOption(image_info,"jp2:number-resolutions");
if (option != (const char *) NULL)
- parameters.numresolution=StringToInteger(option);
- parameters.tcp_numlayers=1;
- parameters.tcp_rates[0]=0; /* lossless */
- parameters.cp_disto_alloc=1;
+ parameters->numresolution=StringToInteger(option);
+ else
+ parameters->numresolution=CalculateNumResolutions(image->columns,
+ image->rows);
+ parameters->tcp_numlayers=1;
+ parameters->tcp_rates[0]=0; /* lossless */
+ parameters->cp_disto_alloc=1;
if ((image_info->quality != 0) && (image_info->quality != 100))
{
- parameters.tcp_distoratio[0]=(double) image_info->quality;
- parameters.cp_fixed_quality=OPJ_TRUE;
+ parameters->tcp_distoratio[0]=(double) image_info->quality;
+ parameters->cp_fixed_quality=OPJ_TRUE;
}
if (image_info->extract != (char *) NULL)
{
@@ -864,15 +876,17 @@
*/
(void) memset(&geometry,0,sizeof(geometry));
flags=ParseAbsoluteGeometry(image_info->extract,&geometry);
- parameters.cp_tdx=(int) geometry.width;
- parameters.cp_tdy=(int) geometry.width;
+ parameters->cp_tdx=(int) geometry.width;
+ parameters->cp_tdy=(int) geometry.width;
if ((flags & HeightValue) != 0)
- parameters.cp_tdy=(int) geometry.height;
+ parameters->cp_tdy=(int) geometry.height;
if ((flags & XValue) != 0)
- parameters.cp_tx0=geometry.x;
+ parameters->cp_tx0=geometry.x;
if ((flags & YValue) != 0)
- parameters.cp_ty0=geometry.y;
- parameters.tile_size_on=OPJ_TRUE;
+ parameters->cp_ty0=geometry.y;
+ parameters->tile_size_on=OPJ_TRUE;
+ parameters->numresolution=CalculateNumResolutions(parameters->cp_tdx,
+ parameters->cp_tdy);
}
option=GetImageOption(image_info,"jp2:quality");
if (option != (const char *) NULL)
@@ -884,7 +898,7 @@
Set quality PSNR.
*/
p=option;
- for (i=0; sscanf(p,"%f",¶meters.tcp_distoratio[i]) == 1; i++)
+ for (i=0; sscanf(p,"%f",¶meters->tcp_distoratio[i]) == 1; i++)
{
if (i > 100)
break;
@@ -894,22 +908,22 @@
break;
p++;
}
- parameters.tcp_numlayers=i+1;
- parameters.cp_fixed_quality=OPJ_TRUE;
+ parameters->tcp_numlayers=i+1;
+ parameters->cp_fixed_quality=OPJ_TRUE;
}
option=GetImageOption(image_info,"jp2:progression-order");
if (option != (const char *) NULL)
{
if (LocaleCompare(option,"LRCP") == 0)
- parameters.prog_order=OPJ_LRCP;
+ parameters->prog_order=OPJ_LRCP;
if (LocaleCompare(option,"RLCP") == 0)
- parameters.prog_order=OPJ_RLCP;
+ parameters->prog_order=OPJ_RLCP;
if (LocaleCompare(option,"RPCL") == 0)
- parameters.prog_order=OPJ_RPCL;
+ parameters->prog_order=OPJ_RPCL;
if (LocaleCompare(option,"PCRL") == 0)
- parameters.prog_order=OPJ_PCRL;
+ parameters->prog_order=OPJ_PCRL;
if (LocaleCompare(option,"CPRL") == 0)
- parameters.prog_order=OPJ_CPRL;
+ parameters->prog_order=OPJ_CPRL;
}
option=GetImageOption(image_info,"jp2:rate");
if (option != (const char *) NULL)
@@ -921,7 +935,7 @@
Set compression rate.
*/
p=option;
- for (i=0; sscanf(p,"%f",¶meters.tcp_rates[i]) == 1; i++)
+ for (i=0; sscanf(p,"%f",¶meters->tcp_rates[i]) == 1; i++)
{
if (i >= 100)
break;
@@ -931,21 +945,21 @@
break;
p++;
}
- parameters.tcp_numlayers=i+1;
- parameters.cp_disto_alloc=OPJ_TRUE;
+ parameters->tcp_numlayers=i+1;
+ parameters->cp_disto_alloc=OPJ_TRUE;
}
if (image_info->sampling_factor != (const char *) NULL)
(void) sscanf(image_info->sampling_factor,"%d,%d",
- ¶meters.subsampling_dx,¶meters.subsampling_dy);
+ ¶meters->subsampling_dx,¶meters->subsampling_dy);
property=GetImageProperty(image,"comment",exception);
if (property != (const char *) NULL)
- parameters.cp_comment=(char *) property;
+ parameters->cp_comment=(char *) property;
channels=3;
jp2_colorspace=OPJ_CLRSPC_SRGB;
if (image->colorspace == YUVColorspace)
{
jp2_colorspace=OPJ_CLRSPC_SYCC;
- parameters.subsampling_dx=2;
+ parameters->subsampling_dx=2;
}
else
{
@@ -959,7 +973,7 @@
if (image->alpha_trait != UndefinedPixelTrait)
channels++;
}
- parameters.tcp_mct=channels == 3 ? 1 : 0;
+ parameters->tcp_mct=channels == 3 ? 1 : 0;
memset(jp2_info,0,sizeof(jp2_info));
for (i=0; i < (ssize_t) channels; i++)
{
@@ -973,24 +987,27 @@
jp2_info[i].bpp++;
}
jp2_info[i].sgnd=0;
- jp2_info[i].dx=parameters.subsampling_dx;
- jp2_info[i].dy=parameters.subsampling_dy;
+ jp2_info[i].dx=parameters->subsampling_dx;
+ jp2_info[i].dy=parameters->subsampling_dy;
jp2_info[i].w=(OPJ_UINT32) image->columns;
jp2_info[i].h=(OPJ_UINT32) image->rows;
}
jp2_image=opj_image_create((OPJ_UINT32) channels,jp2_info,jp2_colorspace);
if (jp2_image == (opj_image_t *) NULL)
- ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
- jp2_image->x0=parameters.image_offset_x0;
- jp2_image->y0=parameters.image_offset_y0;
- jp2_image->x1=(unsigned int) (2*parameters.image_offset_x0+(image->columns-1)*
- parameters.subsampling_dx+1);
- jp2_image->y1=(unsigned int) (2*parameters.image_offset_y0+(image->rows-1)*
- parameters.subsampling_dx+1);
+ {
+ parameters=(opj_cparameters_t *) RelinquishMagickMemory(parameters);
+ ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
+ }
+ jp2_image->x0=parameters->image_offset_x0;
+ jp2_image->y0=parameters->image_offset_y0;
+ jp2_image->x1=(unsigned int) (2*parameters->image_offset_x0+
+ (image->columns-1)*parameters->subsampling_dx+1);
+ jp2_image->y1=(unsigned int) (2*parameters->image_offset_y0+
+ (image->rows-1)*parameters->subsampling_dx+1);
if ((image->depth == 12) &&
((image->columns == 2048) || (image->rows == 1080) ||
(image->columns == 4096) || (image->rows == 2160)))
- CinemaProfileCompliance(jp2_image,¶meters);
+ CinemaProfileCompliance(jp2_image,parameters);
if (channels == 4)
jp2_image->comps[3].alpha=1;
else
@@ -1020,7 +1037,8 @@
register int
*q;
- scale=(double) ((1UL << jp2_image->comps[i].prec)-1)/QuantumRange;
+ scale=(double) (((size_t) 1UL << jp2_image->comps[i].prec)-1)/
+ QuantumRange;
q=jp2_image->comps[i].data+(y/jp2_image->comps[i].dy*
image->columns/jp2_image->comps[i].dx+x/jp2_image->comps[i].dx);
switch (i)
@@ -1073,12 +1091,13 @@
jp2_codec=opj_create_compress(OPJ_CODEC_JP2);
opj_set_warning_handler(jp2_codec,JP2WarningHandler,exception);
opj_set_error_handler(jp2_codec,JP2ErrorHandler,exception);
- opj_setup_encoder(jp2_codec,¶meters,jp2_image);
+ opj_setup_encoder(jp2_codec,parameters,jp2_image);
jp2_stream=opj_stream_create(OPJ_J2K_STREAM_CHUNK_SIZE,OPJ_FALSE);
if (jp2_stream == (opj_stream_t *) NULL)
{
opj_destroy_codec(jp2_codec);
opj_image_destroy(jp2_image);
+ parameters=(opj_cparameters_t *) RelinquishMagickMemory(parameters);
ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
}
opj_stream_set_read_function(jp2_stream,JP2ReadHandler);
@@ -1093,6 +1112,7 @@
opj_stream_destroy(jp2_stream);
opj_destroy_codec(jp2_codec);
opj_image_destroy(jp2_image);
+ parameters=(opj_cparameters_t *) RelinquishMagickMemory(parameters);
ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
}
/*
@@ -1101,6 +1121,7 @@
opj_stream_destroy(jp2_stream);
opj_destroy_codec(jp2_codec);
opj_image_destroy(jp2_image);
+ parameters=(opj_cparameters_t *) RelinquishMagickMemory(parameters);
(void) CloseBlob(image);
return(MagickTrue);
}
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 087bf09..ecb021f 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2842,9 +2842,15 @@
*/
value=GetImageProperty(image,"comment",exception);
if (value != (char *) NULL)
- for (i=0; i < (ssize_t) strlen(value); i+=65533L)
- jpeg_write_marker(&jpeg_info,JPEG_COM,(unsigned char *) value+i,
- (unsigned int) MagickMin((size_t) strlen(value+i),65533L));
+ {
+ size_t
+ length;
+
+ length=strlen(value);
+ for (i=0; i < (ssize_t) length; i+=65533L)
+ 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);
/*
diff --git a/coders/pdf.c b/coders/pdf.c
index 29bc2c4..113124e 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -62,6 +62,7 @@
#include "MagickCore/list.h"
#include "MagickCore/magick.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
#include "MagickCore/monitor.h"
#include "MagickCore/monitor-private.h"
#include "MagickCore/nt-base-private.h"
@@ -75,7 +76,6 @@
#include "MagickCore/signature.h"
#include "MagickCore/static.h"
#include "MagickCore/string_.h"
-#include "MagickCore/module.h"
#include "MagickCore/timer-private.h"
#include "MagickCore/token.h"
#include "MagickCore/transform.h"
@@ -667,7 +667,15 @@
}
}
if (pdf_info.profile != (StringInfo *) NULL)
- (void) SetImageProfile(image,"xmp",pdf_info.profile,exception);
+ {
+ char
+ *profile;
+
+ (void) SetImageProfile(image,"xmp",pdf_info.profile,exception);
+ profile=(char *) GetStringInfoDatum(pdf_info.profile);
+ if (strstr(profile,"Adobe Illustrator") != (char *) NULL)
+ (void) CopyMagickString(image->magick,"AI",MagickPathExtent);
+ }
CleanupPDFInfo(&pdf_info);
if (image_info->number_scenes != 0)
{
diff --git a/coders/png.c b/coders/png.c
index 500f184..ca7151e 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -2145,13 +2145,6 @@
Image
*image;
- char
- im_vers[32],
- libpng_runv[32],
- libpng_vers[32],
- zlib_runv[32],
- zlib_vers[32];
-
int
intent, /* "PNG Rendering intent", which is ICC intent + 1 */
num_raw_profiles,
@@ -2264,50 +2257,52 @@
};
#endif
- /* Define these outside of the following "if logging()" block so they will
- * show in debuggers.
- */
- *im_vers='\0';
- (void) ConcatenateMagickString(im_vers,
- MagickLibVersionText,32);
- (void) ConcatenateMagickString(im_vers,
- MagickLibAddendum,32);
-
- *libpng_vers='\0';
- (void) ConcatenateMagickString(libpng_vers,
- PNG_LIBPNG_VER_STRING,32);
- *libpng_runv='\0';
- (void) ConcatenateMagickString(libpng_runv,
- png_get_libpng_ver(NULL),32);
-
- *zlib_vers='\0';
- (void) ConcatenateMagickString(zlib_vers,
- ZLIB_VERSION,32);
- *zlib_runv='\0';
- (void) ConcatenateMagickString(zlib_runv,
- zlib_version,32);
-
- logging=LogMagickEvent(CoderEvent,GetMagickModule(),
- " Enter ReadOnePNGImage()\n"
- " IM version = %s\n"
- " Libpng version = %s",
- im_vers, libpng_vers);
-
+ logging=IsEventLogging();
if (logging != MagickFalse)
- {
- if (LocaleCompare(libpng_vers,libpng_runv) != 0)
{
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " running with %s", libpng_runv);
+ char
+ im_vers[32],
+ libpng_runv[32],
+ libpng_vers[32],
+ zlib_runv[32],
+ zlib_vers[32];
+
+ *im_vers='\0';
+ (void) ConcatenateMagickString(im_vers,
+ MagickLibVersionText,32);
+ (void) ConcatenateMagickString(im_vers,
+ MagickLibAddendum,32);
+
+ *libpng_vers='\0';
+ (void) ConcatenateMagickString(libpng_vers,
+ PNG_LIBPNG_VER_STRING,32);
+ *libpng_runv='\0';
+ (void) ConcatenateMagickString(libpng_runv,
+ png_get_libpng_ver(NULL),32);
+
+ *zlib_vers='\0';
+ (void) ConcatenateMagickString(zlib_vers,
+ ZLIB_VERSION,32);
+ *zlib_runv='\0';
+ (void) ConcatenateMagickString(zlib_runv,
+ zlib_version,32);
+
+ LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Enter ReadOnePNGImage()\n"
+ " IM version = %s\n"
+ " Libpng version = %s",
+ im_vers, libpng_vers);
+
+ if (LocaleCompare(libpng_vers,libpng_runv) != 0)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " running with %s", libpng_runv);
+ if (LocaleCompare(libpng_vers,zlib_vers) != 0)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Zlib version = %s", zlib_vers);
+ if (LocaleCompare(zlib_vers,zlib_runv) != 0)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " running with %s", zlib_runv);
}
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Zlib version = %s", zlib_vers);
- if (LocaleCompare(zlib_vers,zlib_runv) != 0)
- {
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " running with %s", zlib_runv);
- }
- }
#if (PNG_LIBPNG_VER < 10200)
if (image_info->verbose)
@@ -3214,7 +3209,6 @@
/* Set image->rendering_intent to Undefined,
* image->colorspace to GRAY, and reset image->chromaticity.
*/
- image->intensity = Rec709LuminancePixelIntensityMethod;
SetImageColorspace(image,LinearGRAYColorspace,exception);
}
else
@@ -7658,7 +7652,7 @@
image=GetFirstImageInList(image);
#ifdef MNG_COALESCE_LAYERS
- if (insert_layers)
+ if (insert_layers && image->next)
{
Image
*next_image,
@@ -7673,11 +7667,12 @@
scene=image->scene;
next_image=CoalesceImages(image,exception);
-
- if (next_image == (Image *) NULL)
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
-
image=DestroyImageList(image);
+ if (next_image == (Image *) NULL)
+ {
+ mng_info=MngInfoFreeStruct(mng_info);
+ return((Image *) NULL);
+ }
image=next_image;
for (next=image; next != (Image *) NULL; next=next_image)
@@ -8757,14 +8752,15 @@
if (ping_preserve_colormap == MagickFalse)
{
- if (image->storage_class != PseudoClass && image->colormap != NULL)
+ if ((image->storage_class != PseudoClass) &&
+ (image->colormap != (PixelInfo *) NULL))
{
/* Free the bogus colormap; it can cause trouble later */
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Freeing bogus colormap");
- (void) RelinquishMagickMemory(image->colormap);
- image->colormap=NULL;
+ image->colormap=(PixelInfo *) RelinquishMagickMemory(
+ image->colormap);
}
}
@@ -9169,24 +9165,27 @@
(int) image->background_color.green,
(int) image->background_color.blue);
}
- for (i=0; i<number_opaque; i++)
- {
- if (opaque[i].red == image->background_color.red &&
- opaque[i].green == image->background_color.green &&
- opaque[i].blue == image->background_color.blue)
- break;
- }
- if (number_opaque < 259 && i == number_opaque)
+ if (number_opaque < 259)
{
- opaque[i] = image->background_color;
- ping_background.index = i;
- number_opaque++;
- if (logging != MagickFalse)
- {
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " background_color index is %d",(int) i);
- }
+ for (i=0; i<number_opaque; i++)
+ {
+ if (opaque[i].red == image->background_color.red &&
+ opaque[i].green == image->background_color.green &&
+ opaque[i].blue == image->background_color.blue)
+ break;
+ }
+ if (i == number_opaque)
+ {
+ opaque[i] = image->background_color;
+ ping_background.index = i;
+ number_opaque++;
+ if (logging != MagickFalse)
+ {
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " background_color index is %d",(int) i);
+ }
+ }
}
else if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -11400,14 +11399,15 @@
(void) SetQuantumEndian(image,quantum_info,MSBEndian);
num_passes=png_set_interlace_handling(ping);
- if ((!mng_info->write_png8 && !mng_info->write_png24 &&
- !mng_info->write_png48 && !mng_info->write_png64 &&
- !mng_info->write_png32) &&
- (mng_info->IsPalette ||
- (image_info->type == BilevelType)) &&
- image_matte == MagickFalse &&
- ping_have_non_bw == MagickFalse)
- {
+ if ((mng_info->write_png_colortype-1 == PNG_COLOR_TYPE_PALETTE) ||
+ ((!mng_info->write_png8 && !mng_info->write_png24 &&
+ !mng_info->write_png48 && !mng_info->write_png64 &&
+ !mng_info->write_png32) &&
+ (mng_info->IsPalette ||
+ (image_info->type == BilevelType)) &&
+ image_matte == MagickFalse &&
+ ping_have_non_bw == MagickFalse))
+ {
/* Palette, Bilevel, or Opaque Monochrome */
QuantumType
quantum_type;
@@ -12520,31 +12520,35 @@
for (source=0; source<8; source++)
{
- value = NULL;
+ value = (const char *) NULL;
- if (source == 0)
- value=GetImageOption(image_info,"png:exclude-chunks");
-
- if (source == 1)
- value=GetImageArtifact(image,"png:exclude-chunks");
-
- if (source == 2)
- value=GetImageOption(image_info,"png:exclude-chunk");
-
- if (source == 3)
- value=GetImageArtifact(image,"png:exclude-chunk");
-
- if (source == 4)
- value=GetImageOption(image_info,"png:include-chunks");
-
- if (source == 5)
- value=GetImageArtifact(image,"png:include-chunks");
-
- if (source == 6)
- value=GetImageOption(image_info,"png:include-chunk");
-
- if (source == 7)
- value=GetImageArtifact(image,"png:include-chunk");
+ switch(source)
+ {
+ case 0:
+ value=GetImageOption(image_info,"png:exclude-chunks");
+ break;
+ case 1:
+ value=GetImageArtifact(image,"png:exclude-chunks");
+ break;
+ case 2:
+ value=GetImageOption(image_info,"png:exclude-chunk");
+ break;
+ case 3:
+ value=GetImageArtifact(image,"png:exclude-chunk");
+ break;
+ case 4:
+ value=GetImageOption(image_info,"png:include-chunks");
+ break;
+ case 5:
+ value=GetImageArtifact(image,"png:include-chunks");
+ break;
+ case 6:
+ value=GetImageOption(image_info,"png:include-chunk");
+ break;
+ case 7:
+ value=GetImageArtifact(image,"png:include-chunk");
+ break;
+ }
if (value == NULL)
continue;
diff --git a/coders/pnm.c b/coders/pnm.c
index 7267401..fd231ef 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -1760,7 +1760,7 @@
{
*q++=(unsigned char) (GetPixelLuma(image,p) >= (QuantumRange/2.0) ?
'0' : '1');
- if ((q-pixels+1) >= (ssize_t) sizeof(pixels))
+ if ((q-pixels+2) >= (ssize_t) sizeof(pixels))
{
*q++='\n';
(void) WriteBlob(image,q-pixels,pixels);
diff --git a/coders/psd-private.h b/coders/psd-private.h
index 84ca9c6..89d9474 100644
--- a/coders/psd-private.h
+++ b/coders/psd-private.h
@@ -27,6 +27,9 @@
char
signature[4];
+ MagickBooleanType
+ has_merged_image;
+
size_t
rows,
columns;
diff --git a/coders/psd.c b/coders/psd.c
index 18986d4..ac3eb6d 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -756,9 +756,8 @@
return(status);
}
-static StringInfo *ParseImageResourceBlocks(Image *image,
- const unsigned char *blocks,size_t length,
- MagickBooleanType *has_merged_image,ExceptionInfo *exception)
+static StringInfo *ParseImageResourceBlocks(PSDInfo *psd_info,Image *image,
+ const unsigned char *blocks,size_t length,ExceptionInfo *exception)
{
const unsigned char
*p;
@@ -837,7 +836,7 @@
case 0x0421:
{
if ((offset > 4) && (*(p+4) == 0))
- *has_merged_image=MagickFalse;
+ psd_info->has_merged_image=MagickFalse;
p+=offset;
break;
}
@@ -1631,9 +1630,11 @@
layer_info=(LayerInfo *) RelinquishMagickMemory(layer_info);
}
-static inline MagickBooleanType PSDSkipImage(const ImageInfo *image_info,
- const size_t index)
+static inline MagickBooleanType PSDSkipImage(const PSDInfo *psd_info,
+ const ImageInfo *image_info,const size_t index)
{
+ if (psd_info->has_merged_image == MagickFalse)
+ return(MagickFalse);
if (image_info->number_scenes == 0)
return(MagickFalse);
if (index < image_info->scene)
@@ -1986,7 +1987,7 @@
for (i=0; i < number_layers; i++)
{
if ((layer_info[i].image == (Image *) NULL) ||
- (PSDSkipImage(image_info,++index) != MagickFalse))
+ (PSDSkipImage(psd_info, image_info,++index) != MagickFalse))
{
for (j=0; j < (ssize_t) layer_info[i].channels; j++)
{
@@ -2118,7 +2119,6 @@
*image;
MagickBooleanType
- has_merged_image,
skip_layers;
MagickOffsetType
@@ -2286,7 +2286,7 @@
}
if ((image->depth == 1) && (image->storage_class != PseudoClass))
ThrowReaderException(CorruptImageError, "ImproperImageHeader");
- has_merged_image=MagickTrue;
+ psd_info.has_merged_image=MagickTrue;
profile=(StringInfo *) NULL;
length=ReadBlobMSBLong(image);
if (length != 0)
@@ -2314,8 +2314,8 @@
blocks=(unsigned char *) RelinquishMagickMemory(blocks);
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
}
- profile=ParseImageResourceBlocks(image,blocks,(size_t) length,
- &has_merged_image,exception);
+ profile=ParseImageResourceBlocks(&psd_info,image,blocks,(size_t) length,
+ exception);
blocks=(unsigned char *) RelinquishMagickMemory(blocks);
}
/*
@@ -2330,7 +2330,7 @@
offset=TellBlob(image);
skip_layers=MagickFalse;
if ((image_info->number_scenes == 1) && (image_info->scene == 0) &&
- (has_merged_image != MagickFalse))
+ (psd_info.has_merged_image != MagickFalse))
{
if (image->debug != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -2383,10 +2383,10 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" reading the precombined layer");
imageListLength=GetImageListLength(image);
- if ((has_merged_image != MagickFalse) || (imageListLength == 1))
- has_merged_image=(MagickBooleanType) ReadPSDMergedImage(image_info,image,
- &psd_info,exception);
- if ((has_merged_image == MagickFalse) && (imageListLength == 1) &&
+ if ((psd_info.has_merged_image != MagickFalse) || (imageListLength == 1))
+ psd_info.has_merged_image=(MagickBooleanType) ReadPSDMergedImage(
+ image_info,image,&psd_info,exception);
+ if ((psd_info.has_merged_image == MagickFalse) && (imageListLength == 1) &&
(length != 0))
{
(void) SeekBlob(image,offset,SEEK_SET);
@@ -2401,7 +2401,7 @@
return((Image *) NULL);
}
}
- if (has_merged_image == MagickFalse)
+ if (psd_info.has_merged_image == MagickFalse)
{
Image
*merged;
@@ -2427,7 +2427,7 @@
next=image;
while (next != (Image *) NULL)
{
- if (PSDSkipImage(image_info,i++) == MagickFalse)
+ if (PSDSkipImage(&psd_info,image_info,i++) == MagickFalse)
(void) SetImageProfile(next,GetStringInfoName(profile),profile,
exception);
next=next->next;
diff --git a/coders/svg.c b/coders/svg.c
index 606d9da..39f5a1d 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -3979,6 +3979,7 @@
{
char
*base64,
+ filename[MagickPathExtent],
message[MagickPathExtent];
Image
@@ -3987,6 +3988,9 @@
ImageInfo
*image_info;
+ MagickBooleanType
+ status;
+
register char
*p;
@@ -4000,6 +4004,15 @@
unsigned char
*blob;
+ image_info=AcquireImageInfo();
+ (void) CopyMagickString(image_info->magick,"TRACE",MagickPathExtent);
+ (void) FormatLocaleString(filename,MagickPathExtent,"trace:%s",
+ image_info->filename);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
+ status=WriteImage(image_info,image,exception);
+ image_info=DestroyImageInfo(image_info);
+ if (status != MagickFalse)
+ return(status);
(void) WriteBlobString(image,
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
(void) WriteBlobString(image,
diff --git a/coders/tiff.c b/coders/tiff.c
index 9bd0c86..8114f05 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -298,6 +298,7 @@
info->mode=10; /* Set the mode to a value that won't change the colorspace */
info->channels=1U;
info->min_channels=1U;
+ info->has_merged_image=MagickFalse;
if (image->storage_class == PseudoClass)
info->mode=2; /* indexed mode */
else
@@ -700,7 +701,11 @@
#if defined(TIFFTAG_XMLPACKET)
if ((TIFFGetField(tiff,TIFFTAG_XMLPACKET,&length,&profile) == 1) &&
(profile != (unsigned char *) NULL))
- (void) ReadProfile(image,"xmp",profile,(ssize_t) length,exception);
+ {
+ (void) ReadProfile(image,"xmp",profile,(ssize_t) length,exception);
+ if (strstr((char *) profile,"dc:format=\"image/dng\"") != (char *) NULL)
+ (void) CopyMagickString(image->magick,"DNG",MagickPathExtent);
+ }
#endif
if ((TIFFGetField(tiff,34118,&length,&profile) == 1) &&
(profile != (unsigned char *) NULL))
diff --git a/coders/tim2.c b/coders/tim2.c
index 4a61654..84decc5 100644
--- a/coders/tim2.c
+++ b/coders/tim2.c
@@ -180,10 +180,10 @@
{
case RGBA16:
/* Documentation specifies padding with zeros for converting from 5 to 8 bits. */
- return ScaleCharToQuantum((word>>channel*5 & ~(~0x0<<5))<<3);
+ return ScaleCharToQuantum((word>>channel*5 & ~(~0x0U<<5))<<3);
case RGB24:
case RGBA32:
- return ScaleCharToQuantum(word>>channel*8 & ~(~0x0<<8));
+ return ScaleCharToQuantum(word>>channel*8 & ~(~0x0U<<8));
default:
return -1;
}
diff --git a/coders/tim2.h b/coders/tim2.h
index 7a76b93..c87949b 100644
--- a/coders/tim2.h
+++ b/coders/tim2.h
@@ -16,7 +16,8 @@
#include "coders/coders-private.h"
-#define MagickTIM2Headers
+#define MagickTIM2Headers \
+ MagickCoderHeader("TM2", 0, "TIM2")
#define MagickTIM2Aliases \
MagickCoderAlias("TIM2","TM2")
diff --git a/coders/url.c b/coders/url.c
index 22414c2..d5d9954 100644
--- a/coders/url.c
+++ b/coders/url.c
@@ -139,7 +139,9 @@
*file;
Image
- *image;
+ *image,
+ *images,
+ *next;
ImageInfo
*read_info;
@@ -147,16 +149,47 @@
int
unique_file;
+ images=(Image *) NULL;
+ image=AcquireImage(image_info,exception);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
+ if (LocaleCompare(read_info->magick,"https") == 0)
+ {
+ MagickBooleanType
+ status;
+
+ /*
+ Leverage delegate to read HTTPS link.
+ */
+ status=InvokeDelegate(read_info,image,"https:decode",(char *) NULL,
+ exception);
+ if (status != MagickFalse)
+ {
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,
+ "%s.dat",read_info->unique);
+ *read_info->magick='\0';
+ images=ReadImage(read_info,exception);
+ (void) RelinquishUniqueFileResource(read_info->filename);
+ if (images != (Image *) NULL)
+ for (next=images; next != (Image *) NULL; next=next->next)
+ (void) CopyMagickString(next->filename,image->filename,
+ MagickPathExtent);
+ }
+ read_info=DestroyImageInfo(read_info);
+ image=DestroyImage(image);
+ return(images);
+ }
+#endif
if (LocaleCompare(read_info->magick,"file") == 0)
{
(void) CopyMagickString(read_info->filename,image_info->filename+2,
MagickPathExtent);
*read_info->magick='\0';
- image=ReadImage(read_info,exception);
+ images=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
- return(GetFirstImageInList(image));
+ image=DestroyImage(image);
+ return(GetFirstImageInList(images));
}
file=(FILE *) NULL;
unique_file=AcquireUniqueFileResource(read_info->filename);
@@ -167,6 +200,7 @@
ThrowFileException(exception,FileOpenError,"UnableToCreateTemporaryFile",
read_info->filename);
read_info=DestroyImageInfo(read_info);
+ image=DestroyImage(image);
return((Image *) NULL);
}
(void) CopyMagickString(filename,image_info->magick,MagickPathExtent);
@@ -174,8 +208,7 @@
LocaleLower(filename);
(void) ConcatenateMagickString(filename,image_info->filename,
MagickPathExtent);
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
- !defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
(void) fclose(file);
if (URLDownloadToFile(NULL,filename,read_info->filename,0,NULL) != S_OK)
{
@@ -183,6 +216,7 @@
filename);
(void) RelinquishUniqueFileResource(read_info->filename);
read_info=DestroyImageInfo(read_info);
+ image=DestroyImage(image);
return((Image *) NULL);
}
#else
@@ -236,18 +270,22 @@
(void) fclose(file);
#endif
*read_info->magick='\0';
- image=ReadImage(read_info,exception);
+ images=ReadImage(read_info,exception);
(void) RelinquishUniqueFileResource(read_info->filename);
+ if (images != (Image *) NULL)
+ for (next=images; next != (Image *) NULL; next=next->next)
+ (void) CopyMagickString(next->filename,image->filename,MagickPathExtent);
read_info=DestroyImageInfo(read_info);
- if (image != (Image *) NULL)
- GetPathComponent(image_info->filename,TailPath,image->filename);
+ image=DestroyImage(image);
+ if (images != (Image *) NULL)
+ GetPathComponent(image_info->filename,TailPath,images->filename);
else
{
(void) ThrowMagickException(exception,GetMagickModule(),CoderError,
"NoDataReturned","`%s'",filename);
return((Image *) NULL);
}
- return(GetFirstImageInList(image));
+ return(GetFirstImageInList(images));
}
/*
@@ -287,10 +325,7 @@
entry->format_type=ImplicitFormatType;
(void) RegisterMagickInfo(entry);
entry=AcquireMagickInfo("URL","HTTPS","Uniform Resource Locator (https://)");
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
- !defined(__MINGW32__)
entry->decoder=(DecodeImageHandler *) ReadURLImage;
-#endif
entry->format_type=ImplicitFormatType;
(void) RegisterMagickInfo(entry);
entry=AcquireMagickInfo("URL","FTP","Uniform Resource Locator (ftp://)");
diff --git a/coders/xpm.c b/coders/xpm.c
index 232ff2d..722d65d 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -72,6 +72,12 @@
#include "MagickCore/utility.h"
/*
+ Global declarations.
+*/
+static SplayTreeInfo
+ *xpm_symbolic = (SplayTreeInfo *) NULL;
+
+/*
Forward declarations.
*/
static MagickBooleanType
@@ -158,7 +164,11 @@
p=source;
while (length-- && (*p != '\0'))
+ {
+ if (*p == '"')
+ break;
*destination++=(*p++);
+ }
if (length != 0)
*destination='\0';
return((ssize_t) (p-source));
@@ -256,12 +266,12 @@
*p,
*q;
- register ssize_t
- x;
-
register Quantum
*r;
+ register ssize_t
+ x;
+
size_t
length;
@@ -362,6 +372,11 @@
*q++=(*p);
}
*q='\0';
+ if (active != MagickFalse)
+ {
+ xpm_buffer=DestroyString(xpm_buffer);
+ ThrowReaderException(CorruptImageError,"UnexpectedEndOfFile");
+ }
/*
Initialize image structure.
*/
@@ -380,6 +395,9 @@
next=NextXPMLine(xpm_buffer);
for (j=0; (j < (ssize_t) image->colors) && (next != (char *) NULL); j++)
{
+ char
+ symbolic[MagickPathExtent];
+
p=next;
next=NextXPMLine(p);
if (next == (char *) NULL)
@@ -395,6 +413,7 @@
q=(char *) NULL;
if (strlen(p) > width)
q=ParseXPMColor(p+width,MagickTrue);
+ *symbolic='\0';
if (q != (char *) NULL)
{
while ((isspace((int) ((unsigned char) *q)) == 0) && (*q != '\0'))
@@ -402,12 +421,17 @@
if ((next-q) < 0)
break;
(void) CopyXPMColor(target,q,MagickMin((size_t) (next-q),
- MagickPathExtent-1));
+ MagickPathExtent-1));
q=ParseXPMColor(target,MagickFalse);
+ (void) CopyXPMColor(symbolic,q,MagickMin((size_t) (next-q),
+ MagickPathExtent-1));
if (q != (char *) NULL)
*q='\0';
}
StripString(target);
+ if (*symbolic != '\0')
+ (void) AddValueToSplayTree(xpm_symbolic,ConstantString(target),
+ ConstantString(symbolic));
grey=strstr(target,"grey");
if (grey != (char *) NULL)
grey[2]='a';
@@ -452,7 +476,10 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ssize_t count=CopyXPMColor(key,p,MagickMin(width,MagickPathExtent-1));
+ ssize_t
+ count;
+
+ count=CopyXPMColor(key,p,MagickMin(width,MagickPathExtent-1));
if (count != (ssize_t) width)
break;
j=(ssize_t) GetValueFromSplayTree(xpm_colors,key);
@@ -511,6 +538,9 @@
MagickInfo
*entry;
+ if (xpm_symbolic == (SplayTreeInfo *) NULL)
+ xpm_symbolic=NewSplayTree(CompareSplayTreeString,RelinquishMagickMemory,
+ RelinquishMagickMemory);
entry=AcquireMagickInfo("XPM","PICON","Personal Icon");
entry->decoder=(DecodeImageHandler *) ReadXPMImage;
entry->encoder=(EncodeImageHandler *) WritePICONImage;
@@ -555,6 +585,8 @@
(void) UnregisterMagickInfo("PICON");
(void) UnregisterMagickInfo("PM");
(void) UnregisterMagickInfo("XPM");
+ if (xpm_symbolic != (SplayTreeInfo *) NULL)
+ xpm_symbolic=DestroySplayTree(xpm_symbolic);
}
/*
@@ -756,9 +788,9 @@
picon->colormap,(size_t) colors,sizeof(*picon->colormap));
if (picon->colormap == (PixelInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationError");
- picon->colormap[colors-1].red=0;
- picon->colormap[colors-1].green=0;
- picon->colormap[colors-1].blue=0;
+ picon->colormap[colors-1].red=0.0;
+ picon->colormap[colors-1].green=0.0;
+ picon->colormap[colors-1].blue=0.0;
picon->colormap[colors-1].alpha=TransparentAlpha;
for (y=0; y < (ssize_t) picon->rows; y++)
{
@@ -1033,6 +1065,9 @@
GetPixelInfo(image,&pixel);
for (i=0; i < (ssize_t) image->colors; i++)
{
+ const char
+ *symbolic;
+
/*
Define XPM color.
*/
@@ -1054,8 +1089,13 @@
symbol[j]=Cixel[k];
}
symbol[j]='\0';
- (void) FormatLocaleString(buffer,MagickPathExtent,
- "\"%.1024s c %.1024s\",\n",symbol,name);
+ symbolic=GetValueFromSplayTree(xpm_symbolic,name);
+ if (symbolic == (const char *) NULL)
+ (void) FormatLocaleString(buffer,MagickPathExtent,
+ "\"%.1024s c %.1024s\",\n",symbol,name);
+ else
+ (void) FormatLocaleString(buffer,MagickPathExtent,
+ "\"%.1024s c %.1024s %.1024s\",\n",symbol,name,symbolic);
(void) WriteBlobString(image,buffer);
}
/*
diff --git a/config/delegates.xml.in b/config/delegates.xml.in
index e0da923..c12eeca 100644
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -64,7 +64,7 @@
<delegate decode="browse" stealth="True" spawn="True" command=""@BrowseDelegate@" https://imagemagick.org/; @RMDelegate@ "%i""/>
<delegate decode="cdr" command=""@UniconvertorDelegate@" "%i" "%o.svg"; @MVDelegate@ "%o.svg" "%o""/>
<delegate decode="cgm" command=""@UniconvertorDelegate@" "%i" "%o.svg"; @MVDelegate@ "%o.svg" "%o""/>
- <delegate decode="https" command=""@WWWDecodeDelegate@" -s -k -L -o "%o" "https:%M""/>
+ <delegate decode="https:decode" command=""@WWWDecodeDelegate@" -s -k -L -o "%u.dat" "https:%M""/>
<delegate decode="doc" command=""@DOCDecodeDelegate@" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; @MVDelegate@ "%i.pdf" "%o""/>
<delegate decode="docx" command=""@DOCDecodeDelegate@" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; @MVDelegate@ "%i.pdf" "%o""/>
<delegate decode="dng:decode" command=""@DNGDecodeDelegate@" --silent --create-id=also --out-type=png --out-depth=16 "--output=%u.png" "%i""/>
@@ -92,6 +92,7 @@
<delegate decode="pcl:mono" stealth="True" command=""@PCLDelegate@" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@PCLMonoDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/>
<delegate decode="pdf" encode="eps" mode="bi" command=""@PSDelegate@" -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 -sPDFPassword="%a" "-sDEVICE=@GSEPSDevice@" "-sOutputFile=%o" "-f%i""/>
<delegate decode="pdf" encode="ps" mode="bi" command=""@PSDelegate@" -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@GSPSDevice@" -sPDFPassword="%a" "-sOutputFile=%o" "-f%i""/>
+ <delegate decode="pnm" encode="trace" command=""@TraceEncodeDelegate@" --svg --output "%o" "%i""/>
<delegate decode="png" encode="webp" command=""@WebPEncodeDelegate@" -quiet %Q "%i" -o "%o""/>
<delegate decode="pnm" encode="ilbm" mode="encode" command=""@ILBMEncodeDelegate@" -24if "%i" > "%o""/>
<delegate decode="bmp" encode="jxr" command="@MVDelegate@ "%i" "%i.bmp"; "@JXREncodeDelegate@" -i "%i.bmp" -o "%o.jxr"; @MVDelegate@ "%i.bmp" "%i"; @MVDelegate@ "%o.jxr" "%o""/>
diff --git a/configure b/configure
index b2f2969..041daeb 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.8-60.
+# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-64.
#
# 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.8-60'
-PACKAGE_STRING='ImageMagick 7.0.8-60'
+PACKAGE_VERSION='7.0.8-64'
+PACKAGE_STRING='ImageMagick 7.0.8-64'
PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues'
PACKAGE_URL='https://imagemagick.org'
@@ -696,6 +696,7 @@
WebPEncodeDelegate
WebPDecodeDelegate
UniconvertorDelegate
+TraceEncodeDelegate
SVGDecodeDelegate
RSVGDecodeDelegate
RMDelegate
@@ -1852,7 +1853,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.8-60 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 7.0.8-64 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1927,7 +1928,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ImageMagick 7.0.8-60:";;
+ short | recursive ) echo "Configuration of ImageMagick 7.0.8-64:";;
esac
cat <<\_ACEOF
@@ -2219,7 +2220,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ImageMagick configure 7.0.8-60
+ImageMagick configure 7.0.8-64
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3270,7 +3271,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.8-60, which was
+It was created by ImageMagick $as_me 7.0.8-64, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4256,7 +4257,7 @@
# Define the identity of the package.
PACKAGE='ImageMagick'
- VERSION='7.0.8-60'
+ VERSION='7.0.8-64'
cat >>confdefs.h <<_ACEOF
@@ -4566,11 +4567,11 @@
MAGICK_MICRO_VERSION=8
-MAGICK_PATCHLEVEL_VERSION=60
+MAGICK_PATCHLEVEL_VERSION=64
-MAGICK_VERSION=7.0.8-60
+MAGICK_VERSION=7.0.8-64
-MAGICK_GIT_REVISION=15992:baab586bc:20190804
+MAGICK_GIT_REVISION=16092:3f9fddd3b:20190831
# Substitute library versioning
@@ -9285,7 +9286,9 @@
if test "x$ax_cv_gcc_archflag" = xunknown; then
:
else
+
CFLAGS="$CFLAGS $ax_cv_gcc_archflag"
+ CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"
fi
@@ -34159,6 +34162,7 @@
RMDelegateDefault='rm'
RSVGDecodeDelegateDefault='rsvg-convert'
SVGDecodeDelegateDefault='inkscape'
+TraceEncodeDelegateDefault='potrace'
UniconvertorDelegateDefault='uniconvertor'
WebPDecodeDelegateDefault='dwebp'
WebPEncodeDelegateDefault='cwebp'
@@ -35535,6 +35539,47 @@
fi
+# Extract the first word of ""$TraceEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$TraceEncodeDelegateDefault"; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_TraceEncodeDelegate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $TraceEncodeDelegate in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_TraceEncodeDelegate="$TraceEncodeDelegate" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_TraceEncodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_TraceEncodeDelegate" && ac_cv_path_TraceEncodeDelegate=""$TraceEncodeDelegateDefault""
+ ;;
+esac
+fi
+TraceEncodeDelegate=$ac_cv_path_TraceEncodeDelegate
+if test -n "$TraceEncodeDelegate"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TraceEncodeDelegate" >&5
+$as_echo "$TraceEncodeDelegate" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
# Extract the first word of ""$UniconvertorDelegateDefault"", so it can be a program name with args.
set dummy "$UniconvertorDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35949,6 +35994,7 @@
RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
SVGDecodeDelegate="$SVGDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
+ TraceEncodeDelegate="$TraceEncodeDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
WebPDecodeDelegate="$WebPDecodeDelegateDefault"
WebPEncodeDelegate="$WebPEncodeDelegateDefault"
@@ -35987,6 +36033,7 @@
+
#
# RPM support.
#
@@ -37780,7 +37827,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.8-60, which was
+This file was extended by ImageMagick $as_me 7.0.8-64, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -37847,7 +37894,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.8-60
+ImageMagick config.status 7.0.8-64
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 6dae9f9..81d8672 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
m4_define([magick_major_version], [7])
m4_define([magick_minor_version], [0])
m4_define([magick_micro_version], [8])
-m4_define([magick_patchlevel_version], [60])
+m4_define([magick_patchlevel_version], [64])
m4_define([magick_version],
[magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
m4_define([magick_git_revision], esyscmd([sh -c "(gitversion.sh .) | awk '{ print \$1 }' | tr -d '\n'"]))
@@ -298,7 +298,9 @@
AC_PROG_MKDIR_P
AM_WITH_DMALLOC
AX_C___ATTRIBUTE__
-AX_GCC_ARCHFLAG([yes])
+AX_GCC_ARCHFLAG([yes], [
+ CFLAGS="$CFLAGS $ax_cv_gcc_archflag"
+ CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"])
PKG_PROG_PKG_CONFIG([0.20])
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
@@ -3197,6 +3199,7 @@
RMDelegateDefault='rm'
RSVGDecodeDelegateDefault='rsvg-convert'
SVGDecodeDelegateDefault='inkscape'
+TraceEncodeDelegateDefault='potrace'
UniconvertorDelegateDefault='uniconvertor'
WebPDecodeDelegateDefault='dwebp'
WebPEncodeDelegateDefault='cwebp'
@@ -3243,6 +3246,7 @@
AC_PATH_PROG(RMDelegate, "$RMDelegateDefault", "$RMDelegateDefault")
AC_PATH_PROG(RSVGDecodeDelegate, "$RSVGDecodeDelegateDefault", "$RSVGDecodeDelegateDefault")
AC_PATH_PROG(SVGDecodeDelegate, "$SVGDecodeDelegateDefault", "$SVGDecodeDelegateDefault")
+AC_PATH_PROG(TraceEncodeDelegate, "$TraceEncodeDelegateDefault", "$TraceEncodeDelegateDefault")
AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault")
AC_PATH_PROG(WebPDecodeDelegate, "$WebPDecodeDelegateDefault", "$WebPDecodeDelegateDefault")
AC_PATH_PROG(WebPEncodeDelegate, "$WebPEncodeDelegateDefault", "$WebPEncodeDelegateDefault")
@@ -3442,6 +3446,7 @@
RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
SVGDecodeDelegate="$SVGDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
+ TraceEncodeDelegate="$TraceEncodeDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
WebPDecodeDelegate="$WebPDecodeDelegateDefault"
WebPEncodeDelegate="$WebPEncodeDelegateDefault"
@@ -3474,6 +3479,7 @@
AC_SUBST(PCLDelegate)
AC_SUBST(PSDelegate)
AC_SUBST(ShowImageDelegate)
+AC_SUBST(TraceEncodeDelegate)
AC_SUBST(UniconvertorDelegate)
AC_SUBST(WebPDecodeDelegate)
AC_SUBST(WebPEncodeDelegate)
diff --git a/index.html b/index.html
index 0d01507..22efa9f 100644
--- a/index.html
+++ b/index.html
@@ -44,7 +44,7 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
- <li class="nav-item ">
+ <li class="nav-item active">
<a class="nav-link" href="index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -93,16 +94,15 @@
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 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.8-42</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>, Android OS, and others.</p>
+<p>The current release is ImageMagick <a href="www/download.html">7.0.8-63</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="index.html">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>
-<div class="table-responsive">
+<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>
@@ -286,4 +286,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 27th April 2019 17:05 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:07 -->
\ No newline at end of file
diff --git a/version.sh b/version.sh
index 51f362f..71cd0d1 100644
--- a/version.sh
+++ b/version.sh
@@ -19,7 +19,7 @@
PACKAGE_VERSION='7.0.8'
PACKAGE_PERL_VERSION='7.0.8'
PACKAGE_LIB_VERSION="0x708"
-PACKAGE_RELEASE="60"
+PACKAGE_RELEASE="64"
PACKAGE_LIB_VERSION_NUMBER="7,0,8,${PACKAGE_RELEASE}"
PACKAGE_RELEASE_DATE_RAW=`date +%F`
PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}"
diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html
index 22a4d89..f069729 100644
--- a/www/ImageMagickObject.html
+++ b/www/ImageMagickObject.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -91,7 +92,7 @@
<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="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>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="../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>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>
@@ -159,4 +160,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 17:47 -->
\ No newline at end of file
diff --git a/www/Magick++/Documentation.html b/www/Magick++/Documentation.html
index 03865a0..6f560ef 100644
--- a/www/Magick++/Documentation.html
+++ b/www/Magick++/Documentation.html
@@ -4,17 +4,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Magick++ API Documentation</title>
-<link rel="stylesheet" href="https://imagemagick.org/Magick++/magick.css" type="text/css" />
+<link rel="stylesheet" href="magick.css" type="text/css" />
</head>
<body>
<p class="image"><img src="Magick++.png" name="Graphic1" align="bottom" width="464" height="134" border="0" /></p>
<div class="doc-section">
-<p><a href="../Magick++.2">Magick++</a> provides a simple C++ API to the ImageMagick image processing library which supports reading and writing a huge number of image formats as well as supporting a broad spectrum of traditional image processing operations. The ImageMagick C API is complex and the data structures are currently not documented. Magick++ provides access to most of the features available from the C API but in a simple object-oriented and well-documented framework.</p>
+<p><a href="http://www.imagemagick.org/Magick++">Magick++</a> provides a simple C++ API to the ImageMagick image processing library which supports reading and writing a huge number of image formats as well as supporting a broad spectrum of traditional image processing operations. The ImageMagick C API is complex and the data structures are currently not documented. Magick++ provides access to most of the features available from the C API but in a simple object-oriented and well-documented framework.</p>
<p>Magick++ is intended to support commercial-grade application development. In order to avoid possible conflicts with the user's application, all symbols contained in Magick++ (included by the header <tt><font color="#663366"><Magick++.h></font></tt>) are scoped to the <span lang="en-US">namespace</span> <i>Magick</i>. Symbols from the ImageMagick C library are imported under the <i>MagickCore</i> namespace to avoid possible conflicts and ImageMagick macros are only included within the Magick++ implementation so they won't impact the user's application.</p>
-<p>The core class in Magick++ is the <a href="Image++.html">Image</a> class. The Image class provides methods to manipulate a single image frame (e.g. a JPEG image). Standard Template Library (STL)<span lang="en-US">compatible</span> <a href="https://imagemagick.org/Magick++/STL.html">algorithms and function objects</a> are provided in order to manipulate multiple image frames or to read and write file formats which support multiple image frames (e.g. GIF animations, MPEG animations, and Postscript files).</p>
+<p>The core class in Magick++ is the <a href="Image++.html">Image</a> class. The Image class provides methods to manipulate a single image frame (e.g. a JPEG image). Standard Template Library (STL)<span lang="en-US">compatible</span> <a href="STL.html">algorithms and function objects</a> are provided in order to manipulate multiple image frames or to read and write file formats which support multiple image frames (e.g. GIF animations, MPEG animations, and Postscript files).</p>
<p>The Image class supports reference-counted memory management which supports the semantics of an intrinsic variable type (e.g. 'int') with an extremely efficient <tt>operator =</tt> and copy constructor (only a pointer is assigned) while ensuring that the image data is replicated as required so that it the image may be modified without impacting earlier generations. Since the Image class manages heap memory internally, images are best allocated via C++ automatic (stack-based) memory allocation. This support allows most programs using Magick++ to be written without using any pointers, simplifying the implementation and avoiding the risks of using pointers. When a program uses automatic memory allocation to allocate Magick++ images, that aspect of the program becomes naturally exception-safe and thread-safe.</p>
-<p>The image class uses a number of supportive classes in order to specify arguments. Colors are specified via the <a href="https://imagemagick.org/Magick++/Color.html">Color</a> class. Colors specified in X11-style string form are implicitly converted to the Color class. Geometry arguments (those specifying width, height, and/or x and y offset) are specified via the <a href="https://imagemagick.org/Magick++/Geometry.html">Geometry</a> class. Similar to the Color class, geometries specified as an X11-style string are implicitly converted to the Geometry class. Two dimensional drawable objects are specified via the <a href="https://imagemagick.org/Magick++/Drawable.html">Drawable</a> class. Drawable objects may be provided as a single object or as a list of objects to be rendered using the current image options. Montage options (a montage is a rendered grid of thumbnails in one image) are specified via the <a href="https://imagemagick.org/Magick++/Montage.html">Montage</a> class.</p>
-<p>Errors are reported using C++ exceptions derived from the <a href="https://imagemagick.org/Magick++/Exception.html">Exception</a> class, which is itself derived from the standard C++ exception class. Exceptions are reported synchronous with the operation and are caught by the first matching <i>try</i> block as the stack is unraveled. This allows a clean coding style in which multiple related Magick++ commands may be executed with errors handled as a unit rather than line-by-line. Since the Image object provides reference-counted memory management, unreferenced images on the stack are automagically cleaned up, avoiding the potential for memory leaks.</p>
+<p>The image class uses a number of supportive classes in order to specify arguments. Colors are specified via the <a href="Color.html">Color</a> class. Colors specified in X11-style string form are implicitly converted to the Color class. Geometry arguments (those specifying width, height, and/or x and y offset) are specified via the <a href="Geometry.html">Geometry</a> class. Similar to the Color class, geometries specified as an X11-style string are implicitly converted to the Geometry class. Two dimensional drawable objects are specified via the <a href="Drawable.html">Drawable</a> class. Drawable objects may be provided as a single object or as a list of objects to be rendered using the current image options. Montage options (a montage is a rendered grid of thumbnails in one image) are specified via the <a href="Montage.html">Montage</a> class.</p>
+<p>Errors are reported using C++ exceptions derived from the <a href="Exception.html">Exception</a> class, which is itself derived from the standard C++ exception class. Exceptions are reported synchronous with the operation and are caught by the first matching <i>try</i> block as the stack is unraveled. This allows a clean coding style in which multiple related Magick++ commands may be executed with errors handled as a unit rather than line-by-line. Since the Image object provides reference-counted memory management, unreferenced images on the stack are automagically cleaned up, avoiding the potential for memory leaks.</p>
<p style="margin-bottom: 0cm">For ease of access, the documentation for the available user-level classes is available via the following table.</p>
<br />
<table border="1" class="docutils">
@@ -24,39 +24,39 @@
<col width="82%" />
</colgroup>
<tbody valign="top">
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/Blob.html">Blob</a></td>
+<tr><td><a class="reference external" href="Blob.html">Blob</a></td>
<td>Binary Large OBject container.</td>
</tr>
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/CoderInfo.html">CoderInfo</a></td>
+<tr><td><a class="reference external" href="CoderInfo.html">CoderInfo</a></td>
<td>Report information about supported image formats (use with
-<a class="reference external" href="https://imagemagick.org/Magick++/STL.html#coderInfoList">coderInfoList</a>())</td>
+<a class="reference external" href="STL.html#coderInfoList">coderInfoList</a>())</td>
</tr>
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/Color.html">Color</a></td>
+<tr><td><a class="reference external" href="Color.html">Color</a></td>
<td>Color specification.</td>
</tr>
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/Drawable.html">Drawable</a></td>
+<tr><td><a class="reference external" href="Drawable.html">Drawable</a></td>
<td>Drawable shape (for input to 'draw').</td>
</tr>
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/Exception.html">Exception</a></td>
+<tr><td><a class="reference external" href="Exception.html">Exception</a></td>
<td>C++ exception objects.</td>
</tr>
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/Geometry.html">Geometry</a></td>
+<tr><td><a class="reference external" href="Geometry.html">Geometry</a></td>
<td>Geometry specification.</td>
</tr>
<tr><td><a class="reference external" href="Image++.html">Image</a></td>
<td>Image frame. This is the primary object in <em>Magick++</em>.</td>
</tr>
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/Montage.html">Montage</a></td>
+<tr><td><a class="reference external" href="Montage.html">Montage</a></td>
<td>Montage options for montageImages().</td>
</tr>
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/Pixels.html">Pixels</a></td>
+<tr><td><a class="reference external" href="Pixels.html">Pixels</a></td>
<td>Low-level access to image pixels.</td>
</tr>
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/STL.html">STL</a></td>
+<tr><td><a class="reference external" href="STL.html">STL</a></td>
<td>STL algorithms and function objects for operating on
containers of image frames.</td>
</tr>
-<tr><td><a class="reference external" href="https://imagemagick.org/Magick++/TypeMetric.html">TypeMetric</a></td>
+<tr><td><a class="reference external" href="TypeMetric.html">TypeMetric</a></td>
<td>Container for font type metrics (use with
<a class="reference external" href="Image++.html#fonttypemetrics">Image::fontTypeMetrics</a>).</td>
</tr>
diff --git a/www/Magick++/Drawable.html b/www/Magick++/Drawable.html
index 03316df..739d668 100644
--- a/www/Magick++/Drawable.html
+++ b/www/Magick++/Drawable.html
@@ -9,7 +9,7 @@
<body>
<div class="doc-section">
<h1 style="text-align:center">Magick::Drawable</h1>
-<p>Drawable provides a convenient interface for preparing vector, image, or text arguments for the Image::draw() method. Each instance of a Drawable sub-class represents a single drawable object. Drawable objects may be drawn "one-by-one" via multiple invocations of the Image <a href="https://imagemagick.org/Magick++/Image++.html#draw">draw</a>() method, or may be drawn "all-at-once" by passing a list of Drawable objects to the Image <a href="https://imagemagick.org/Magick++/Image++.html#draw">draw</a>() method. The one-by-one approach is convenient for simple drawings, while the list-based approach is appropriate for drawings which require more sophistication.</p>
+<p>Drawable provides a convenient interface for preparing vector, image, or text arguments for the Image::draw() method. Each instance of a Drawable sub-class represents a single drawable object. Drawable objects may be drawn "one-by-one" via multiple invocations of the Image <a href="Image++.html#draw">draw</a>() method, or may be drawn "all-at-once" by passing a list of Drawable objects to the Image <a href="Image++.html#draw">draw</a>() method. The one-by-one approach is convenient for simple drawings, while the list-based approach is appropriate for drawings which require more sophistication.</p>
<p>The following is an example using the Drawable subclasses with a one-by-one approach to draw the following figure:</p>
<p class="image"><font color="#000000"><font color="#000000"><img
src="Drawable_example_1.png" name="Graphic1" align="bottom" border="3"
diff --git a/www/Magick++/Image++.html b/www/Magick++/Image++.html
index ad3fa05..6f7d166 100644
--- a/www/Magick++/Image++.html
+++ b/www/Magick++/Image++.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Magick++ API: Working with Images</title>
-<link rel="stylesheet" href="magick.css" type="text/css" />
+<link rel="stylesheet" href="http://www.imagemagick.org/Magick++/magick.css" type="text/css" />
</head>
<body>
<div class="doc-section">
@@ -22,8 +22,8 @@
Access</a> </li>
</ul>
<p>Image is the primary object in Magick++ and represents
-a single image frame (see <a href="ImageDesign.html">design</a> ). The
-<a href="STL.html">STL interface</a> <b>must</b> be used to operate on
+a single image frame (see <a href="http://www.imagemagick.org/Magick++/ImageDesign.html">design</a> ). The
+<a href="http://www.imagemagick.org/Magick++/STL.html">STL interface</a> <b>must</b> be used to operate on
image sequences or images (e.g. of format GIF, TIFF, MIFF, Postscript,
& MNG) which are comprized of multiple image frames. Individual
frames of a multi-frame image may be requested by adding array-style
@@ -31,7 +31,7 @@
the fourth frame of a GIF animation.  Various image manipulation
operations may be applied to the image. Attributes may be set on the
image to influence the operation of the manipulation operations. The <a
- href="Pixels.html"> Pixels</a> class provides low-level access to
+ href="http://www.imagemagick.org/Magick++/Pixels.html"> Pixels</a> class provides low-level access to
image
pixels. As a convenience, including <tt><font color="#663366"><Magick++.h></font></tt>
is sufficient in order to use the complete Magick++ API. The Magick++
@@ -159,7 +159,7 @@
read-from a disk file, encoded images may also reside in memory.
Encoded
images in memory are known as BLOBs (Binary Large OBjects) and may be
-represented using the <a href="Blob.html">Blob</a> class. The encoded
+represented using the <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a> class. The encoded
image may be initially placed in memory by reading it directly from a
file, reading the image from a database, memory-mapped from a disk
file, or could be written to memory by Magick++. Once the encoded image
@@ -218,7 +218,7 @@
</center>
Image may be constructed in a number of ways. It may be constructed
from a file, a URL, or an encoded image (e.g. JPEG) contained in an
-in-memory <a href="Blob.html"> BLOB</a> . The available Image
+in-memory <a href="http://www.imagemagick.org/Magick++/Blob.html"> BLOB</a> . The available Image
constructors are shown in the following table: <br />
  <br />
 
@@ -240,15 +240,15 @@
</tr>
<tr>
<td><font size="-1">const Geometry &size_, const <a
- href="Color.html"> Color</a> &color_</font></td>
+ href="http://www.imagemagick.org/Magick++/Color.html"> Color</a> &color_</font></td>
<td><font size="-1">Construct a blank image canvas of specified
size and color</font></td>
</tr>
<tr>
<td><a name="constructor_blob"></a> <font size="-1">const <a
- href="Blob.html">Blob</a> &blob_</font></td>
+ href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a> &blob_</font></td>
<td rowspan="5"><font size="-1">Construct Image by reading from
-encoded image data contained in an in-memory <a href="Blob.html">BLOB</a>
+encoded image data contained in an in-memory <a href="http://www.imagemagick.org/Magick++/Blob.html">BLOB</a>
. Depending on the constructor arguments, the Blob <a href="Image++.html#size">size</a>
, <a href="Image++.html#depth">depth</a> , <a href="Image++.html#magick">magick</a> (format)
may
@@ -261,22 +261,22 @@
href="Image++.html#magick">magick</a> ) must be specified.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Blob.html">Blob</a>
-&blob_, const <a href="Geometry.html">Geometry</a> &size_</font></td>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a>
+&blob_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> &size_</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Blob.html">Blob</a>
-&blob_, const <a href="Geometry.html">Geometry</a> &size,
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a>
+&blob_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> &size,
size_t depth</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Blob.html">Blob</a>
-&blob_, const <a href="Geometry.html">Geometry</a> &size,
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a>
+&blob_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> &size,
size_t depth_, const string &magick_</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Blob.html">Blob</a>
-&blob_, const <a href="Geometry.html">Geometry</a> &size,
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a>
+&blob_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> &size,
const
string &magick_</font></td>
</tr>
@@ -284,7 +284,7 @@
<td><font size="-1">const size_t width_, </font> <br />
<font size="-1">const size_t height_,</font> <br />
<font size="-1">std::string map_,</font> <br />
- <font size="-1">const <a href="Enumerations.html#StorageType">
+ <font size="-1">const <a href="http://www.imagemagick.org/Magick++/Enumerations.html#StorageType">
StorageType</a> type_,</font> <br />
<font size="-1">const void *pixels_</font></td>
<td><font size="-1">Construct a new Image based on an array of
@@ -316,7 +316,7 @@
</tr>
<tr>
<td><font size="-1">type_</font></td>
- <td><font size="-1"><a href="Enumerations.html#StorageType">Pixel
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#StorageType">Pixel
storage type</a> (CharPixel, ShortPixel, IntegerPixel, FloatPixel, or
DoublePixel)</font></td>
</tr>
@@ -341,7 +341,7 @@
image-list) manipulation operations provided by the ImageMagick
library. If you
must process a multi-image file (such as an animation), the <a
- href="STL.html"> STL interface</a> , which provides a multi-image
+ href="http://www.imagemagick.org/Magick++/STL.html"> STL interface</a> , which provides a multi-image
abstraction on top of <i>Image</i>, must be used.
<p>Image manipulation methods are very easy to use.  For example: </p>
<pre class="code">
@@ -385,7 +385,7 @@
<td style="text-align: center;">
<center><a name="addNoise"></a> <font size="-1">addNoise</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#NoiseType">NoiseType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#NoiseType">NoiseType</a>
noiseType_</font></td>
<td><font size="-1">Add noise to image with specified noise type.</font></td>
</tr>
@@ -419,13 +419,13 @@
<center><a name="annotate"></a> <font size="-1">annotate</font></center>
</td>
<td><font size="-1">const std::string &text_, const <a
- href="Geometry.html"> Geometry</a> &location_</font></td>
+ href="http://www.imagemagick.org/Magick++/Geometry.html"> Geometry</a> &location_</font></td>
<td><font size="-1">Annotate using specified text, and placement
location</font></td>
</tr>
<tr>
- <td><font size="-1">string text_, const <a href="Geometry.html">Geometry</a>
-&boundingArea_, <a href="Enumerations.html#GravityType">GravityType</a>
+ <td><font size="-1">string text_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
+&boundingArea_, <a href="http://www.imagemagick.org/Magick++/Enumerations.html#GravityType">GravityType</a>
gravity_</font></td>
<td><font size="-1">Annotate using specified text, bounding area,
and placement gravity. If <i>boundingArea_</i> is invalid, then
@@ -433,8 +433,8 @@
</tr>
<tr>
<td><font size="-1">const std::string &text_, const <a
- href="Geometry.html"> Geometry</a> &boundingArea_, <a
- href="Enumerations.html#GravityType">GravityType</a> gravity_, double
+ href="http://www.imagemagick.org/Magick++/Geometry.html"> Geometry</a> &boundingArea_, <a
+ href="http://www.imagemagick.org/Magick++/Enumerations.html#GravityType">GravityType</a> gravity_, double
degrees_, </font></td>
<td><font size="-1">Annotate with text using specified text,
bounding area, placement gravity, and rotation. If <i>boundingArea_</i>
@@ -442,7 +442,7 @@
</tr>
<tr>
<td><font size="-1">const std::string &text_, <a
- href="Enumerations.html#GravityType"> GravityType</a> gravity_</font></td>
+ href="http://www.imagemagick.org/Magick++/Enumerations.html#GravityType"> GravityType</a> gravity_</font></td>
<td><font size="-1">Annotate with text (bounding area is entire
image) and placement gravity.</font></td>
</tr>
@@ -477,7 +477,7 @@
<td style="text-align: center;">
<center><a name="border"></a> <font size="-1">border</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_ = "6x6+0+0"</font></td>
<td><font size="-1">Border image (add border to image).  The
color of the border is specified by the <i>borderColor</i> attribute.</font></td>
@@ -493,7 +493,7 @@
<td style="text-align: center;">
<center><a name="channel"></a> <font size="-1">channel</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#ChannelType">ChannelType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#ChannelType">ChannelType</a>
layer_</font></td>
<td><font size="-1">Extract channel from image. Use this option
to extract a particular channel from  the image.  <i>MatteChannel</i>
@@ -515,7 +515,7 @@
<td style="text-align: center;">
<center><a name="chop"></a> <font size="-1">chop</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_</font></td>
<td><font size="-1">Chop image (remove vertical or horizontal
subregion of image)</font></td>
@@ -547,7 +547,7 @@
Use  this  method to  assign a specific comment to the
image.  Optionally you can include the image filename, type,
width, height, or other  image  attributes by embedding <a
- href="FormatCharacters.html">special format characters.</a> </font></td>
+ href="http://www.imagemagick.org/Magick++/FormatCharacters.html">special format characters.</a> </font></td>
</tr>
<tr>
<td style="text-align: center;" valign="middle"><font size="-1"><a
@@ -571,7 +571,7 @@
</td>
<td><font size="-1">const <a href="Image++.html">Image</a>
&compositeImage_, ssize_t xOffset_, ssize_t yOffset_, <a
- href="Enumerations.html#CompositeOperator"> CompositeOperator</a>
+ href="http://www.imagemagick.org/Magick++/Enumerations.html#CompositeOperator"> CompositeOperator</a>
compose_ = <i>InCompositeOp</i></font></td>
<td><font size="-1">Compose an image onto the current image at
offset specified by <i>xOffset_</i>, <i>yOffset_ </i>using the
@@ -579,8 +579,8 @@
</tr>
<tr>
<td><font size="-1">const <a href="Image++.html">Image</a>
-&compositeImage_, const <a href="Geometry.html">Geometry</a>
-&offset_, <a href="Enumerations.html#CompositeOperator">CompositeOperator</a>
+&compositeImage_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
+&offset_, <a href="http://www.imagemagick.org/Magick++/Enumerations.html#CompositeOperator">CompositeOperator</a>
compose_ = <i>InCompositeOp</i></font></td>
<td><font size="-1">Compose an image onto the current image at
offset specified by <i>offset_</i> using the composition algorithm
@@ -588,8 +588,8 @@
</tr>
<tr>
<td><font size="-1">const <a href="Image++.html">Image</a>
-&compositeImage_, <a href="Enumerations.html#GravityType">GravityType</a>
-gravity_, <a href="Enumerations.html#CompositeOperator">CompositeOperator</a>
+&compositeImage_, <a href="http://www.imagemagick.org/Magick++/Enumerations.html#GravityType">GravityType</a>
+gravity_, <a href="http://www.imagemagick.org/Magick++/Enumerations.html#CompositeOperator">CompositeOperator</a>
compose_ = <i>InCompositeOp</i></font></td>
<td><font size="-1">Compose an image onto the current image with
placement specified by <i>gravity_ </i>using the composition
@@ -619,7 +619,7 @@
<td style="text-align: center;">
<center><a name="crop"></a> <font size="-1">crop</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_</font></td>
<td><font size="-1">Crop image (subregion of original image)</font></td>
</tr>
@@ -660,12 +660,12 @@
<td style="text-align: center;" rowspan="2">
<center><a name="draw"></a> <font size="-1">draw</font></center>
</td>
- <td><font size="-1">const <a href="Drawable.html">Drawable</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Drawable.html">Drawable</a>
&drawable_</font></td>
<td><font size="-1">Draw shape or text on image.</font></td>
</tr>
<tr>
- <td><font size="-1">const std::list<<a href="Drawable.html">Drawable</a>
+ <td><font size="-1">const std::list<<a href="http://www.imagemagick.org/Magick++/Drawable.html">Drawable</a>
> &drawable_</font></td>
<td><font size="-1">Draw shapes or text on image using a set of
Drawable objects contained in an STL list. Use of this method improves
@@ -717,22 +717,22 @@
<tr>
<td style="text-align: center;" rowspan="4">
<center><a name="extent"></a> <font size="-1">extent</font></center></td>
- <td><font size="-1">const <a href="Geometry.html"> Geometry</a> &geometry_</font></td>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html"> Geometry</a> &geometry_</font></td>
<td rowspan="2"><font size="-1">extends the image as defined by the geometry, gravity, and image background color.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
-&geometry_, const <a href="Color.html">Color</a> &backgroundColor_</font></td>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
+&geometry_, const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> &backgroundColor_</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Geometry.html"> Geometry</a> &geometry_, const <a href="Enumerations.html#GravityType">GravityType</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html"> Geometry</a> &geometry_, const <a href="http://www.imagemagick.org/Magick++/Enumerations.html#GravityType">GravityType</a>
&gravity_</font></td>
<td rowspan="2"><font size="-1">extends the image as defined by the geometry, gravity, and image background color.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
-&geometry_, const <a href="Color.html">Color</a> &backgroundColor_,
-const <a href="Enumerations.html#GravityType">GravityType</a> &gravity_</font></td>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
+&geometry_, const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> &backgroundColor_,
+const <a href="http://www.imagemagick.org/Magick++/Enumerations.html#GravityType">GravityType</a> &gravity_</font></td>
</tr>
<tr>
<td style="text-align: center;">
@@ -749,28 +749,28 @@
<font size="-1">Color</font></center>
</td>
<td><font size="-1">ssize_t x_, ssize_t y_, const <a
- href="Color.html"> Color</a> &fillColor_</font></td>
+ href="http://www.imagemagick.org/Magick++/Color.html"> Color</a> &fillColor_</font></td>
<td rowspan="2"><font size="-1">Flood-fill color across pixels
that match the color of the target pixel and are neighbors of the
target pixel. Uses current fuzz setting when determining color match.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
-&point_, const <a href="Color.html">Color</a> &fillColor_</font></td>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
+&point_, const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> &fillColor_</font></td>
</tr>
<tr>
<td><font size="-1">ssize_t x_, ssize_t y_, const <a
- href="Color.html"> Color</a> &fillColor_, const <a
- href="Color.html">Color</a>
+ href="http://www.imagemagick.org/Magick++/Color.html"> Color</a> &fillColor_, const <a
+ href="http://www.imagemagick.org/Magick++/Color.html">Color</a>
&borderColor_</font></td>
<td rowspan="2"><font size="-1">Flood-fill color across pixels
starting at target-pixel and stopping at pixels matching specified
border color. Uses current fuzz setting when determining color match.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
-&point_, const <a href="Color.html">Color</a> &fillColor_,
-const <a href="Color.html">Color</a> &borderColor_</font></td>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
+&point_, const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> &fillColor_,
+const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> &borderColor_</font></td>
</tr>
<tr>
<td style="text-align: center;"><a name="floodFillOpacity"></a> <font
@@ -794,19 +794,19 @@
target pixel. Uses current fuzz setting when determining color match.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&point_, const Image &texture_</font></td>
</tr>
<tr>
<td><font size="-1">ssize_t x_, ssize_t y_, const Image
-&texture_, const <a href="Color.html">Color</a> &borderColor_</font></td>
+&texture_, const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> &borderColor_</font></td>
<td rowspan="2"><font size="-1">Flood-fill texture across pixels
starting at target-pixel and stopping at pixels matching specified
border color. Uses current fuzz setting when determining color match.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
-&point_, const Image &texture_, const <a href="Color.html">
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
+&point_, const Image &texture_, const <a href="http://www.imagemagick.org/Magick++/Color.html">
Color</a>
&borderColor_</font></td>
</tr>
@@ -822,7 +822,7 @@
<td style="text-align: center;" rowspan="2">
<center><a name="frame"></a> <font size="-1">frame</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_ = "25x25+6+6"</font></td>
<td rowspan="2"><font size="-1">Add decorative frame around image</font></td>
</tr>
@@ -910,7 +910,7 @@
<td><font size="-1">Assign a label to an image. Use this option
to  assign  a  specific label to the image. Optionally
you can include the image filename, type, width, height, or scene
-number in the label by embedding  <a href="FormatCharacters.html">
+number in the label by embedding  <a href="http://www.imagemagick.org/Magick++/FormatCharacters.html">
special format characters.</a> If the first character of string is @,
the
image label is read from a file titled by the remaining characters in
@@ -984,10 +984,10 @@
<td style="text-align: center;">
<center><a name="matteFloodfill"></a> <font size="-1">matteFloodfill</font></center>
</td>
- <td><font size="-1">const <a href="Color.html">Color</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a>
&target_, const unsigned int  opacity_, const ssize_t x_, const
ssize_t
-y_, <a href="Enumerations.html#PaintMethod">PaintMethod</a> method_</font></td>
+y_, <a href="http://www.imagemagick.org/Magick++/Enumerations.html#PaintMethod">PaintMethod</a> method_</font></td>
<td><font size="-1">Floodfill designated area with a replacement
opacity value.</font></td>
</tr>
@@ -1002,7 +1002,7 @@
<td style="text-align: center;">
<center><a name="mergeLayers"></a> <font size="-1">mergeLayers</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#LayerMethod">LayerMethod</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#LayerMethod">LayerMethod</a>
noiseType_</font></td>
<td><font size="-1">handle multiple images forming a set of image layers or animation frames.</font></td>
</tr>
@@ -1094,8 +1094,8 @@
<td style="text-align: center;">
<center><a name="opaque"></a> <font size="-1">opaque</font></center>
</td>
- <td><font size="-1">const <a href="Color.html">Color</a>
-&opaqueColor_, const <a href="Color.html">Color</a> &penColor_</font></td>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a>
+&opaqueColor_, const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> &penColor_</font></td>
<td><font size="-1">Change color of pixels matching opaqueColor_
to specified penColor_.</font></td>
</tr>
@@ -1143,7 +1143,7 @@
<td style="text-align: center;">
<center><a name="raise"></a> <font size="-1">raise</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_ = "6x6+0+0",  bool raisedFlag_ =  false</font></td>
<td><font size="-1">Raise image (lighten or darken the edges of
an image to give a 3-D raised or lowered effect)</font></td>
@@ -1156,7 +1156,7 @@
<td><font size="-1">Read image into current object</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&size_, const std::string &imageSpec_</font></td>
<td><font size="-1">Read image of specified size into current
object. This form is useful for images that do not specifiy their size
@@ -1166,9 +1166,9 @@
equal to the specified size. This may result in memory and time savings.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Blob.html">Blob</a> &blob_</font></td>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a> &blob_</font></td>
<td rowspan="5"><font size="-1">Read encoded image of specified
-size from an in-memory <a href="Blob.html">BLOB</a> into current
+size from an in-memory <a href="http://www.imagemagick.org/Magick++/Blob.html">BLOB</a> into current
object. Depending on the method arguments, the Blob size, depth, and
format may also be specified. Some image formats require that size be
specified. The default ImageMagick uses for depth depends on its
@@ -1179,22 +1179,22 @@
a format can't be automagically detected, the format must be specified.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Blob.html">Blob</a>
-&blob_, const <a href="Geometry.html">Geometry</a> &size_</font></td>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a>
+&blob_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> &size_</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Blob.html">Blob</a>
-&blob_, const <a href="Geometry.html">Geometry</a> &size_,
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a>
+&blob_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> &size_,
size_t depth_</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Blob.html">Blob</a>
-&blob_, const <a href="Geometry.html">Geometry</a> &size_,
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a>
+&blob_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> &size_,
size_t depth_, const string &magick_ </font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Blob.html">Blob</a>
-&blob_, const <a href="Geometry.html">Geometry</a> &size_,
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a>
+&blob_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> &size_,
const
string &magick_</font></td>
</tr>
@@ -1300,7 +1300,7 @@
<td style="text-align: center;">
<center><a name="sample"></a> <font size="-1">sample</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_ </font></td>
<td><font size="-1">Resize image by using pixel sampling algorithm</font></td>
</tr>
@@ -1308,7 +1308,7 @@
<td style="text-align: center;">
<center><a name="scale"></a> <font size="-1">scale</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_</font></td>
<td><font size="-1">Resize image by using simple ratio algorithm</font></td>
</tr>
@@ -1415,7 +1415,7 @@
<td style="text-align: center;">
<center><a name="splice"></a> <font size="-1">splice</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_</font></td>
<td><font size="-1">splice the background color into the image</font></td>
</tr>
@@ -1484,21 +1484,21 @@
<td style="text-align: center;" rowspan="2">
<center><a name="transform"></a> <font size="-1">transform</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&imageGeometry_</font></td>
<td rowspan="2"><font size="-1">Transform image based on image
and crop geometries. Crop geometry is optional.</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
-&imageGeometry_, const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
+&imageGeometry_, const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&cropGeometry_ </font></td>
</tr>
<tr>
<td style="text-align: center;">
<center><a name="transparent"></a> <font size="-1">transparent</font></center>
</td>
- <td><font size="-1">const <a href="Color.html">Color</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a>
&color_</font></td>
<td><font size="-1">Add matte image to image, setting pixels
matching color to transparent.</font></td>
@@ -1569,9 +1569,9 @@
original if this is a problem.</font></td>
</tr>
<tr>
- <td><font size="-1"><a href="Blob.html">Blob</a> *blob_</font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a> *blob_</font></td>
<td rowspan="3"><font size="-1">Write image to a in-memory <a
- href="Blob.html"> BLOB</a> stored in <i>blob_</i>. The <i>magick</i>_
+ href="http://www.imagemagick.org/Magick++/Blob.html"> BLOB</a> stored in <i>blob_</i>. The <i>magick</i>_
parameter specifies the image format to write (defaults to <a
href="Image++.html#magick">magick</a> ). The depth_ parameter species the image
depth (defaults to <a href="Image++.html#depth"> depth</a> ).</font> <br />
@@ -1582,11 +1582,11 @@
original if this is a problem.</font></td>
</tr>
<tr>
- <td><font size="-1"><a href="Blob.html">Blob</a> *blob_,
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a> *blob_,
std::string &magick_</font></td>
</tr>
<tr>
- <td><font size="-1"><a href="Blob.html">Blob</a> *blob_,
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a> *blob_,
std::string &magick_, size_t depth_</font></td>
</tr>
<tr>
@@ -1651,7 +1651,7 @@
<td style="text-align: center;">
<center><a name="resize"></a> <font size="-1">resize</font></center>
</td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_</font></td>
<td><font size="-1">Resize image to specified size.</font></td>
</tr>
@@ -1767,9 +1767,9 @@
<br />
<font size="-1">Color</font></center>
</td>
- <td><font size="-1"><a href="Color.html">Color</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> </font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1">const <a href="Color.html">Color</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a>
&color_</font></td>
<td><font size="-1">Image background color</font></td>
</tr>
@@ -1816,9 +1816,9 @@
<td>
<center><a name="borderColor"></a> <font size="-1">borderColor</font></center>
</td>
- <td><font size="-1"><a href="Color.html">Color</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> </font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1"> const <a href="Color.html">Color</a>
+ <td><font size="-1"> const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a>
&color_</font></td>
<td><font size="-1">Image border color</font></td>
</tr>
@@ -1836,9 +1836,9 @@
<td>
<center><a name="boxColor"></a> <font size="-1">boxColor</font></center>
</td>
- <td><font size="-1"><a href="Color.html">Color</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> </font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1">const <a href="Color.html">Color</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a>
&boxColor_</font></td>
<td><font size="-1">Base color that annotation text is rendered
on.</font></td>
@@ -1933,10 +1933,10 @@
<td>
<center><a name="classType"></a> <font size="-1">classType</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#ClassType">ClassType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#ClassType">ClassType</a>
</font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1"> <a href="Enumerations.html#ClassType">ClassType</a>
+ <td><font size="-1"> <a href="http://www.imagemagick.org/Magick++/Enumerations.html#ClassType">ClassType</a>
class_</font></td>
<td><font size="-1">Image storage class.  Note that
conversion from a DirectClass image to a PseudoClass image may result
@@ -1972,10 +1972,10 @@
<td>
<center><a name="colorMap"></a> <font size="-1">colorMap</font></center>
</td>
- <td><font size="-1"><a href="Color.html">Color</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> </font></td>
<td><font size="-1">size_t index_</font></td>
<td><font size="-1">size_t index_, const <a
- href="Color.html"> Color</a> &color_</font></td>
+ href="http://www.imagemagick.org/Magick++/Color.html"> Color</a> &color_</font></td>
<td><font size="-1">Color at colormap index.</font></td>
</tr>
<tr>
@@ -2003,10 +2003,10 @@
<td>
<center><a name="colorSpace"></a> <font size="-1">colorSpace</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#ColorspaceType">ColorspaceType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#ColorspaceType">ColorspaceType</a>
colorSpace_</font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1"><a href="Enumerations.html#ColorspaceType">ColorspaceType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#ColorspaceType">ColorspaceType</a>
colorSpace_</font></td>
<td><font size="-1">The colorspace (e.g. CMYK) used to represent
the image pixel colors. Image pixels are always stored as RGB(A) except
@@ -2034,11 +2034,11 @@
<td>
<center><a name="compose"></a> <font size="-1">compose</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#CompositeOperator">CompositeOperator</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#CompositeOperator">CompositeOperator</a>
</font></td>
<td><small><font size="-1"><small>void</small></font></small></td>
<td><small><font size="-1"><small><a
- href="Enumerations.html#CompositeOperator">CompositeOperator</a>
+ href="http://www.imagemagick.org/Magick++/Enumerations.html#CompositeOperator">CompositeOperator</a>
compose_</small></font></small></td>
<td><font size="-1">Composition operator to be used when
composition is implicitly used (such as for image flattening).</font></td>
@@ -2049,11 +2049,11 @@
<br />
<font size="-1">Type</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#CompressionType">CompressionType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#CompressionType">CompressionType</a>
</font></td>
<td><small><font size="-1"><small>void</small></font></small></td>
<td><small><font size="-1"><small><a
- href="Enumerations.html#CompressionType">CompressionType</a>
+ href="http://www.imagemagick.org/Magick++/Enumerations.html#CompressionType">CompressionType</a>
compressType_</small></font></small></td>
<td><font size="-1">Image compresion type. The default is the
compression type of the specified image file.</font></td>
@@ -2119,10 +2119,10 @@
<td>
<center><a name="density"></a> <font size="-1">density</font></center>
</td>
- <td><font size="-1"><a href="Geometry.html">Geometry</a>  
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>  
(default 72x72)</font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&density_</font></td>
<td><font size="-1">Vertical and horizontal resolution in pixels
of the image. This option specifies an image density when decoding a
@@ -2144,10 +2144,10 @@
<td>
<center><a name="endian"></a> <font size="-1">endian</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#EndianType">EndianType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#EndianType">EndianType</a>
</font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1"><a href="Enumerations.html#EndianType">EndianType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#EndianType">EndianType</a>
endian_</font></td>
<td><font size="-1">Specify (or obtain) endian option for formats
which support it.</font></td>
@@ -2211,7 +2211,7 @@
<td>
<center><a name="fillRule"></a> <font size="-1">fillRule</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#FillRule">FillRule</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#FillRule">FillRule</a>
</font></td>
<td><font size="-1">void</font></td>
<td><font size="-1">const Magick::FillRule &fillRule_</font></td>
@@ -2221,10 +2221,10 @@
<td>
<center><a name="filterType"></a> <font size="-1">filterType</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#FilterTypes">FilterTypes</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#FilterTypes">FilterTypes</a>
</font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1"><a href="Enumerations.html#FilterTypes">FilterTypes</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#FilterTypes">FilterTypes</a>
filterType_</font></td>
<td><font size="-1">Filter to use when resizing image. The
reduction filter employed has a sigificant effect on the time required
@@ -2258,9 +2258,9 @@
<td>
<center><a name="fontTypeMetrics"></a> <font size="-1">fontTypeMetrics</font></center>
</td>
- <td><font size="-1"><a href="TypeMetric.html">TypeMetric</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/TypeMetric.html">TypeMetric</a> </font></td>
<td><font size="-1">const std::string &text_, <a
- href="TypeMetric.html"> TypeMetric</a> *metrics</font></td>
+ href="http://www.imagemagick.org/Magick++/TypeMetric.html"> TypeMetric</a> *metrics</font></td>
<td bgcolor="#666666"><font size="-1"> </font></td>
<td><font size="-1">Update metrics with font type metrics using
specified <i>text</i>, and current <a href="Image++.html#font">font</a> and <a
@@ -2292,7 +2292,7 @@
<td>
<center><a name="geometry"></a> <font size="-1">geometry</font></center>
</td>
- <td><font size="-1"><a href="Geometry.html">Geometry</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> </font></td>
<td><font size="-1">void</font></td>
<td bgcolor="#666666"><font size="-1"> </font></td>
<td><font size="-1">Preferred size of the image when encoding.</font></td>
@@ -2319,12 +2319,12 @@
<td>
<center><a name="iccColorProfile"></a> <font size="-1">iccColorProfile</font></center>
</td>
- <td><font size="-1"><a href="Blob.html">Blob</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a> </font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1">const <a href="Blob.html">Blob</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a>
&colorProfile_</font></td>
<td><font size="-1">ICC color profile. Supplied via a <a
- href="Blob.html"> Blob</a> since Magick++/ and ImageMagick do not
+ href="http://www.imagemagick.org/Magick++/Blob.html"> Blob</a> since Magick++/ and ImageMagick do not
currently support formating this data structure directly. 
Specifications are available from the <a href="http://www.color.org/">
International Color Consortium</a> for the format of ICC color profiles.</font></td>
@@ -2335,10 +2335,10 @@
<br />
<font size="-1">Type</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#InterlaceType">InterlaceType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#InterlaceType">InterlaceType</a>
</font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1"><a href="Enumerations.html#InterlaceType">InterlaceType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#InterlaceType">InterlaceType</a>
interlace_</font></td>
<td><font size="-1">The type of interlacing scheme (default <i>NoInterlace</i>
). This option is used to specify the type of  interlacing
@@ -2355,12 +2355,12 @@
<td>
<center><a name="iptcProfile"></a> <font size="-1">iptcProfile</font></center>
</td>
- <td><font size="-1"><a href="Blob.html">Blob</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a> </font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1">const <a href="Blob.html">Blob</a> &
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Blob.html">Blob</a> &
iptcProfile_</font></td>
<td><font size="-1">IPTC profile. Supplied via a <a
- href="Blob.html"> Blob</a> since Magick++ and ImageMagick do not
+ href="http://www.imagemagick.org/Magick++/Blob.html"> Blob</a> since Magick++ and ImageMagick do not
currently  support formating this data structure directly.
Specifications are available from the <a href="http://www.iptc.org/">
International Press Telecommunications Council</a> for IPTC profiles.</font></td>
@@ -2398,9 +2398,9 @@
<td>
<center><a name="matteColor"></a> <font size="-1">matteColor</font></center>
</td>
- <td><font size="-1"><a href="Color.html">Color</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> </font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1">const <a href="Color.html">Color</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Color.html">Color</a>
&matteColor_</font></td>
<td><font size="-1">Image matte (frame) color</font></td>
</tr>
@@ -2455,7 +2455,7 @@
<br />
<font size="-1">Geometry</font></center>
</td>
- <td><font size="-1"><a href="Geometry.html">Geometry</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> </font></td>
<td><font size="-1">void</font></td>
<td bgcolor="#666666"><font size="-1"> </font></td>
<td><font size="-1">Tile size and offset within an image montage.
@@ -2492,11 +2492,11 @@
name="orientation"></a>orientation<br />
</small></td>
<td style="vertical-align: middle;"><small><a
- href="Enumerations.html#OrientationType">OrientationType</a></small></td>
+ href="http://www.imagemagick.org/Magick++/Enumerations.html#OrientationType">OrientationType</a></small></td>
<td style="vertical-align: top;"><small>void</small><br />
</td>
<td style="vertical-align: middle;"><small><a
- href="Enumerations.html#OrientationType">OrientationType</a>
+ href="http://www.imagemagick.org/Magick++/Enumerations.html#OrientationType">OrientationType</a>
orientation_</small></td>
<td style="vertical-align: top;"><small>Image orientation.
 Supported by some file formats such as DPX and TIFF. Useful for
@@ -2527,11 +2527,11 @@
<td>
<center><a name="page"></a> <font size="-1">page</font></center>
</td>
- <td><font size="-1"><a href="Geometry.html#PostscriptPageSize">Geometry</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Geometry.html#PostscriptPageSize">Geometry</a>
</font></td>
<td><font size="-1">void</font></td>
<td><font size="-1">const <a
- href="Geometry.html#PostscriptPageSize"> Geometry</a> &pageSize_</font></td>
+ href="http://www.imagemagick.org/Magick++/Geometry.html#PostscriptPageSize"> Geometry</a> &pageSize_</font></td>
<td><font size="-1">Preferred size and location of an image
canvas.</font>
<p><font size="-1">Use this option to specify the dimensions
@@ -2546,10 +2546,10 @@
<td>
<center><a name="pixelColor"></a> <font size="-1">pixelColor</font></center>
</td>
- <td><font size="-1"><a href="Color.html">Color</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Color.html">Color</a> </font></td>
<td><font size="-1">ssize_t x_, ssize_t y_</font></td>
<td><font size="-1">ssize_t x_, ssize_t y_, const <a
- href="Color.html"> Color</a> &color_</font></td>
+ href="http://www.imagemagick.org/Magick++/Color.html"> Color</a> &color_</font></td>
<td><font size="-1">Get/set pixel color at location x & y.</font></td>
</tr>
<tr>
@@ -2557,7 +2557,7 @@
<div style="text-align:center"><a name="profile"></a> <small>profile</small><br />
</div>
</td>
- <td valign="top"><a href="Blob.html"><small> Blob</small><small><br />
+ <td valign="top"><a href="http://www.imagemagick.org/Magick++/Blob.html"><small> Blob</small><small><br />
</small></a> </td>
<td valign="top"><small>const std::string name_</small><small><br />
</small></td>
@@ -2598,10 +2598,10 @@
<br />
<font size="-1">ColorSpace</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#ColorspaceType">ColorspaceType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#ColorspaceType">ColorspaceType</a>
</font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1"><a href="Enumerations.html#ColorspaceType">ColorspaceType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#ColorspaceType">ColorspaceType</a>
colorSpace_</font></td>
<td><font size="-1">Colorspace to quantize colors in (default
RGB). Empirical evidence suggests that distances in color spaces such
@@ -2648,10 +2648,10 @@
<br />
<font size="-1">Intent</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#RenderingIntent">RenderingIntent</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#RenderingIntent">RenderingIntent</a>
</font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1"><a href="Enumerations.html#RenderingIntent">RenderingIntent</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#RenderingIntent">RenderingIntent</a>
render_</font></td>
<td><font size="-1">The type of rendering intent</font></td>
</tr>
@@ -2661,10 +2661,10 @@
<br />
<font size="-1">Units</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#ResolutionType">ResolutionType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#ResolutionType">ResolutionType</a>
</font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1"><a href="Enumerations.html#ResolutionType">ResolutionType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#ResolutionType">ResolutionType</a>
units_</font></td>
<td><font size="-1">Units of image resolution</font></td>
</tr>
@@ -2700,9 +2700,9 @@
<td>
<center><a name="size"></a> <font size="-1">size</font></center>
</td>
- <td><font size="-1"><a href="Geometry.html">Geometry</a> </font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a> </font></td>
<td><font size="-1">void</font></td>
- <td><font size="-1">const <a href="Geometry.html">Geometry</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Geometry.html">Geometry</a>
&geometry_</font></td>
<td><font size="-1">Width and height of a raw image (an image
which does not support width and height information).  Size may
@@ -2877,11 +2877,11 @@
<td>
<center><a name="type"></a> <font size="-1">type</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#ImageType">ImageType</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#ImageType">ImageType</a>
</font></td>
<td><font size="-1">void</font></td>
<td bgcolor="#ffffff"><font size="-1"><a
- href="Enumerations.html#ImageType"> ImageType</a> </font></td>
+ href="http://www.imagemagick.org/Magick++/Enumerations.html#ImageType"> ImageType</a> </font></td>
<td><font size="-1">Image type.</font></td>
</tr>
<tr>
@@ -2906,11 +2906,11 @@
<td>
<center><a name="virtualPixelMethod"></a> <font size="-1">virtualPixelMethod</font></center>
</td>
- <td><font size="-1"><a href="Enumerations.html#VirtualPixelMethod">VirtualPixelMethod</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#VirtualPixelMethod">VirtualPixelMethod</a>
</font></td>
<td><small><font size="-1"><small>void</small></font></small></td>
<td><small><font size="-1"><small><a
- href="Enumerations.html#VirtualPixelMethod">VirtualPixelMethod</a>
+ href="http://www.imagemagick.org/Magick++/Enumerations.html#VirtualPixelMethod">VirtualPixelMethod</a>
virtualPixelMethod_</small></font></small></td>
<td><font size="-1">Image virtual pixel method.</font></td>
</tr>
@@ -2947,7 +2947,7 @@
<center>
<h3> <a name="Raw Image Pixel Access"></a> Low-Level Image Pixel Access</h3>
</center>
-Image pixels (of type <i><a href="Quantum.html">Quantum</a> </i>)
+Image pixels (of type <i><a href="http://www.imagemagick.org/Magick++/Quantum.html">Quantum</a> </i>)
may be accessed directly via the <i>Image Pixel Cache</i> .  The
image pixel cache is a rectangular window into the actual image pixels
(which may be in memory, memory-mapped from a disk file, or entirely on
@@ -2955,12 +2955,12 @@
The
interface described here (part of the <i>Image</i> class) supports
only
-one view at a time. See the <i><a href="Pixels.html">Pixels</a> </i>
+one view at a time. See the <i><a href="http://www.imagemagick.org/Magick++/Pixels.html">Pixels</a> </i>
class for a more abstract interface which supports simultaneous pixel
views (up to the number of rows). As an analogy, the interface
described
-here relates to the <i><a href="Pixels.html">Pixels</a> </i> class as
-stdio's gets() relates to fgets(). The <i><a href="Pixels.html"> Pixels</a>
+here relates to the <i><a href="http://www.imagemagick.org/Magick++/Pixels.html">Pixels</a> </i> class as
+stdio's gets() relates to fgets(). The <i><a href="http://www.imagemagick.org/Magick++/Pixels.html"> Pixels</a>
</i>class provides the more general form of the interface.
<p>Obtain existing image pixels via <i>getPixels()</i>. Create a new
pixel region using <i>setPixels().</i></p>
@@ -2985,7 +2985,7 @@
may be accessed, addressed, and updated, as shown in the following
example:</p>
<pre class="code">
-<img class="icon" src="Cache.png" name="Graphic1" width="254" border="0" alt="cache" />
+<img class="icon" src="http://www.imagemagick.org/Magick++/Cache.png" name="Graphic1" width="254" border="0" alt="cache" />
Image image("cow.png");
// Ensure that there are no other references to this image.
image.modifyImage();
@@ -3026,7 +3026,7 @@
<td>
<center><a name="getConstPixels"></a> <font size="-1">getConstPixels</font></center>
</td>
- <td><font size="-1">const <a href="Quantum.html">Quantum</a>
+ <td><font size="-1">const <a href="http://www.imagemagick.org/Magick++/Quantum.html">Quantum</a>
*</font></td>
<td><font size="-1">const ssize_t x_, const ssize_t y_, const size_t
columns_, const size_t rows_</font></td>
@@ -3081,7 +3081,7 @@
<td>
<center><a name="getPixels"></a> <font size="-1">getPixels</font></center>
</td>
- <td><font size="-1"><a href="Quantum.html">Quantum</a> *</font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Quantum.html">Quantum</a> *</font></td>
<td><font size="-1">const ssize_t x_, const ssize_t y_, const size_t
columns_, const size_t rows_</font></td>
<td><font size="-1">Transfers pixels from the image to the pixel
@@ -3096,7 +3096,7 @@
<td>
<center><a name="setPixels"></a> <font size="-1">setPixels</font></center>
</td>
- <td><font size="-1"><a href="Quantum.html">Quantum</a> *</font></td>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Quantum.html">Quantum</a> *</font></td>
<td><font size="-1">const ssize_t x_, const ssize_t y_, const size_t
columns_, const size_t rows_</font></td>
<td><font size="-1">Allocates a pixel cache region to store image
@@ -3119,7 +3119,7 @@
<center><a name="readPixels"></a> <font size="-1">readPixels</font></center>
</td>
<td><font size="-1">void</font></td>
- <td><font size="-1"><a href="Enumerations.html#QuantumTypes">QuantumTypes</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#QuantumTypes">QuantumTypes</a>
quantum_, unsigned char *source_,</font></td>
<td><font size="-1">Transfers one or more pixel components from a
buffer or file into the image pixel cache of an image. ReadPixels is
@@ -3131,7 +3131,7 @@
<center><a name="writePixels"></a> <font size="-1">writePixels</font></center>
</td>
<td><font size="-1">void</font></td>
- <td><font size="-1"><a href="Enumerations.html#QuantumTypes">QuantumTypes</a>
+ <td><font size="-1"><a href="http://www.imagemagick.org/Magick++/Enumerations.html#QuantumTypes">QuantumTypes</a>
quantum_, unsigned char *destination_</font></td>
<td><font size="-1">Transfers one or more pixel components from
the image pixel cache to a buffer or file. WritePixels is typically
diff --git a/www/Magick++/Pixels.html b/www/Magick++/Pixels.html
index 48f7b21..1d74768 100644
--- a/www/Magick++/Pixels.html
+++ b/www/Magick++/Pixels.html
@@ -28,7 +28,7 @@
<p>Setting a view using the Pixels class does not cause the number of
references to the underlying image to be reduced to one. Therefore, in
order to ensure that only the current generation of the image is
-modified, the Image's <a href="https://imagemagick.org/Magick++/Image++.html#modifyImage">modifyImage()</a>
+modified, the Image's <a href="Image++.html#modifyImage">modifyImage()</a>
method should be invoked to reduce the reference count on the underlying
image to one. If this is not done, then it is possible for a previous
generation of the image to be modified due to the use of reference
@@ -213,7 +213,7 @@
which is itself typedef <i>unsigned char</i>, or <i>unsigned short</i>,
depending on the value of the <i>QuantumDepth </i>define) provide
the <span lang="en-US">colormap</span> index (see <a
- href="https://imagemagick.org/Magick++/Image++.html#colorMap">colorMap</a>) for each pixel in the
+ href="Image++.html#colorMap">colorMap</a>) for each pixel in the
image. For CMYKA images, the indexes represent the black
channel. The value returned is intended for pixel access only. It
should never be deallocated.</font></p>
diff --git a/www/Magick++/Quantum.html b/www/Magick++/Quantum.html
index 54a82fb..7f6ffae 100644
--- a/www/Magick++/Quantum.html
+++ b/www/Magick++/Quantum.html
@@ -59,7 +59,7 @@
<td width="102">
<p align="center"><a href="Enumerations.html#ColorspaceType">RGBColorspace</a></p></td>
<td width="152">
-<p align="center"><a href="Enumerations.html#ColorspaceType">RGBColorspace</a> + <a href="https://imagemagick.org/Magick++/Image++.html#matte">matte</a></p></td>
+<p align="center"><a href="Enumerations.html#ColorspaceType">RGBColorspace</a> + <a href="Image++.html#matte">matte</a></p></td>
<td width="119">
<p align="center"><a href="Enumerations.html#ColorspaceType">CMYKColorspace</a></p></td></tr>
<tr>
diff --git a/www/Magick++/STL.html b/www/Magick++/STL.html
index 85ed2e2..245ffa8 100644
--- a/www/Magick++/STL.html
+++ b/www/Magick++/STL.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Magick++ API: STL Templates</title>
-<link rel="stylesheet" href="https://imagemagick.org/Magick++/magick.css" type="text/css" />
+<link rel="stylesheet" href="https://www.imagemagick.org/Magick++/magick.css" type="text/css" />
</head>
<body>
<div class="doc-section">
@@ -100,7 +100,7 @@
<td>
<center><a name="appendImages"></a> <font size="-1">appendImages</font></center>
</td>
- <td><font size="-1"><a href="Image++.html">Image</a>
+ <td><font size="-1"><a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
*appendedImage_, <a
href="http://www.sgi.com/tech/stl/InputIterator.html"> InputIterator</a>
first_, <a href="http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</a>
@@ -116,7 +116,7 @@
<td>
<center><a name="averageImages"></a> <font size="-1">averageImages</font></center>
</td>
- <td><font size="-1"><a href="Image++.html">Image</a>
+ <td><font size="-1"><a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
*averagedImage_, <a
href="http://www.sgi.com/tech/stl/InputIterator.html"> InputIterator</a>
first_, <a href="http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</a>
@@ -181,7 +181,7 @@
<td>
<center><a name="flattenImages"></a> <font size="-1">flattenImages</font></center>
</td>
- <td><font size="-1"><a href="Image++.html">Image</a>
+ <td><font size="-1"><a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
*flattendImage_, <a
href="http://www.sgi.com/tech/stl/InputIterator.html"> InputIterator</a>
first_, <a href="http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</a>
@@ -217,7 +217,7 @@
<td><font size="-1"><a
href="http://www.sgi.com/tech/stl/InputIterator.html"> InputIterator</a>
first_, <a href="http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</a>
-last_, const <a href="Image++.html">Image</a> & mapImage_, bool
+last_, const <a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a> & mapImage_, bool
dither_,  bool measureError_ = false</font></td>
<td><font size="-1">Replace the colors of a sequence of images
with the closest color from a reference image. Set <i>dither_</i> to <i>true</i>
@@ -239,11 +239,11 @@
container <i> montageImages_ </i>depending on the tile setting and the
number of image frames montaged. Montage options are provided via the
parameter <i>montageOpts_</i> . Options set in the first image frame (<a
- href="Image++.html#backgroundColor"> backgroundColor,</a> <a
- href="Image++.html#borderColor">borderColor</a> , <a
- href="Image++.html#matteColor">matteColor</a> , <a
- href="Image++.html#penColor">penColor,</a> <a href="Image++.html#font">font,</a>
-and <a href="Image++.html#fontPointsize">fontPointsize</a> ) are also used
+ href="https://www.imagemagick.org/Magick++/Image++.html#backgroundColor"> backgroundColor,</a> <a
+ href="https://www.imagemagick.org/Magick++/Image++.html#borderColor">borderColor</a> , <a
+ href="https://www.imagemagick.org/Magick++/Image++.html#matteColor">matteColor</a> , <a
+ href="https://www.imagemagick.org/Magick++/Image++.html#penColor">penColor,</a> <a href="https://www.imagemagick.org/Magick++/Image++.html#font">font,</a>
+and <a href="https://www.imagemagick.org/Magick++/Image++.html#fontPointsize">fontPointsize</a> ) are also used
as options by <i>montageImages().</i></font></td>
</tr>
<tr>
@@ -266,7 +266,7 @@
<td>
<center><a name="mosaicImages"></a> <font size="-1">mosaicImages</font></center>
</td>
- <td><font size="-1"><a href="Image++.html">Image</a> *mosaicImage_, <a
+ <td><font size="-1"><a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a> *mosaicImage_, <a
href="http://www.sgi.com/tech/stl/InputIterator.html"> InputIterator</a>
first_, <a href="http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</a>
last_</font></td>
@@ -370,7 +370,7 @@
provide the means to construct an object which caches arguments for
later use by an algorithm designed for use with unary function objects.
There is a unary function object corresponding each algorithm provided
-by the <a href="Image++.html"> Image</a> class and there is a contructor
+by the <a href="https://www.imagemagick.org/Magick++/Image++.html"> Image</a> class and there is a contructor
available compatable with each synonymous method in the Image class. </p>
<p>The unary function objects that Magick++ provides to support
manipulating images are shown in the following table: <br />
@@ -526,7 +526,7 @@
<td rowspan="2">
<center><a name="compositeImage"></a> <font size="-1">compositeImage</font></center>
</td>
- <td><font size="-1">const <a href="Image++.html">Image</a>
+ <td><font size="-1">const <a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
&compositeImage_, ssize_t xOffset_, ssize_t yOffset_, <a
href="Enumerations.html#CompositeOperator"> CompositeOperator</a>
compose_ = <i>InCompositeOp</i></font></td>
@@ -534,7 +534,7 @@
specified offset and using specified algorithm</font></td>
</tr>
<tr>
- <td><font size="-1">const <a href="Image++.html">Image</a>
+ <td><font size="-1">const <a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
&compositeImage_, const Geometry &offset_, <a
href="Enumerations.html#CompositeOperator"> CompositeOperator</a>
compose_ = <i>InCompositeOp</i></font></td>
@@ -670,7 +670,7 @@
<font size="-1">TextureImage</font></center>
</td>
<td><font size="-1">ssize_t x_, ssize_t y_,  const <a
- href="Image++.html"> Image</a> &texture_</font></td>
+ href="https://www.imagemagick.org/Magick++/Image++.html"> Image</a> &texture_</font></td>
<td rowspan="2"><font size="-1">Flood-fill texture across pixels
that match the color of the target pixel and are neighbors of the
target pixel. Uses current fuzz setting when determining color match.</font></td>
@@ -747,7 +747,7 @@
<td>
<center><a name="inverseFourierTransformImage"></a> <font size="-1">inverseFourierTransformImage</font></center>
</td>
- <td><font size="-1">const <a href="Image++.html">Image</a>
+ <td><font size="-1">const <a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
&phaseImage_, const bool magnitude_</font></td>
<td><font size="-1">implements the inverse discrete Fourier transform (DFT) of the image either as a magnitude / phase or real / imaginary image pair.</font></td>
</tr>
@@ -826,7 +826,7 @@
<td>
<center><a name="mapImage"></a> <font size="-1">mapImage</font></center>
</td>
- <td><font size="-1">const <a href="Image++.html">Image</a>
+ <td><font size="-1">const <a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
&mapImage_ , bool dither_ = false</font></td>
<td><font size="-1">Remap image colors with closest color from
reference image. Set dither_ to <i>true</i> in to apply Floyd/Steinberg
@@ -1064,7 +1064,7 @@
<td>
<center><a name="steganoImage"></a> <font size="-1">steganoImage</font></center>
</td>
- <td><font size="-1">const <a href="Image++.html">Image</a>
+ <td><font size="-1">const <a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
&watermark_</font></td>
<td><font size="-1">Add a digital watermark to the image (based
on second image)</font></td>
@@ -1073,7 +1073,7 @@
<td>
<center><a name="stereoImage"></a> <font size="-1">stereoImage</font></center>
</td>
- <td><font size="-1">const <a href="Image++.html">Image</a>
+ <td><font size="-1">const <a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
&rightImage_</font></td>
<td><font size="-1">Create an image which appears in stereo when
viewed with red-blue glasses (Red image on left, blue on right)</font></td>
@@ -1090,7 +1090,7 @@
<td>
<center><a name="textureImage"></a> <font size="-1">textureImage</font></center>
</td>
- <td><font size="-1">const <a href="Image++.html">Image</a>
+ <td><font size="-1">const <a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a>
&texture_</font></td>
<td><font size="-1">Layer a texture on image background</font></td>
</tr>
@@ -1557,7 +1557,7 @@
<td>
<center><a name="penTexture"></a> <font size="-1">penTextureImage</font></center>
</td>
- <td><font size="-1"><a href="Image++.html">Image</a> </font></td>
+ <td><font size="-1"><a href="https://www.imagemagick.org/Magick++/Image++.html">Image</a> </font></td>
<td><font size="-1">const Image & penTexture_</font></td>
<td><font size="-1">Texture image to paint with (similar to
penColor).</font></td>
diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
index 5eec71f..be3d4c7 100644
--- a/www/advanced-unix-installation.html
+++ b/www/advanced-unix-installation.html
@@ -63,7 +63,7 @@
<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>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
@@ -449,7 +449,7 @@
<p>While <code>configure</code> is designed to ease installation of ImageMagick, it often discovers problems that would otherwise be encountered later when compiling ImageMagick. The configure script tests for headers and libraries by executing the compiler (CC) with the specified compilation flags (CFLAGS), pre-processor flags (CPPFLAGS), and linker flags (LDFLAGS). Any errors are logged to the file <code>config.log</code>. If configure fails to discover a header or library please review this log file to determine why, however, please be aware that *errors in the <code>config.log</code> are normal* because configure works by trying something and seeing if it fails. An error in <code>config.log</code> is only a problem if the test should have passed on your system.</p>
<p>Common causes of configure failures are: 1) a delegate header is not in the header include path (CPPFLAGS -I option); 2) a delegate library is not in the linker search/run path (LDFLAGS -L/-R option); 3) a delegate library is missing a function (old version?); or 4) compilation environment is faulty.</p>
-<p>If all reasonable corrective actions have been tried and the problem appears be due to a flaw in the configure script, please send a bug report to the <a href="https://imagemagick.org/discourse-server//viewforum.html?f=3">ImageMagick Defect Support Forum</a>. All bug reports should contain the operating system type (as reported by <code>uname -a</code>) and the compiler/compiler-version. A copy of the configure script output and/or the relevant portion of <code>config.log</code> file may be valuable in order to find the problem. If you post portions of <code>config.log</code>, please also send a script of the configure output and a description of what you expected to see (and why) so the failure you are observing can be identified and resolved.</p>
+<p>If all reasonable corrective actions have been tried and the problem appears be due to a flaw in the configure script, please send a bug report to the <a href="https://imagemagick.org/discourse-server///viewforum.html?f=3">ImageMagick Defect Support Forum</a>. All bug reports should contain the operating system type (as reported by <code>uname -a</code>) and the compiler/compiler-version. A copy of the configure script output and/or the relevant portion of <code>config.log</code> file may be valuable in order to find the problem. If you post portions of <code>config.log</code>, please also send a script of the configure output and a description of what you expected to see (and why) so the failure you are observing can be identified and resolved.</p>
<p>ImageMagick is now configured and ready to build</p>
@@ -636,7 +636,7 @@
<br/>
<a href="support.html">Donate</a> •
<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>
+ <a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index f4adac8..582921b 100644
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -63,7 +63,7 @@
<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>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
@@ -139,7 +139,7 @@
<br/>
<a href="support.html">Donate</a> •
<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>
+ <a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
diff --git a/www/animate.html b/www/animate.html
index 871a4e7..a5eb310 100644
--- a/www/animate.html
+++ b/www/animate.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -564,4 +565,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 18:54 -->
\ No newline at end of file
diff --git a/www/api.html b/www/api.html
index ae99975..caf1cf6 100644
--- a/www/api.html
+++ b/www/api.html
@@ -164,7 +164,7 @@
</p>
<p><a href="api.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/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/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/api/Image++.html b/www/api/Image++.html
index 6821c9a..6e60219 100644
--- a/www/api/Image++.html
+++ b/www/api/Image++.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/animate.html b/www/api/animate.html
index 8dbed36..2fb44be 100644
--- a/www/api/animate.html
+++ b/www/api/animate.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/annotate.html b/www/api/annotate.html
index 5302bbd..3d5997f 100644
--- a/www/api/annotate.html
+++ b/www/api/annotate.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/attribute.html b/www/api/attribute.html
index c03a1a0..e39605a 100644
--- a/www/api/attribute.html
+++ b/www/api/attribute.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/blob.html b/www/api/blob.html
index 6c8c538..52bbcb5 100644
--- a/www/api/blob.html
+++ b/www/api/blob.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/cache-view.html b/www/api/cache-view.html
index 4ee6c62..c2a5ab2 100644
--- a/www/api/cache-view.html
+++ b/www/api/cache-view.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/cache.html b/www/api/cache.html
index bcc2a9f..aa76367 100644
--- a/www/api/cache.html
+++ b/www/api/cache.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/channel.html b/www/api/channel.html
index 5dfe5c6..79fac7b 100644
--- a/www/api/channel.html
+++ b/www/api/channel.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/cipher.html b/www/api/cipher.html
index d7765f3..1bf3bb1 100644
--- a/www/api/cipher.html
+++ b/www/api/cipher.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/color.html b/www/api/color.html
index 6494a9b..023c5f3 100644
--- a/www/api/color.html
+++ b/www/api/color.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/colormap.html b/www/api/colormap.html
index 7054ab2..766ee69 100644
--- a/www/api/colormap.html
+++ b/www/api/colormap.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/colorspace.html b/www/api/colorspace.html
index f04e079..871f21a 100644
--- a/www/api/colorspace.html
+++ b/www/api/colorspace.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/compare.html b/www/api/compare.html
index 9da6958..a1dd8f8 100644
--- a/www/api/compare.html
+++ b/www/api/compare.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/composite.html b/www/api/composite.html
index 0be3764..b8b5c73 100644
--- a/www/api/composite.html
+++ b/www/api/composite.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/constitute.html b/www/api/constitute.html
index f25d962..e4a52c4 100644
--- a/www/api/constitute.html
+++ b/www/api/constitute.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/decorate.html b/www/api/decorate.html
index 5f0916a..16b35a5 100644
--- a/www/api/decorate.html
+++ b/www/api/decorate.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/deprecate.html b/www/api/deprecate.html
index bc8f807..051f042 100644
--- a/www/api/deprecate.html
+++ b/www/api/deprecate.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/display.html b/www/api/display.html
index 5df912f..55a73ae 100644
--- a/www/api/display.html
+++ b/www/api/display.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/distort.html b/www/api/distort.html
index 908c2fe..7cdd553 100644
--- a/www/api/distort.html
+++ b/www/api/distort.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/draw.html b/www/api/draw.html
index ea00e6d..866f55b 100644
--- a/www/api/draw.html
+++ b/www/api/draw.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html
index 17468a6..ad79d57 100644
--- a/www/api/drawing-wand.html
+++ b/www/api/drawing-wand.html
@@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,shrink-to-fit=no" />
- <title>MagickWand, C API: Drawing Wand Methods @ ImageMagick</title>
+ <title>ImageMagick - MagickWand, C API: Drawing Wand Methods</title>
<meta name="application-name" content="ImageMagick" />
<meta name="description" content="ImageMagick® creates, edits, composes, and converts bitmap images. Resize an image, crop it, change its shades and colors, add captions, and more." />
<meta name="application-url" content="https://imagemagick.org" />
@@ -45,7 +45,7 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="montage.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/download.html">Download</a>
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -3935,4 +3936,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 24th April 2019 08:55 -->
\ No newline at end of file
+<!-- Magick Cache 30th August 2019 17:19 -->
\ No newline at end of file
diff --git a/www/api/effect.html b/www/api/effect.html
index 0674481..c03e8e6 100644
--- a/www/api/effect.html
+++ b/www/api/effect.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/enhance.html b/www/api/enhance.html
index 9c6d2c9..6984f06 100644
--- a/www/api/enhance.html
+++ b/www/api/enhance.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/exception.html b/www/api/exception.html
index 10d7412..1ffed84 100644
--- a/www/api/exception.html
+++ b/www/api/exception.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/feature.html b/www/api/feature.html
index 13a9e84..dc7620f 100644
--- a/www/api/feature.html
+++ b/www/api/feature.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/fourier.html b/www/api/fourier.html
index dc07da6..1697431 100644
--- a/www/api/fourier.html
+++ b/www/api/fourier.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/fx.html b/www/api/fx.html
index 67f7024..1fadf61 100644
--- a/www/api/fx.html
+++ b/www/api/fx.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/histogram.html b/www/api/histogram.html
index 58fcab0..a3fe6da 100644
--- a/www/api/histogram.html
+++ b/www/api/histogram.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/image-view.html b/www/api/image-view.html
index 4afeb7f..7f8c762 100644
--- a/www/api/image-view.html
+++ b/www/api/image-view.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/image.html b/www/api/image.html
index 811dab6..d7428bd 100644
--- a/www/api/image.html
+++ b/www/api/image.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/layer.html b/www/api/layer.html
index 76f70e9..ba544db 100644
--- a/www/api/layer.html
+++ b/www/api/layer.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/list.html b/www/api/list.html
index c8afe0f..fcb27f7 100644
--- a/www/api/list.html
+++ b/www/api/list.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/magick++-classes.html b/www/api/magick++-classes.html
index 24a9acf..616a16d 100644
--- a/www/api/magick++-classes.html
+++ b/www/api/magick++-classes.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html
index 3d57a49..ad01b5f 100644
--- a/www/api/magick-deprecate.html
+++ b/www/api/magick-deprecate.html
@@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,shrink-to-fit=no" />
- <title>MagickWand, C API: Deprecated Methods @ ImageMagick</title>
+ <title>ImageMagick - MagickWand, C API: Deprecated Methods</title>
<meta name="application-name" content="ImageMagick" />
<meta name="description" content="ImageMagick® creates, edits, composes, and converts bitmap images. Resize an image, crop it, change its shades and colors, add captions, and more." />
<meta name="application-url" content="https://imagemagick.org" />
@@ -45,7 +45,7 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="montage.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/download.html">Download</a>
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -101,10 +102,9 @@
<a href="../www/links.html">Related</a> •
<a href="../www/sitemap.html">Sitemap</a>
<br/>
-
+ <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/contact.html">Contact Us</a> •
- <a href="../www/support.html">Donate</a>
+ <a href="../www/contact.html">Contact Us</a>
<br/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
@@ -114,4 +114,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 23rd April 2019 13:08 -->
\ No newline at end of file
+<!-- Magick Cache 31st August 2019 22:27 -->
\ No newline at end of file
diff --git a/www/api/magick-image.html b/www/api/magick-image.html
index a7af5d1..888dc74 100644
--- a/www/api/magick-image.html
+++ b/www/api/magick-image.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/magick-property.html b/www/api/magick-property.html
index 25a9380..56cc665 100644
--- a/www/api/magick-property.html
+++ b/www/api/magick-property.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html
index ec96313..cd157a7 100644
--- a/www/api/magick-wand.html
+++ b/www/api/magick-wand.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/magick.html b/www/api/magick.html
index 638d2d7..bcbee11 100644
--- a/www/api/magick.html
+++ b/www/api/magick.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/memory.html b/www/api/memory.html
index c5e55d8..4bb1137 100644
--- a/www/api/memory.html
+++ b/www/api/memory.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/mime.html b/www/api/mime.html
index fb92a63..cf32fa5 100644
--- a/www/api/mime.html
+++ b/www/api/mime.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/module.html b/www/api/module.html
index e59d595..5a8c052 100644
--- a/www/api/module.html
+++ b/www/api/module.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/mogrify.html b/www/api/mogrify.html
index ac514e2..fc20900 100644
--- a/www/api/mogrify.html
+++ b/www/api/mogrify.html
@@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,shrink-to-fit=no" />
- <title>MagickWand, C API: Command-line Interface @ ImageMagick</title>
+ <title>ImageMagick - MagickWand, C API: Command-line Interface</title>
<meta name="application-name" content="ImageMagick" />
<meta name="description" content="ImageMagick® creates, edits, composes, and converts bitmap images. Resize an image, crop it, change its shades and colors, add captions, and more." />
<meta name="application-url" content="https://imagemagick.org" />
@@ -45,7 +45,7 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="montage.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/download.html">Download</a>
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -159,4 +160,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 24th April 2019 09:51 -->
\ No newline at end of file
+<!-- Magick Cache 28th August 2019 16:20 -->
\ No newline at end of file
diff --git a/www/api/monitor.html b/www/api/monitor.html
index 5bc1d2e..1e8f138 100644
--- a/www/api/monitor.html
+++ b/www/api/monitor.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/montage.html b/www/api/montage.html
index 90a1055..76cca6d 100644
--- a/www/api/montage.html
+++ b/www/api/montage.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
@@ -134,7 +134,7 @@
</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>
+ <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>
@@ -206,7 +206,7 @@
</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>
+ <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>
@@ -261,7 +261,7 @@
<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>
<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>
+<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 -->
diff --git a/www/api/morphology.html b/www/api/morphology.html
index 70f70ac..8bc4bdd 100644
--- a/www/api/morphology.html
+++ b/www/api/morphology.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/paint.html b/www/api/paint.html
index bcd9f2f..f82f2b9 100644
--- a/www/api/paint.html
+++ b/www/api/paint.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html
index 8ba5cfe..37802ac 100644
--- a/www/api/pixel-iterator.html
+++ b/www/api/pixel-iterator.html
@@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,shrink-to-fit=no" />
- <title>MagickWand, C API: Pixel Iterator Methods @ ImageMagick</title>
+ <title>ImageMagick - MagickWand, C API: Pixel Iterator Methods</title>
<meta name="application-name" content="ImageMagick" />
<meta name="description" content="ImageMagick® creates, edits, composes, and converts bitmap images. Resize an image, crop it, change its shades and colors, add captions, and more." />
<meta name="application-url" content="https://imagemagick.org" />
@@ -45,7 +45,7 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="montage.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/download.html">Download</a>
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -536,4 +537,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 24th April 2019 05:14 -->
\ No newline at end of file
+<!-- Magick Cache 27th August 2019 22:50 -->
\ No newline at end of file
diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html
index b4e13f3..b023ecb 100644
--- a/www/api/pixel-wand.html
+++ b/www/api/pixel-wand.html
@@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,shrink-to-fit=no" />
- <title>MagickWand, C API: Pixel Wand Methods @ ImageMagick</title>
+ <title>ImageMagick - MagickWand, C API: Pixel Wand Methods</title>
<meta name="application-name" content="ImageMagick" />
<meta name="description" content="ImageMagick® creates, edits, composes, and converts bitmap images. Resize an image, crop it, change its shades and colors, add captions, and more." />
<meta name="application-url" content="https://imagemagick.org" />
@@ -29,15 +29,15 @@
<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="pixel-wand.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/pixel-wand.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>
<header>
<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>
@@ -45,28 +45,28 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="montage.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">
+ <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>
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -1585,24 +1586,24 @@
</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="pixel-wand.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="pixel-wand.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/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="assets/magick.js" crossorigin="anonymous"></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 24th April 2019 09:31 -->
\ No newline at end of file
+<!-- Magick Cache 1st September 2019 20:30 -->
\ No newline at end of file
diff --git a/www/api/profile.html b/www/api/profile.html
index 0ded6d0..20b653b 100644
--- a/www/api/profile.html
+++ b/www/api/profile.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/property.html b/www/api/property.html
index 16a505b..799b93b 100644
--- a/www/api/property.html
+++ b/www/api/property.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/quantize.html b/www/api/quantize.html
index d256948..f996eac 100644
--- a/www/api/quantize.html
+++ b/www/api/quantize.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/registry.html b/www/api/registry.html
index ae2463d..fa16515 100644
--- a/www/api/registry.html
+++ b/www/api/registry.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/resize.html b/www/api/resize.html
index 33a1eee..88bda4a 100644
--- a/www/api/resize.html
+++ b/www/api/resize.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/resource.html b/www/api/resource.html
index 7b2092f..cd09134 100644
--- a/www/api/resource.html
+++ b/www/api/resource.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/segment.html b/www/api/segment.html
index 7eb6791..fdb6262 100644
--- a/www/api/segment.html
+++ b/www/api/segment.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/shear.html b/www/api/shear.html
index 6125045..54ad19e 100644
--- a/www/api/shear.html
+++ b/www/api/shear.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/signature.html b/www/api/signature.html
index 1d7df9b..e0f4f0c 100644
--- a/www/api/signature.html
+++ b/www/api/signature.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/statistic.html b/www/api/statistic.html
index cc5f126..0679d1e 100644
--- a/www/api/statistic.html
+++ b/www/api/statistic.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/stream.html b/www/api/stream.html
index a75d3ae..a35573d 100644
--- a/www/api/stream.html
+++ b/www/api/stream.html
@@ -63,10 +63,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/transform.html b/www/api/transform.html
index 520ad0f..af5cd83 100644
--- a/www/api/transform.html
+++ b/www/api/transform.html
@@ -63,7 +63,7 @@
<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>
+ <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">
diff --git a/www/api/version.html b/www/api/version.html
index c4a4d90..22fe7ee 100644
--- a/www/api/version.html
+++ b/www/api/version.html
@@ -57,10 +57,10 @@
<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>
+ <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">
+ <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>
diff --git a/www/api/wand-view.html b/www/api/wand-view.html
index f121666..9924586 100644
--- a/www/api/wand-view.html
+++ b/www/api/wand-view.html
@@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,shrink-to-fit=no" />
- <title>MagickWand, C API: Wand View Methods @ ImageMagick</title>
+ <title>ImageMagick - MagickWand, C API: Wand View Methods</title>
<meta name="application-name" content="ImageMagick" />
<meta name="description" content="ImageMagick® creates, edits, composes, and converts bitmap images. Resize an image, crop it, change its shades and colors, add captions, and more." />
<meta name="application-url" content="https://imagemagick.org" />
@@ -45,7 +45,7 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">
- <a class="nav-link" href="montage.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/download.html">Download</a>
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -592,4 +593,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 24th April 2019 21:28 -->
\ No newline at end of file
+<!-- Magick Cache 1st September 2019 14:55 -->
\ No newline at end of file
diff --git a/www/architecture.html b/www/architecture.html
index 7138519..966a3c2 100644
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -29,15 +29,15 @@
<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="architecture.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/www/architecture.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>
<header>
<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>
@@ -45,28 +45,28 @@
<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="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="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="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="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="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">
+ <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>
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -134,7 +135,7 @@
<h2><a class="anchor" id="cache"></a>The Pixel Cache</h2>
-<p>The ImageMagick pixel cache is a repository for image pixels with up to 32 channels. The channels are stored contiguously at the depth specified when ImageMagick was built. The channel depths are 8 bits-per-pixel component for the Q8 version of ImageMagick, 16 bits-per-pixel component for the Q16 version, and 32 bits-per-pixel component for the Q32 version. By default pixel components are 32-bit floating-bit <a href="high-dynamic-range.html">high dynamic-range</a> quantities. The channels can hold any value but typically contain red, green, blue, and alpha intensities or cyan, magenta, yellow, black and alpha intensities. A channel might contain the colormap indexes for colormapped images or the black channel for CMYK images. The pixel cache storage may be heap memory, disk-backed memory mapped, or on disk. The pixel cache is reference-counted. Only the cache properties are copied when the cache is cloned. The cache pixels are subsequently copied only when you signal your intention to update any of the pixels.</p>
+<p>The ImageMagick pixel cache is a repository for image pixels with up to 32 channels. The channels are stored contiguously at the depth specified when ImageMagick was built. The channel depths are 8 bits-per-pixel component for the Q8 version of ImageMagick, 16 bits-per-pixel component for the Q16 version, and 32 bits-per-pixel component for the Q32 version. By default pixel components are 32-bit floating-bit <a href="../www/www/high-dynamic-range.html">high dynamic-range</a> quantities. The channels can hold any value but typically contain red, green, blue, and alpha intensities or cyan, magenta, yellow, black and alpha intensities. A channel might contain the colormap indexes for colormapped images or the black channel for CMYK images. The pixel cache storage may be heap memory, disk-backed memory mapped, or on disk. The pixel cache is reference-counted. Only the cache properties are copied when the cache is cloned. The cache pixels are subsequently copied only when you signal your intention to update any of the pixels.</p>
<h3>Create the Pixel Cache</h3>
@@ -162,24 +163,24 @@
</code></pre></dd>
</dl>
-<p>In our discussion of the pixel cache, we use the <a href="magick-core.html">MagickCore API</a> to illustrate our points, however, the principles are the same for other program interfaces to ImageMagick.</p>
+<p>In our discussion of the pixel cache, we use the <a href="../www/www/magick-core.html">MagickCore API</a> to illustrate our points, however, the principles are the same for other program interfaces to ImageMagick.</p>
-<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="../www/command-line-options.html#version">‑version</a> option: </p>
+<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="../www/www/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.8-42 2019-03-04 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.8-63 2019-08-24 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>
<p>Once the pixel cache is associated with an image, you typically want to get, update, or put pixels into it. We refer to pixels inside the image region as <a href="architecture.html#authentic-pixels">authentic pixels</a> and outside the region as <a href="architecture.html#virtual-pixels">virtual pixels</a>. Use these methods to access the pixels in the cache:</p>
<ul>
- <li><a href="api/cache.html#GetVirtualPixels">GetVirtualPixels()</a>: gets pixels that you do not intend to modify or pixels that lie outside the image region (e.g. pixel @ -1,-3)</li>
- <li><a href="api/cache.html#GetAuthenticPixels">GetAuthenticPixels()</a>: gets pixels that you intend to modify</li>
- <li><a href="api/cache.html#QueueAuthenticPixels">QueueAuthenticPixels()</a>: queue pixels that you intend to set</li>
- <li><a href="api/cache.html#SyncAuthenticPixels">SyncAuthenticPixels()</a>: update the pixel cache with any modified pixels</li>
+ <li><a href="../www/api/cache.html#GetVirtualPixels">GetVirtualPixels()</a>: gets pixels that you do not intend to modify or pixels that lie outside the image region (e.g. pixel @ -1,-3)</li>
+ <li><a href="../www/api/cache.html#GetAuthenticPixels">GetAuthenticPixels()</a>: gets pixels that you intend to modify</li>
+ <li><a href="../www/api/cache.html#QueueAuthenticPixels">QueueAuthenticPixels()</a>: queue pixels that you intend to set</li>
+ <li><a href="../www/api/cache.html#SyncAuthenticPixels">SyncAuthenticPixels()</a>: update the pixel cache with any modified pixels</li>
</ul>
-<p>Here is a typical <a href="magick-core.html">MagickCore</a> code snippet for manipulating pixels in the pixel cache. In our example, we copy pixels from the input image to the output image and decrease the intensity by 10%:</p>
+<p>Here is a typical <a href="../www/www/magick-core.html">MagickCore</a> code snippet for manipulating pixels in the pixel cache. In our example, we copy pixels from the input image to the output image and decrease the intensity by 10%:</p>
<pre class="pre-scrollable"><code>const Quantum
*p;
@@ -217,9 +218,9 @@
{ /* an exception was thrown */ }
</code></pre>
-<p>When we first create the destination image by cloning the source image, the pixel cache pixels are not copied. They are only copied when you signal your intentions to modify or set the pixel cache by calling <a href="api/cache.html#GetAuthenticPixels">GetAuthenticPixels()</a> or <a href="api/cache.html#QueueAuthenticPixels">QueueAuthenticPixels()</a>. Use <a href="api/cache.html#QueueAuthenticPixels">QueueAuthenticPixels()</a> if you want to set new pixel values rather than update existing ones. You could use GetAuthenticPixels() to set pixel values but it is slightly more efficient to use QueueAuthenticPixels() instead. Finally, use <a href="api/cache.html#SyncAuthenticPixels">SyncAuthenticPixels()</a> to ensure any updated pixels are pushed to the pixel cache.</p>
+<p>When we first create the destination image by cloning the source image, the pixel cache pixels are not copied. They are only copied when you signal your intentions to modify or set the pixel cache by calling <a href="../www/api/cache.html#GetAuthenticPixels">GetAuthenticPixels()</a> or <a href="../www/api/cache.html#QueueAuthenticPixels">QueueAuthenticPixels()</a>. Use <a href="../www/api/cache.html#QueueAuthenticPixels">QueueAuthenticPixels()</a> if you want to set new pixel values rather than update existing ones. You could use GetAuthenticPixels() to set pixel values but it is slightly more efficient to use QueueAuthenticPixels() instead. Finally, use <a href="../www/api/cache.html#SyncAuthenticPixels">SyncAuthenticPixels()</a> to ensure any updated pixels are pushed to the pixel cache.</p>
-<p>You can associate arbitrary content with each pixel, called <em>meta</em> content. Use <a href="api/cache.html#GetVirtualMetacontent">GetVirtualMetacontent()</a> (to read the content) or <a href="api/cache.html#GetAuthenticMetacontent">GetAuthenticMetacontent()</a> (to update the content) to gain access to this content. For example, to print the metacontent, use:</p>
+<p>You can associate arbitrary content with each pixel, called <em>meta</em> content. Use <a href="../www/api/cache.html#GetVirtualMetacontent">GetVirtualMetacontent()</a> (to read the content) or <a href="../www/api/cache.html#GetAuthenticMetacontent">GetAuthenticMetacontent()</a> (to update the content) to gain access to this content. For example, to print the metacontent, use:</p>
<pre class="highlight"><code>const void
*metacontent;
@@ -246,7 +247,7 @@
<h3><a class="anchor" id="virtual-pixels"></a>Virtual Pixels</h3>
<p>There are a plethora of image processing algorithms that require a neighborhood of pixels about a pixel of interest. The algorithm typically includes a caveat concerning how to handle pixels around the image boundaries, known as edge pixels. With virtual pixels, you do not need to concern yourself about special edge processing other than choosing which virtual pixel method is most appropriate for your algorithm.</p>
- <p>Access to the virtual pixels are controlled by the <a href="api/cache.html#SetImageVirtualPixelMethod">SetImageVirtualPixelMethod()</a> method from the MagickCore API or the <a href="../www/command-line-options.html#virtual-pixel">‑virtual‑pixel</a> option from the command line. The methods include:</p>
+ <p>Access to the virtual pixels are controlled by the <a href="../www/api/cache.html#SetImageVirtualPixelMethod">SetImageVirtualPixelMethod()</a> method from the MagickCore API or the <a href="../www/www/command-line-options.html#virtual-pixel">‑virtual‑pixel</a> option from the command line. The methods include:</p>
<dl class="row">
<dt class="col-md-4">background</dt>
@@ -324,7 +325,7 @@
Time: unlimited
</pre>
-<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="../www/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>
+<p>You can set these limits either as a <a href="../www/www/security-policy.html">security policy</a> (see <a href="../www/source/policy.xml">policy.xml</a>), with an <a href="../www/www/resources.html#environment">environment variable</a>, with the <a href="../www/www/command-line-options.html#limit">-limit</a> command line option, or with the <a href="../www/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>
<policy domain="resource" name="temporary-path" value="/tmp"/>
<policy domain="resource" name="memory" value="256MiB"/>
@@ -347,7 +348,7 @@
<p>Note, the cache limits are global to each invocation of ImageMagick, meaning if you create several images, the combined resource requirements are compared to the limit to determine the pixel cache storage disposition.</p>
-<p>To determine which type and how much resources are consumed by the pixel cache, add the <a href="../www/command-line-options.html#debug">-debug cache</a> option to the command-line:</p>
+<p>To determine which type and how much resources are consumed by the pixel cache, add the <a href="../www/www/command-line-options.html#debug">-debug cache</a> option to the command-line:</p>
<pre class="highlight">-> convert -debug cache logo: -sharpen 3x2 null:
2016-12-17T13:33:42-05:00 0:00.000 0.000u 7.0.0 Cache convert: cache.c/DestroyPixelCache/1275/Cache
destroy
@@ -377,7 +378,7 @@
<h3>Cache Views</h3>
-<p>GetVirtualPixels(), GetAuthenticPixels(), QueueAuthenticPixels(), and SyncAuthenticPixels(), from the MagickCore API, can only deal with one pixel cache area per image at a time. Suppose you want to access the first and last scanline from the same image at the same time? The solution is to use a <var>cache view</var>. A cache view permits you to access as many areas simultaneously in the pixel cache as you require. The cache view <a href="api/cache-view.html">methods</a> are analogous to the previous methods except you must first open a view and close it when you are finished with it. Here is a snippet of MagickCore code that permits us to access the first and last pixel row of the image simultaneously:</p>
+<p>GetVirtualPixels(), GetAuthenticPixels(), QueueAuthenticPixels(), and SyncAuthenticPixels(), from the MagickCore API, can only deal with one pixel cache area per image at a time. Suppose you want to access the first and last scanline from the same image at the same time? The solution is to use a <var>cache view</var>. A cache view permits you to access as many areas simultaneously in the pixel cache as you require. The cache view <a href="../www/api/cache-view.html">methods</a> are analogous to the previous methods except you must first open a view and close it when you are finished with it. Here is a snippet of MagickCore code that permits us to access the first and last pixel row of the image simultaneously:</p>
<pre class="pre-scrollable"><code>CacheView
*view_1,
*view_2;
@@ -424,7 +425,7 @@
<p>The ImageMagick Q16 version of ImageMagick permits you to read and write 16 bit images without scaling but the pixel cache consumes twice as many resources as the Q8 version. If your system has constrained memory or disk resources, consider the Q8 version of ImageMagick. In addition, the Q8 version typically executes faster than the Q16 version.</p>
-<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>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="../www/www/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 ...
@@ -445,7 +446,7 @@
<p>ImageMagick provides for streaming pixels as they are read from or written to an image. This has several advantages over the pixel cache. The time and resources consumed by the pixel cache scale with the area of an image, whereas the pixel stream resources scale with the width of an image. The disadvantage is the pixels must be consumed as they are streamed so there is no persistence.</p>
-<p>Use <a href="api/stream.html#ReadStream">ReadStream()</a> or <a href="api/stream.html#WriteStream">WriteStream()</a> with an appropriate callback method in your MagickCore program to consume the pixels as they are streaming. Here's an abbreviated example of using ReadStream:</p>
+<p>Use <a href="../www/api/stream.html#ReadStream">ReadStream()</a> or <a href="../www/api/stream.html#WriteStream">WriteStream()</a> with an appropriate callback method in your MagickCore program to consume the pixels as they are streaming. Here's an abbreviated example of using ReadStream:</p>
<pre class="pre-scrollable"><code>static size_t StreamPixels(const Image *image,const void *pixels,const size_t columns)
{
register const Quantum
@@ -470,7 +471,7 @@
image=ReadStream(image_info,&StreamPixels,exception);
</code></pre>
-<p>We also provide a lightweight tool, <a href="stream.html">stream</a>, 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 <a href="stream.html">stream</a> desirable when working with large images or when you require raw pixel components. A majority of the image formats stream pixels (red, green, and blue) from left to right and top to bottom. However, a few formats do not support this common ordering (e.g. the PSD format).</p>
+<p>We also provide a lightweight tool, <a href="../www/www/stream.html">stream</a>, 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 <a href="../www/www/stream.html">stream</a> desirable when working with large images or when you require raw pixel components. A majority of the image formats stream pixels (red, green, and blue) from left to right and top to bottom. However, a few formats do not support this common ordering (e.g. the PSD format).</p>
<h2><a class="anchor" id="properties"></a>Image Properties and Profiles</h2>
@@ -478,7 +479,7 @@
<pre class="highlight"><code>(void) printf("image width: %lu, height: %lu\n",image->columns,image->rows);
</code></pre>
-<p>For a great majority of image properties, such as an image comment or description, we use the <a href="api/property.html#GetImageProperty">GetImageProperty()</a> and <a href="api/property.html#SetImageProperty">SetImageProperty()</a> methods. Here we set a property and fetch it right back:</p>
+<p>For a great majority of image properties, such as an image comment or description, we use the <a href="../www/api/property.html#GetImageProperty">GetImageProperty()</a> and <a href="../www/api/property.html#SetImageProperty">SetImageProperty()</a> methods. Here we set a property and fetch it right back:</p>
<pre class="highlight"><code>const char
*comment;
@@ -490,7 +491,7 @@
<p>ImageMagick supports artifacts with the GetImageArtifact() and SetImageArtifact() methods. Artifacts are stealth properties that are not exported to image formats (e.g. PNG).</p>
-<p>Image profiles are handled with <a href="api/profile.html#GetImageProfile">GetImageProfile()</a>, <a href="api/profile.html#SetImageProfile">SetImageProfile()</a>, and <a href="api/profile.html#ProfileImage">ProfileImage()</a> methods. Here we set a profile and fetch it right back:</p>
+<p>Image profiles are handled with <a href="../www/api/profile.html#GetImageProfile">GetImageProfile()</a>, <a href="../www/api/profile.html#SetImageProfile">SetImageProfile()</a>, and <a href="../www/api/profile.html#ProfileImage">ProfileImage()</a> methods. Here we set a profile and fetch it right back:</p>
<pre class="highlight"><code>StringInfo
*profile;
@@ -538,9 +539,9 @@
<h2><a class="anchor" id="threads"></a>Threads of Execution</h2>
-<p>Many of ImageMagick's internal algorithms are threaded to take advantage of speed-ups offered by the multicore processor chips. However, you are welcome to use ImageMagick algorithms in your threads of execution with the exception of the MagickCore's GetVirtualPixels(), GetAuthenticPixels(), QueueAuthenticPixels(), or SyncAuthenticPixels() pixel cache methods. These methods are intended for one thread of execution only with the exception of an OpenMP parallel section. To access the pixel cache with more than one thread of execution, use a cache view. We do this for the <a href="api/composite.html#CompositeImage">CompositeImage()</a> method, for example. Suppose we want to composite a single source image over a different destination image in each thread of execution. If we use GetVirtualPixels(), the results are unpredictable because multiple threads would likely be asking for different areas of the pixel cache simultaneously. Instead we use GetCacheViewVirtualPixels() which creates a unique view for each thread of execution ensuring our program behaves properly regardless of how many threads are invoked. The other program interfaces, such as the <a href="magick-wand.html">MagickWand API</a>, are completely thread safe so there are no special precautions for threads of execution.</p>
+<p>Many of ImageMagick's internal algorithms are threaded to take advantage of speed-ups offered by the multicore processor chips. However, you are welcome to use ImageMagick algorithms in your threads of execution with the exception of the MagickCore's GetVirtualPixels(), GetAuthenticPixels(), QueueAuthenticPixels(), or SyncAuthenticPixels() pixel cache methods. These methods are intended for one thread of execution only with the exception of an OpenMP parallel section. To access the pixel cache with more than one thread of execution, use a cache view. We do this for the <a href="../www/api/composite.html#CompositeImage">CompositeImage()</a> method, for example. Suppose we want to composite a single source image over a different destination image in each thread of execution. If we use GetVirtualPixels(), the results are unpredictable because multiple threads would likely be asking for different areas of the pixel cache simultaneously. Instead we use GetCacheViewVirtualPixels() which creates a unique view for each thread of execution ensuring our program behaves properly regardless of how many threads are invoked. The other program interfaces, such as the <a href="../www/www/magick-wand.html">MagickWand API</a>, are completely thread safe so there are no special precautions for threads of execution.</p>
-<p>Here is an MagickCore code snippet that takes advantage of threads of execution with the <a href="openmp.html">OpenMP</a> programming paradigm:</p>
+<p>Here is an MagickCore code snippet that takes advantage of threads of execution with the <a href="../www/www/openmp.html">OpenMP</a> programming paradigm:</p>
<pre class="pre-scrollable"><code>CacheView
*image_view;
@@ -650,9 +651,9 @@
<p>If you call the ImageMagick API from your OpenMP-enabled application and you intend to dynamically increase the number of threads available in subsequent parallel regions, be sure to perform the increase <var>before</var> you call the API otherwise ImageMagick may fault.</p>
-<p><a href="api/wand-view.html">MagickWand</a> supports wand views. A view iterates over the entire, or portion, of the image in parallel and for each row of pixels, it invokes a callback method you provide. This limits most of your parallel programming activity to just that one module. There are similar methods in <a href="api/image-view.html">MagickCore</a>. For an example, see the same sigmoidal contrast algorithm implemented in both <a href="magick-wand.html#wand-view">MagickWand</a> and <a href="magick-core.html#image-view">MagickCore</a>.</p>
+<p><a href="../www/api/wand-view.html">MagickWand</a> supports wand views. A view iterates over the entire, or portion, of the image in parallel and for each row of pixels, it invokes a callback method you provide. This limits most of your parallel programming activity to just that one module. There are similar methods in <a href="../www/api/image-view.html">MagickCore</a>. For an example, see the same sigmoidal contrast algorithm implemented in both <a href="../www/www/magick-wand.html#wand-view">MagickWand</a> and <a href="../www/www/magick-core.html#image-view">MagickCore</a>.</p>
-<p>In most circumstances, the default number of threads is set to the number of processor cores on your system for optimal performance. However, if your system is hyperthreaded or if you are running on a virtual host and only a subset of the processors are available to your server instance, you might get an increase in performance by setting the thread <a href="resources.html#configure">policy</a> or the <a href="resources.html#environment">MAGICK_THREAD_LIMIT</a> environment variable. For example, your virtual host has 8 processors but only 2 are assigned to your server instance. The default of 8 threads can cause severe performance problems. One solution is to limit the number of threads to the available processors in your <a href="https://imagemagick.org/source/policy.xml">policy.xml</a> configuration file:</p>
+<p>In most circumstances, the default number of threads is set to the number of processor cores on your system for optimal performance. However, if your system is hyperthreaded or if you are running on a virtual host and only a subset of the processors are available to your server instance, you might get an increase in performance by setting the thread <a href="../www/www/resources.html#configure">policy</a> or the <a href="../www/www/resources.html#environment">MAGICK_THREAD_LIMIT</a> environment variable. For example, your virtual host has 8 processors but only 2 are assigned to your server instance. The default of 8 threads can cause severe performance problems. One solution is to limit the number of threads to the available processors in your <a href="../www/source/policy.xml">policy.xml</a> configuration file:</p>
<pre class="highlight"><code><policy domain="resource" name="thread" value="2"/>
</code></pre>
@@ -679,7 +680,7 @@
Performance[12]: 10i 4.525ips 0.799e 18.320u 0:02.210
</pre>
<p>The sweet spot for this example is 6 threads. This makes sense since there are 6 physical cores. The other 6 are hyperthreads. It appears that sharpening does not benefit from hyperthreading.</p>
-<p>In certain cases, it might be optimal to set the number of threads to 1 or to disable OpenMP completely with the <a href="resources.html#environment">MAGICK_THREAD_LIMIT</a> environment variable, <a href="../www/command-line-options.html#limit">-limit</a> command line option, or the <a href="resources.html#configure">policy.xml</a> configuration file.</p>
+<p>In certain cases, it might be optimal to set the number of threads to 1 or to disable OpenMP completely with the <a href="../www/www/resources.html#environment">MAGICK_THREAD_LIMIT</a> environment variable, <a href="../www/www/command-line-options.html#limit">-limit</a> command line option, or the <a href="../www/www/resources.html#configure">policy.xml</a> configuration file.</p>
<h2><a class="anchor" id="distributed"></a>Heterogeneous Distributed Processing</h2>
<p>ImageMagick includes support for heterogeneous distributed processing with the <a href="http://en.wikipedia.org/wiki/OpenCL">OpenCL</a> framework. OpenCL kernels within ImageMagick permit image processing algorithms to execute across heterogeneous platforms consisting of CPUs, GPUs, and other processors. Depending on your platform, speed-ups can be an order of magnitude faster than the traditional single CPU.</p>
@@ -755,7 +756,7 @@
destination[index].w=ClampToQuantum(sum.w);
};</code></pre>
-<p>See <a href="https://github.com/ImageMagick/ImageMagick/tree/ImageMagick-7/magick/accelerate.c">magick/accelerate.c</a> for a complete implementation of image convolution with an OpenCL kernel.</p>
+<p>See <a href="https://github.com/ImageMagick/ImageMagick/blob/master/MagickCore/accelerate.c">MagickCore/accelerate.c</a> for a complete implementation of image convolution with an OpenCL kernel.</p>
<p>Note, that under Windows, you might have an issue with TDR (Timeout Detection and Recovery of GPUs). Its purpose is to detect runaway tasks hanging the GPU by using an execution time threshold. For some older low-end GPUs running the OpenCL filters in ImageMagick, longer execution times might trigger the TDR mechanism and pre-empt the GPU image filter. When this happens, ImageMagick automatically falls back to the CPU code path and returns the expected results. To avoid pre-emption, increase the <a href="http://msdn.microsoft.com/en-us/library/windows/hardware/gg487368.aspx">TdrDelay</a> registry key.</p>
@@ -763,7 +764,7 @@
<p>An image coder (i.e. encoder / decoder) is responsible for registering, optionally classifying, optionally reading, optionally writing, and unregistering one image format (e.g. PNG, GIF, JPEG, etc.). Registering an image coder alerts ImageMagick a particular format is available to read or write. While unregistering tells ImageMagick the format is no longer available. The classifying method looks at the first few bytes of an image and determines if the image is in the expected format. The reader sets the image size, colorspace, and other properties and loads the pixel cache with the pixels. The reader returns a single image or an image sequence (if the format supports multiple images per file), or if an error occurs, an exception and a null image. The writer does the reverse. It takes the image properties and unloads the pixel cache and writes them as required by the image format.</p>
-<p>Here is a listing of a sample <a href="https://imagemagick.org/source/mgk.c">custom coder</a>. It reads and writes images in the MGK image format which is simply an ID followed by the image width and height followed by the RGB pixel values.</p>
+<p>Here is a listing of a sample <a href="../www/source/mgk.c">custom coder</a>. It reads and writes images in the MGK image format which is simply an ID followed by the image width and height followed by the RGB pixel values.</p>
<pre class="pre-scrollable"><code>#include <MagickCore/studio.h>
#include <MagickCore/blob.h>
#include <MagickCore/cache.h>
@@ -1193,9 +1194,9 @@
<h2><a class="anchor" id="filters"></a>Custom Image Filters</h2>
-<p>ImageMagick provides a convenient mechanism for adding your own custom image processing algorithms. We call these image filters and they are invoked from the command line with the <a href="../www/command-line-options.html#process">-process</a> option or from the MagickCore API method <a href="api/module.html#ExecuteModuleProcess">ExecuteModuleProcess()</a>.</p>
+<p>ImageMagick provides a convenient mechanism for adding your own custom image processing algorithms. We call these image filters and they are invoked from the command line with the <a href="../www/www/command-line-options.html#process">-process</a> option or from the MagickCore API method <a href="../www/api/module.html#ExecuteModuleProcess">ExecuteModuleProcess()</a>.</p>
-<p>Here is a listing of a sample <a href="https://imagemagick.org/source/analyze.c">custom image filter</a>. It computes a few statistics such as the pixel brightness and saturation mean and standard-deviation.</p>
+<p>Here is a listing of a sample <a href="../www/source/analyze.c">custom image filter</a>. It computes a few statistics such as the pixel brightness and saturation mean and standard-deviation.</p>
<pre class="pre-scrollable"><code>#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1465,24 +1466,24 @@
</div>
</main><!-- /.container -->
<footer class="magick-footer">
- <p><a href="security-policy.html">Security</a> •
- <a href="architecture.html">Architecture</a>
+ <p><a href="../www/www/security-policy.html">Security</a> •
+ <a href="../www/www/architecture.html">Architecture</a>
- <a href="architecture.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="architecture.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="links.html">Related</a> •
- <a href="sitemap.html">Sitemap</a>
+ <a href="../www/www/links.html">Related</a> •
+ <a href="../www/www/sitemap.html">Sitemap</a>
<br/>
- <a href="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="https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="../www/www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
<!-- Javascript assets -->
- <script src="assets/magick.js" crossorigin="anonymous"></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 27th April 2019 19:38 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 15:31 -->
\ No newline at end of file
diff --git a/www/binary-releases.html b/www/binary-releases.html
index a47c778..ab965e5 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/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/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 9845b3d..cf462df 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -86,7 +87,117 @@
</header>
<main class="container">
<div class="magick-template">
-<div class="magick-header"><dl><dt>2019-04-29 7.0.8-42 Cristy <quetzlzacatenango@image...></dt>
+<div class="magick-header"><dl><dt>2019-08-31 7.0.8-63 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-63, GIT revision 16088:3b7a33d:20190831.</li>
+<dt>2019-08-24 7.0.8-62 Cristy <quetzlzacatenango@image...></dt>
+ <li> Properly identify the DNG and AI image format (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=36581).</li>
+<dt>2019-08-23 7.0.8-62 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-62, GIT revision 16061:7525595:20190823.</li>
+<dt>2019-08-23 7.0.8-62 Dirk Lemstra <dirk@lem.....org></dt>
+ <li> Added option to limit the maximum point size with -define caption:max-pointsize=pointsize.</li>
+ <li> Corrected JP2 numresolution calculation (reference: https://github.com/ImageMagick/ImageMagick/issues/1673)</li>
+<dt>2019-08-19 7.0.8-62 Cristy <quetzlzacatenango@image...></dt>
+ <li> Conditionally compile call to AcquireCLocale() (reference https://github.com/ImageMagick/ImageMagick/issues/1669).</li>
+ <li> More robust support for converting bitmap to vector.</li>
+<dt>2019-08-16 7.0.8-61 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-61, GIT revision 16033:0c5808c:20190816.</li>
+<dt>2019-08-03 7.0.8-61 Cristy <quetzlzacatenango@image...></dt>
+ <li> Issue with -background and -swirl (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=36512).</li>
+<dt>2019-08-10 7.0.8-60 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-60, GIT revision 16020:52ff205:20190810.</li>
+<dt>2019-08-07 7.0.8-60 Cristy <quetzlzacatenango@image...></dt>
+ <li> Enable reading EXR image file from stdin.</li>
+<dt>2019-08-04 7.0.8-59 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-59, GIT revision 15986:c3de0e7:20190804.</li>
+<dt>2019-08-01 7.0.8-59 Cristy <quetzlzacatenango@image...></dt>
+ <li> Module is a reserved keyword for C++ 20 (reference https://github.com/ImageMagick/ImageMagick/issues/1650).</li>
+<dt>2019-07-29 7.0.8-58 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-58, GIT revision 15962:cf00632:20190729.</li>
+<dt>2019-07-27 7.0.8-58 Cristy <quetzlzacatenango@image...></dt>
+ <li> Improve GetNextToken() performance.</li>
+<dt>2019-07-26 7.0.8-57 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-57, GIT revision 15948:8fba4a3:20190726.</li>
+<dt>2019-07-22 7.0.8-57 Cristy <quetzlzacatenango@image...></dt>
+ <li> Heap-buffer-overflow in Postscript coder (reference https://github.com/ImageMagick/ImageMagick/issues/1644).</li>
+ <li> The -alpha shape option nondeteministic under OpenMP (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=36396).</li>
+ <li> Correction to the ModulusAdd and ModulusSubtract composite op (reference https://imagemagick.org/discourse-server//viewtopic.html?f=2&t=36413).</li>
+<dt>2019-07-20 7.0.8-56 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-56, GIT revision 15936:2ac4147:20190720.</li>
+<dt>2019-07-20 7.0.8-56 Cristy <quetzlzacatenango@image...></dt>
+ <li> Unexpected -alpha shape results (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=36396).</li>
+ <li> Converting from PDF to PBM inverts the image (reference https://github.com/ImageMagick/ImageMagick/issues/1643).</li>
+<dt>2019-07-18 7.0.8-55 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-55, GIT revision 15930:ac09240:20190718.</li>
+<dt>2019-07-18 7.0.8-55 Cristy <quetzlzacatenango@image...></dt>
+ <li> Heap-buffer overflow (reference https://github.com/ImageMagick/ImageMagick/issues/1641</li>
+ <li> PerlMagick test suite passes again (reference https://github.com/ImageMagick/ImageMagick/issues/1640) </li>
+<dt>2019-07-16 7.0.8-54 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-54, GIT revision 15916:e868e22:20190716.</li>
+<dt>2019-07-08 7.0.8-54 Cristy <quetzlzacatenango@image...></dt>
+ <li> resolve division by zero (reference https://github.com/ImageMagick/ImageMagick/issues/1629).</li>
+ <li> introducing MagickLevelImageColors() MagickWand method.</li>
+ <li> Transient problem with text placement with gravity (reference https://github.com/ImageMagick/ImageMagick/issues/1633).</li>
+ <li> Support TIM2 image format (reference https://github.com/ImageMagick/ImageMagick/pull/1571).</li>
+ <li> For -magnify option, specify an alternative scaling method with -define magnify:method=method, choose from these methods: eagle2X, eagle3X, eagle3XB, epb2X, fish2X, hq2X, scale2X (default), scale3X, xbr2X.</li>
+<dt>2019-07-05 7.0.8-53 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-53, GIT revision 15828:f5d59c0:20190705.</li>
+<dt>2019-07-05 7.0.8-53 Cristy <quetzlzacatenango@image...></dt>
+ <li> Fix -fx parsing issue (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=36314).</li>
+<dt>2019-07-05 7.0.8-52 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-52, GIT revision 15825:ea47310:20190705.</li>
+<dt>2019-07-01 7.0.8-52 Cristy <quetzlzacatenango@image...></dt>
+ <li> Eliminate buffer overflow in TranslateEvent() (reference https://github.com/ImageMagick/ImageMagick/issues/1621).</li>
+<dt>2019-06-30 7.0.8-51 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-51, GIT revision 15812:51f11c4:20190630.</li>
+<dt>2019-06-24 7.0.8-51 Cristy <quetzlzacatenango@image...></dt>
+ <li> Clone rather than copy X window name/icon.</li>
+ <li> Optimize PDF reader.</li>
+<dt>2019-06-23 7.0.8-50 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-50, GIT revision 15778:4a60519:20190623</li>
+<dt>2019-06-14 7.0.8-50 Dirk Lemstra <dirk@lem.....org></dt>
+ <li> Added support for reading all images from a HEIC image (reference https://github.com/ImageMagick/ImageMagick/issues/1391).</li>
+ <li> Heap-buffer-overflow in MagickCore/fourier.c (reference https://github.com/ImageMagick/ImageMagick/issues/1588).</li>
+ <li> Fixed a number of issues (reference https://imagemagick.org/discourse-server//viewforum.html?f=3).</li>
+ <li> Fixed a number of issues (reference https://github.com/ImageMagick/ImageMagick/issues).</li>
+<dt>2019-06-08 7.0.8-49 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-49, GIT revision 15708:6d7e1db:20190608</li>
+<dt>2019-06-03 7.0.8-49 Cristy <quetzlzacatenango@image...></dt>
+ <li> Add support for RGB565 image format (reference https://imagemagick.org/discourse-server//viewtopic.html?f=2&t=36078).</li>
+ <li> Use user defined allocator instead of `malloc` (reference https://github.com/ImageMagick/ImageMagick6/pull/49/).</li>
+ <li> Add static decorator to accelerator kernels (reference https://github.com/ImageMagick/ImageMagick/issues/1366).</li>
+<dt>2019-06-01 7.0.8-48 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-48, GIT revision 15689:061a3bb82:20190601</li>
+<dt>2019-06-01 7.0.8-48 Cristy <quetzlzacatenango@image...></dt>
+ <li> Fix transient convolution bug (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=36119).</li>
+<dt>2019-05-26 7.0.8-47 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-47, GIT revision 15681:5cffc6cbb:20190526</li>
+<dt>2019-05-19 7.0.8-47 Cristy <quetzlzacatenango@image...></dt>
+ <li> Support 16 and 32 bit tiled float TIFF images.</li>
+ <li> Convolve morphology alpha channel fix (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=36086).</li>
+ <li> Text improvements to the internal SVG renderer.</li>
+<dt>2019-05-14 7.0.8-46 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-46, GIT revision 15655:84dd3301c:20190518</li>
+<dt>2019-05-14 7.0.8-46 Cristy <quetzlzacatenango@image...></dt>
+ <li> PerlMagick unit tests pass again.</li>
+ <li> Builds under MacOS X and FreeBSD works again.</li>
+ <li> Return HEIC images in the sRGB colorspace.</li>
+<dt>2019-05-12 7.0.8-45 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-45, GIT revision 15634:784105bcb:20190512</li>
+<dt>2019-05-06 7.0.8-45 Cristy <quetzlzacatenango@image...></dt>
+ <li> Fix image signatures to ensure they are Q-depth invariant (reference https://imagemagick.org/discourse-server//viewtopic.html?f=1&t=35970).</li>
+ <li> Fixed a number of issues (reference https://imagemagick.org/discourse-server//viewforum.html?f=3).</li>
+ <li> Fixed a number of issues (reference https://github.com/ImageMagick/ImageMagick/issues).</li>
+<dt>2019-05-03 7.0.8-44 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-44, GIT revision 15600:41f47759a:20190503</li>
+<dt>2019-05-03 7.0.8-44 Cristy <quetzlzacatenango@image...></dt>
+ <li> Fixed a number of issues (reference https://imagemagick.org/discourse-server//viewforum.html?f=3).</li>
+ <li> Fixed a number of issues (reference https://github.com/ImageMagick/ImageMagick/issues).</li>
+<dt>2019-05-01 7.0.8-43 Cristy <quetzlzacatenango@image...></dt>
+ <li> Release ImageMagick version 7.0.8-43, GIT revision 15595:0062cef74:20190502</li>
+<dt>2019-05-01 7.0.8-43 Cristy <quetzlzacatenango@image...></dt>
+ <li> Fixed a number of issues (reference https://imagemagick.org/discourse-server//viewforum.html?f=3).</li>
+ <li> Fixed a number of issues (reference https://github.com/ImageMagick/ImageMagick/issues).</li>
+<dt>2019-04-29 7.0.8-42 Cristy <quetzlzacatenango@image...></dt>
<li> Release ImageMagick version 7.0.8-42, GIT revision 15570:71190ccd0:20190424</li>
<dt>2019-04-20 7.0.8-42 Cristy <quetzlzacatenango@image...></dt>
<li> Fixed a number of issues (reference https://imagemagick.org/discourse-server//viewforum.html?f=3).</li>
@@ -885,7 +996,7 @@
<li> Fix for possible security vulnerabilities (reference https://imagemagick.org/discourse-server//viewtopic.html?f=4&t=29588).</li>
<dt>2016-04-30 7.0.1-0 Cristy <quetzlzacatenango@image...></dt>
<li> New version 7.0.1-0, GIT revision 10716:b527bce:20160430.</li>
-<dt>2016-01-30 7.0.0-0 Fahad-Alsaidi & ShamsaHamed</dt>
+<dt>2016-01-30 7.0.0-0 Fahad-Alsaidi & ShamsaHamed</dt>
<li> Add support for languages that require complex text layout (reference https://github.com/ImageMagick/ImageMagick/pull/88).</li>
<dt>2012-04-27 7.0.0-0 Anthony thyssen <A.Thyssen@griffith...></dt>
<li> Allow the use of set and escapes when no images in memory (unless you attempt to access per-image meta-data) Currently does not include %[fx:...] and %[pixel:...]</li>
@@ -928,4 +1039,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 27th April 2019 18:04 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:05 -->
\ No newline at end of file
diff --git a/www/cipher.html b/www/cipher.html
index 3fe2af6..1c5103e 100644
--- a/www/cipher.html
+++ b/www/cipher.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -171,4 +172,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 27th April 2019 19:41 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:26 -->
\ No newline at end of file
diff --git a/www/clahe.html b/www/clahe.html
index fadbf3c..cda741b 100644
--- a/www/clahe.html
+++ b/www/clahe.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -141,4 +142,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 19:41 -->
\ No newline at end of file
diff --git a/www/color-management.html b/www/color-management.html
index 748411a..c33f335 100644
--- a/www/color-management.html
+++ b/www/color-management.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -169,4 +170,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 27th April 2019 19:41 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 15:53 -->
\ No newline at end of file
diff --git a/www/color.html b/www/color.html
index e24f9bf..6639e97 100644
--- a/www/color.html
+++ b/www/color.html
@@ -57,7 +57,7 @@
<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>
+ <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">
@@ -4958,7 +4958,7 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/support.html">Donate</a> •
- <a href="../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="../www/../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
diff --git a/www/command-line-options.html b/www/command-line-options.html
index 2a5e21d..c287bba 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -57,7 +57,7 @@
<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>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
@@ -8099,7 +8099,7 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="support.html">Donate</a> •
- <a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
diff --git a/www/command-line-processing.html b/www/command-line-processing.html
index 2e930e5..ca585f6 100644
--- a/www/command-line-processing.html
+++ b/www/command-line-processing.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -424,7 +425,7 @@
<p>The <var>geometry</var> argument might take any of the forms listed in the table below. These will described in more detail in the subsections following the table. The usual form is <var>size</var>[<var>offset</var>], meaning <var>size</var> is required and <var>offset</var> is optional. Occasionally, [<var>size</var>]<var>offset</var> is possible. In no cases are spaces permitted within the <var>geometry</var> argument.</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<col width="20%"/> <col width="80%"/>
<thead>
@@ -651,4 +652,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 27th April 2019 17:12 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:12 -->
\ No newline at end of file
diff --git a/www/command-line-tools.html b/www/command-line-tools.html
index 3025c94..ddc506d 100644
--- a/www/command-line-tools.html
+++ b/www/command-line-tools.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -110,7 +111,7 @@
<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 class="anchor" id="stream"></a><a href="../www/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>
</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>
@@ -139,4 +140,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 27th April 2019 17:18 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:23 -->
\ No newline at end of file
diff --git a/www/compare.html b/www/compare.html
index d95e5af..b1e29e1 100644
--- a/www/compare.html
+++ b/www/compare.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -456,4 +457,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 27th April 2019 18:14 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:46 -->
\ No newline at end of file
diff --git a/www/compose.html b/www/compose.html
index 84cfcdb..4312746 100644
--- a/www/compose.html
+++ b/www/compose.html
@@ -57,7 +57,7 @@
<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>
+ <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">
@@ -638,7 +638,7 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/support.html">Donate</a> •
- <a href="../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="../www/../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
diff --git a/www/composite.html b/www/composite.html
index 15e41f8..3ca569f 100644
--- a/www/composite.html
+++ b/www/composite.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -558,4 +559,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 27th April 2019 19:09 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 15:40 -->
\ No newline at end of file
diff --git a/www/conjure.html b/www/conjure.html
index d03ba81..f8b1a29 100644
--- a/www/conjure.html
+++ b/www/conjure.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
diff --git a/www/connected-components.html b/www/connected-components.html
index 84231ff..46fd7b9 100644
--- a/www/connected-components.html
+++ b/www/connected-components.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -149,4 +150,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 18:07 -->
\ No newline at end of file
diff --git a/www/contact.html b/www/contact.html
index fdb5ea9..f5cbded 100644
--- a/www/contact.html
+++ b/www/contact.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -95,7 +96,7 @@
c0eea7</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">
+ <div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td><label id="authenticate" title="Your authentication code">Authenticate</label></td>
diff --git a/www/convert.html b/www/convert.html
index 4980c11..c76ca1d 100644
--- a/www/convert.html
+++ b/www/convert.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -133,7 +134,7 @@
<p>The <code>convert</code> command recognizes these options. Click on an option to get more details about how that option works.</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td><a href="../www/command-line-options.html#adaptive-blur">-adaptive-blur <var>geometry</var></a></td>
@@ -1367,4 +1368,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 27th April 2019 17:18 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:07 -->
\ No newline at end of file
diff --git a/www/develop.html b/www/develop.html
index 6e08f0a..12740a6 100644
--- a/www/develop.html
+++ b/www/develop.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -235,4 +236,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 27th April 2019 18:02 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:32 -->
\ No newline at end of file
diff --git a/www/display.html b/www/display.html
index ae3fbf9..a4b4f76 100644
--- a/www/display.html
+++ b/www/display.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -598,4 +599,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 18:53 -->
\ No newline at end of file
diff --git a/www/distribute-pixel-cache.html b/www/distribute-pixel-cache.html
index 8e32382..f2f5fbe 100644
--- a/www/distribute-pixel-cache.html
+++ b/www/distribute-pixel-cache.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -127,4 +128,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 27th April 2019 17:01 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:24 -->
\ No newline at end of file
diff --git a/www/download.html b/www/download.html
index df2fa88..2943a54 100644
--- a/www/download.html
+++ b/www/download.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -97,7 +98,7 @@
<p>These are the Unix variations that we support. If your system is not on the list, try installing from <a href="install-source.html">source</a>. Although ImageMagick runs fine on a single core computer, it automagically runs in parallel on dual and quad-core systems reducing run times considerably.</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<col width="50%"/> <col width="10%"/> <col width="10%"/> <col width="30%"/>
<tr>
@@ -108,16 +109,16 @@
</tr>
<tr>
- <td>ImageMagick-7.0.8-42.x86_64.rpm</td>
- <td><a href= "https://imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.8-42.x86_64.rpm">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-7.0.8-42.x86_64.rpm">download</a></td>
+ <td>ImageMagick-7.0.8-63.x86_64.rpm</td>
+ <td><a href= "https://imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.8-63.x86_64.rpm">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-7.0.8-63.x86_64.rpm">download</a></td>
<td>Redhat / CentOS 7.1 x86_64 RPM</td>
</tr>
<tr>
- <td>ImageMagick-libs-7.0.8-42.x86_64.rpm</td>
- <td><a href= "https://imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.8-42.x86_64.rpm">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-libs-7.0.8-42.x86_64.rpm">download</a></td>
+ <td>ImageMagick-libs-7.0.8-63.x86_64.rpm</td>
+ <td><a href= "https://imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.8-63.x86_64.rpm">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-libs-7.0.8-63.x86_64.rpm">download</a></td>
<td>Redhat / CentOS 7.1 x86_64 RPM</td>
</tr>
@@ -154,8 +155,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.8-42.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.8-42.x86_64.rpm</span></pre>
+<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>rpm -Uvh ImageMagick-7.0.8-63.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.8-63.x86_64.rpm</span></pre>
<p>For other systems, create (or choose) a directory to install the package into and change to that directory, for example:</p>
<pre class="highlight"><code>cd $HOME</code></pre>
@@ -193,7 +194,7 @@
<p>The <code>port</code> command downloads ImageMagick and many of its delegate libraries (e.g. JPEG, PNG, Freetype, etc.) and configures, builds, and installs ImageMagick automagically. Alternatively, you can download the ImageMagick Mac OS X distribution we provide:</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<col width="50%"/> <col width="10%"/> <col width="10%"/> <col width="30%"/>
<tr>
@@ -266,7 +267,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.8-42, svn, ...)</p>
+<p>where <var>VERSION</var> is the version of ImageMagick you want to compile (i.e.: 7.0.8-63, svn, ...)</p>
<p>This script compiles ImageMagick as a static library to be included in iOS projects and adds support for</p>
<ul>
@@ -304,7 +305,7 @@
<p>The Windows version of ImageMagick is self-installing. Simply click on the appropriate version below and it will launch itself and ask you a few installation questions. Versions with <var>Q8</var> in the name are 8 bits-per-pixel component (e.g. 8-bit red, 8-bit green, etc.), whereas, <var>Q16</var> in the filename are 16 bits-per-pixel component. A Q16 version permits you to read or write 16-bit images without losing precision but requires twice as much resources as the Q8 version. Versions with <var>dll</var> in the filename include ImageMagick libraries as <a href="http://www.answers.com/topic/dll">dynamic link libraries</a>. Unless you have a Windows 32-bit OS, we recommend this version of ImageMagick for 64-bit Windows:</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<col width="50%"/> <col width="10%"/> <col width="10%"/> <col width="30%"/>
<tr>
@@ -315,16 +316,16 @@
</tr>
<tr>
- <td>ImageMagick-7.0.8-42-Q16-x64-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q16-x64-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q16-x64-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q16-x64-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q16-x64-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-Q16-x64-dll.exe">download</a></td>
<td>Win64 dynamic at 16 bits-per-pixel component</td>
</tr>
</table></div>
<p>Or choose from these alternate Windows binary distributions:</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<col width="50%"/> <col width="10%"/> <col width="10%"/> <col width="30%"/>
<tr>
@@ -335,93 +336,93 @@
</tr>
<tr>
- <td>ImageMagick-7.0.8-42-Q16-x64-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q16-x64-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q16-x64-static.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q16-x64-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q16-x64-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-Q16-x64-static.exe">download</a></td>
<td>Win64 static at 16 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.8-42-Q8-x64-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q8-x64-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q8-x64-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q8-x64-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q8-x64-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-Q8-x64-dll.exe">download</a></td>
<td>Win64 dynamic at 8 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.8-42-Q8-x64-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q8-x64-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q8-x64-static.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q8-x64-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q8-x64-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-Q8-x64-static.exe">download</a></td>
<td>Win64 static at 8 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.8-42-Q16-HDRI-x64-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q16-HDRI-x64-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q16-HDRI-x64-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q16-HDRI-x64-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q16-HDRI-x64-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-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.8-42-Q16-HDRI-x64-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q16-HDRI-x64-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q16-HDRI-x64-static.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q16-HDRI-x64-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q16-HDRI-x64-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-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.8-42-Q16-x86-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q16-x86-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q16-x86-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q16-x86-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q16-x86-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-Q16-x86-dll.exe">download</a></td>
<td>Win32 dynamic at 16 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.8-42-Q16-x86-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q16-x86-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q16-x86-static.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q16-x86-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q16-x86-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-Q16-x86-static.exe">download</a></td>
<td>Win32 static at 16 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.8-42-Q8-x86-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q8-x86-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q8-x86-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q8-x86-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q8-x86-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-Q8-x86-dll.exe">download</a></td>
<td>Win32 dynamic at 8 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.8-42-Q8-x86-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q8-x86-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q8-x86-static.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q8-x86-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q8-x86-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-Q8-x86-static.exe">download</a></td>
<td>Win32 static at 8 bits-per-pixel component</td>
</tr>
<tr>
- <td>ImageMagick-7.0.8-42-Q16-HDRI-x86-dll.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q16-HDRI-x86-dll.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q16-HDRI-x86-dll.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q16-HDRI-x86-dll.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q16-HDRI-x86-dll.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-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.8-42-Q16-HDRI-x86-static.exe</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-Q16-HDRI-x86-static.exe">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-Q16-HDRI-x86-static.exe">download</a></td>
+ <td>ImageMagick-7.0.8-63-Q16-HDRI-x86-static.exe</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-Q16-HDRI-x86-static.exe">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-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.8-42-portable-Q16-x86.zip</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-portable-Q16-x86.zip">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-portable-Q16-x86.zip">download</a></td>
+ <td>ImageMagick-7.0.8-63-portable-Q16-x86.zip</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-portable-Q16-x86.zip">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-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.8-42-portable-Q16-x64.zip</td>
- <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-portable-Q16-x64.zip">download</a></td>
- <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-42-portable-Q16-x64.zip">download</a></td>
+ <td>ImageMagick-7.0.8-63-portable-Q16-x64.zip</td>
+ <td><a href= "https://imagemagick.org/download/binaries/ImageMagick-7.0.8-63-portable-Q16-x64.zip">download</a></td>
+ <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.8-63-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>
@@ -434,7 +435,7 @@
magick identify logo.gif
magick logo.gif win:</code></pre>
-<p>If you have any problems, you likely need <code>vcomp120.dll</code>. To install it, download <a href="https://www.microsoft.com/en-us/download/details.aspx?id=40784">Visual C++ 2013 Redistributable Package</a>.</p>
+<p>If you have any problems, you likely need <code>vcomp120.dll</code>. To install it, download <a href="https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads">Visual C++ Redistributable Package</a>.</p>
<p>Note, use a double quote (<code>"</code>) rather than a single quote (<code>'</code>) for the ImageMagick command line under Windows:</p>
@@ -469,4 +470,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 27th April 2019 17:07 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:14 -->
\ No newline at end of file
diff --git a/www/escape.html b/www/escape.html
index 4478592..177ef3d 100644
--- a/www/escape.html
+++ b/www/escape.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -89,7 +90,7 @@
<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>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-striped">
<tr>
<td><b>Profile Data</b></td>
@@ -152,7 +153,7 @@
<p>Remember, all long name forms of percent escapes are handled in a is case
insensitive manner. </p>
-<p><b>As of IM v6.8.0-5</b> you can now access the Artifact and Option
+<p>You can now access the Artifact and Option
free-form string tables directly, allowing you to override the above sequence,
and avoid accessing an attribute or property of the same name.</p>
@@ -160,6 +161,7 @@
%[option:<var>setting</var>]
</code></pre>
+<p>Escape handling requires access to an image container. If none are available, a blank image is created to ensure the expression can be processed and a value returned. For example, <code>magick -print "%[fx:.8765/3.14]" null: null:</code>.</p>
<h3>Single Letter Attribute Percent Escapes</h3>
@@ -167,7 +169,7 @@
common attributes and properties of an image, such as: the image filename
filename, type, width, height. </p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td>\n</td>
@@ -388,7 +390,7 @@
<p>In addition to the above specific and calculated attributes are recognized
when enclosed in braces (long form):</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td>%[basename]</td>
@@ -659,12 +661,7 @@
<p>How Global Options are used when a library function requests an Artifact is
one of the key differences between IMv6 and IMv7.</p>
-<p>In <b>ImageMagick version 6</b>... before each operator, any global Options
-are copied to per-image Artifacts, for every image in the current image list.
-This allows various operators to find its operational 'defines' or Artifacts.
-</p>
-
-<p>In <b>ImageMagick version 7</b>... sets a link back to the global options
+<p>Sets a link back to the global options
data, so that if a specific per-image Artifact is not found , then it will
look for a equivalent global Option for that image list. directly. This
saves coping these free-form options into artifacts repeatally, and means you
@@ -934,4 +931,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 27th April 2019 18:47 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:26 -->
\ No newline at end of file
diff --git a/www/examples.html b/www/examples.html
index 4ead713..9ce2666 100644
--- a/www/examples.html
+++ b/www/examples.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -114,4 +115,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 27th April 2019 18:40 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:36 -->
\ No newline at end of file
diff --git a/www/exception.html b/www/exception.html
index 0fda5a5..af4b65d 100644
--- a/www/exception.html
+++ b/www/exception.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
diff --git a/www/export.html b/www/export.html
index f9f5111..d3efc14 100644
--- a/www/export.html
+++ b/www/export.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
diff --git a/www/formats.html b/www/formats.html
index 15535c8..d49584a 100644
--- a/www/formats.html
+++ b/www/formats.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -155,7 +156,7 @@
including sub-formats). The following table provides a summary of
the supported image formats.</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tbody>
<tr>
@@ -604,7 +605,7 @@
<td><a href="http://www.jpeg.org/">JPEG</a></td>
<td>RW</td>
<td>Joint Photographic Experts Group JFIF format</td>
- <td>Note, JPEG is a lossy compression. In addition, you cannot create black and white images with JPEG nor can you save transparency.<br /><br /> Requires <a href="http://www.ijg.org/files/">jpegsrc.v8c.tar.gz</a>. You can set quality scaling for luminance and chrominance separately (e.g. <a href="../www/command-line-options.html#quality">-quality</a> 90,70). You can optionally define the DCT method, for example to specify the float method, use <a href="../www/command-line-options.html#define">-define jpeg:dct-method=float</a>. By default we compute optimal Huffman coding tables. Specify <a href="../www/command-line-options.html#define">-define jpeg:optimize-coding=false</a> to use the default Huffman tables. Two other options include <a href="../www/command-line-options.html#define">-define jpeg:block-smoothing</a> and <a href="../www/command-line-options.html#define">-define jpeg:fancy-upsampling</a>. Set the sampling factor with <a href="../www/command-line-options.html#define">-define jpeg:sampling-factor</a>. You can size the image with <code>jpeg:size</code>, for example <a href="../www/command-line-options.html#define">-define jpeg:size=128x128</a>. To restrict the maximum file size, use <code>jpeg:extent</code>, for example <a href="../www/command-line-options.html#define">-define jpeg:extent=400KB</a>. To define one or more custom quantization tables, use <a href="../www/command-line-options.html#define">-define jpeg:q-table=<i>filename</i></a>. To avoid reading a particular associated image profile, use <a href="../www/command-line-options.html#define">-define profile:skip=<i>name</i></a> (e.g. profile:skip=ICC).</td>
+ <td>Note, JPEG is a lossy compression. In addition, you cannot create black and white images with JPEG nor can you save transparency.<br /><br /> Requires <a href="http://www.ijg.org/files/">jpegsrc.v8c.tar.gz</a>. You can set quality scaling for luminance and chrominance separately (e.g. <a href="../www/command-line-options.html#quality">-quality</a> 90,70). You can optionally define the DCT method, for example to specify the float method, use <a href="../www/command-line-options.html#define">-define jpeg:dct-method=float</a>. By default we compute optimal Huffman coding tables. Specify <a href="../www/command-line-options.html#define">-define jpeg:optimize-coding=false</a> to use the default Huffman tables. Two other options include <a href="../www/command-line-options.html#define">-define jpeg:block-smoothing</a> and <a href="../www/command-line-options.html#define">-define jpeg:fancy-upsampling</a>. Set the sampling factor with <a href="../www/command-line-options.html#define">-define jpeg:sampling-factor</a>. You can size the image with <code>jpeg:size</code>, for example <a href="../www/command-line-options.html#define">-define jpeg:size=128x128</a>. To restrict the maximum file size, use <code>jpeg:extent</code>, for example <a href="../www/command-line-options.html#define">-define jpeg:extent=400KB</a>. To define one or more custom quantization tables, use <a href="../www/command-line-options.html#define">-define jpeg:q-table=<i>filename</i></a>. These values are multiplied by <a href="../www/command-line-options.html#quality">-quality</a> argument divided by 100.0. To avoid reading a particular associated image profile, use <a href="../www/command-line-options.html#define">-define profile:skip=<i>name</i></a> (e.g. profile:skip=ICC).</td>
</tr>
<tr>
@@ -1010,6 +1011,13 @@
</tr>
<tr>
+ <td>RGB565</td>
+ <td>R</td>
+ <td>Raw red, green, blue pixels in the 5-6-5 format</td>
+ <td>Use <a href="../www/command-line-options.html#size">-size</a> to specify the image width and height.</td>
+ </tr>
+
+ <tr>
<td>RGBA</td>
<td>RW</td>
<td>Raw red, green, blue, and alpha samples</td>
@@ -1282,7 +1290,7 @@
<p>ImageMagick supports a number of image format specifications which refer to images prepared via an algorithm, or input/output targets. The following table lists these pseudo-image formats:</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<th>Tag</th>
@@ -1515,7 +1523,7 @@
<p>ImageMagick includes a number of built-in (embedded) images which may be referenced as if they were an image file. The <code>magick:</code> format tag may be used via the syntax <code>magick:</code><var>name</var> to request an embedded image (e.g. <code>magick:logo</code>). For backwards compatibility, the image specifications <code>GRANITE:</code>, <code>LOGO:</code>, <code>NETSCAPE:</code>, and <code>ROSE:</code> may also be used to request images with those names.</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<th>Tag</th>
@@ -1565,7 +1573,7 @@
<p>ImageMagick includes a number of built-in (embedded) patterns which may be referenced as if they were an image file. The <code>pattern:</code> format tag may be used via the syntax <code>pattern:</code><var>name</var> to request an embedded pattern (e.g. <code>pattern:checkerboard</code>). The pattern size is controlled with the <a href="../www/command-line-options.html#size">-size</a> command line option.</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<th>Tag</th>
@@ -1957,7 +1965,7 @@
<p>ImageMagick provides a number of format identifiers which are used to add, remove, and save embedded profiles for images which can support embedded profiles. Image types which may contain embedded profiles are TIFF, JPEG, and PDF.</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tbody>
<tr>
@@ -2043,4 +2051,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 27th April 2019 17:16 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:16 -->
\ No newline at end of file
diff --git a/www/fx.html b/www/fx.html
index c727d90..80fe8a8 100644
--- a/www/fx.html
+++ b/www/fx.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -117,9 +118,9 @@
<p>Or the expression can be complex:</p>
-<pre class="highlight"><code>convert rose.jpg \
+<pre class="highlight"><code>convert rose: \
-fx "(1.0/(1.0+exp(10.0*(0.5-u)))-0.006693)*1.0092503" \
- rose-sigmoidal.png'
+ rose-sigmoidal.png
</code></pre>
<p>This expression results in a high contrast version of the source image:</p>
@@ -133,8 +134,8 @@
<p>The expression can include variable assignments. Assignments, in most cases, reduce the complexity of an expression and permit some operations that might not be possible any other way. For example, lets create a radial gradient:</p>
<pre class="highlight"><code>convert -size 70x70 canvas: \
- -fx "Xi=i-w/2; Yj=j-h/2; 1.2*(0.5-hypot(Xi,Yj)/70.0)+0.5"
- radial-gradient.png'
+ -fx "Xi=i-w/2; Yj=j-h/2; 1.2*(0.5-hypot(Xi,Yj)/70.0)+0.5" \
+ radial-gradient.png
</code></pre>
<p>The command above returns this image:</p>
@@ -411,7 +412,7 @@
<p>For use with <a href="../www/command-line-options.html#format_identify_">-format</a>, the value-escape <code>%[fx:]</code> is evaluated just once for each image in the current image sequence. As each image in the sequence is being evaluated, <code>s</code> and <code>t</code> successively refer to the current image and its index, while <code>i</code> and <code>j</code> are set to zero, and the current channel set to red (<a href="../www/command-line-options.html#channel">-channel</a> is ignored). An example:</p>
<pre class="highlight"><code>$ convert canvas:'rgb(25%,50%,75%)' rose: -colorspace rgb \
- -format 'Red channel of NW corner of image #%[fx:t] is %[fx:s]' info:
+ -format 'Red channel of NW corner of image #%[fx:t] is %[fx:s]\n' info:
Red channel of NW corner of image #0 is 0.453758
Red channel of NW corner of image #1 is 0.184588
</code></pre>
@@ -448,4 +449,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 27th April 2019 19:23 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:49 -->
\ No newline at end of file
diff --git a/www/gradient.html b/www/gradient.html
index d069ebb..0838a0d 100644
--- a/www/gradient.html
+++ b/www/gradient.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -274,4 +275,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 27th April 2019 18:47 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 15:00 -->
\ No newline at end of file
diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html
index da427fd..6da1869 100644
--- a/www/high-dynamic-range.html
+++ b/www/high-dynamic-range.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -139,4 +140,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 27th April 2019 19:41 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:19 -->
\ No newline at end of file
diff --git a/www/history.html b/www/history.html
index eb45464..a15e2f5 100644
--- a/www/history.html
+++ b/www/history.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
diff --git a/www/identify.html b/www/identify.html
index c1b4ab4..6f7e7c4 100644
--- a/www/identify.html
+++ b/www/identify.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -462,4 +463,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 27th April 2019 18:46 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:05 -->
\ No newline at end of file
diff --git a/www/import.html b/www/import.html
index a3290f0..97d1a74 100644
--- a/www/import.html
+++ b/www/import.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -459,4 +460,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 27th April 2019 18:38 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 15:00 -->
\ No newline at end of file
diff --git a/www/index.html b/www/index.html
index d4f5382..c13b0f0 100644
--- a/www/index.html
+++ b/www/index.html
@@ -44,7 +44,7 @@
<div class="navbar-collapse collapse" id="navbarsMagick" style="">
<ul class="navbar-nav mr-auto">
- <li class="nav-item ">
+ <li class="nav-item active">
<a class="nav-link" href="../index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item ">
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -93,16 +94,15 @@
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 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="download.html">7.0.8-42</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>, Android OS, and others.</p>
+<p>The current release is ImageMagick <a href="download.html">7.0.8-63</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="../index.html">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="examples.html">examples</a> of what ImageMagick can do for you:</p>
-<div class="table-responsive">
+<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>
@@ -286,4 +286,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 27th April 2019 17:05 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:07 -->
\ No newline at end of file
diff --git a/www/install-source.html b/www/install-source.html
index 2888e60..b628683 100644
--- a/www/install-source.html
+++ b/www/install-source.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -109,8 +110,8 @@
<p>Next configure and compile ImageMagick. Note the <a href="https://en.wikipedia.org/wiki/Pkg-config">pkg-config</a> script is required so that ImageMagick can find certain optional delegate libraries on your system. To configure, type:</p>
-<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-7.0.8</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>./configure</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>make</span></pre>
-<p>If ImageMagick configured and compiled without complaint, you are ready to install it on your system. Administrator privileges are required to install. To install, type</p>
+<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-7.0.8</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>./configure</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>make</span></pre><p>For advanced users, we recommend a modules build:</p>
+<pre class="highlight"><span class="crtprompt">$ </span><span class='crtin'>./configure --with-modules --enable-shared --with-perl</span></pre><p>If ImageMagick configured and compiled without complaint, you are ready to install it on your system. Administrator privileges are required to install. To install, type</p>
<pre class="highlight"><code>sudo make install
</code></pre>
@@ -132,7 +133,7 @@
<p>Congratulations, you have a working ImageMagick distribution and you are ready to use ImageMagick to <a href="../Usage/">convert, compose, or edit</a> your images or perhaps you'll want to use one of the <a href="develop.html">Application Program Interfaces</a> for C, C++, Perl, and others.</p>
-<p>The above instructions will satisfy a great number of ImageMagick users, but we suspect a few will have additional questions or problems to consider. For example, what does one do if ImageMagick fails to configure or compile? Or what if you don't have administrator privileges and what if you don't want to install ImageMagick in the default <code>/../usr/local</code> folder? You will find the answer to these questions, and more, in <a href="advanced-unix-installation.html">Advanced Unix Source Installation</a>.</p>
+<p>The above instructions will satisfy a great number of ImageMagick users, but we suspect a few will have additional questions or problems to consider. For example, what does one do if ImageMagick fails to configure or compile? Or what if you don't have administrator privileges and what if you don't want to install ImageMagick in the default <code>/../usr/local</code> folder? You will find the answer to these questions, and more, in <a href="../www/advanced-unix-installation.html">Advanced Unix Source Installation</a>.</p>
<h2><a class="anchor" id="windows"></a>Install from Windows Source</h2>
@@ -163,7 +164,7 @@
<p>Congratulations, you have a working ImageMagick distribution under Windows and you are ready to use ImageMagick to <a href="../Usage/">convert, compose, or edit</a> your images or perhaps you'll want to use one of the <a href="develop.html">Application Program Interfaces</a> for C, C++, Perl, and others.</p>
-<p>The above instructions will satisfy a great number of ImageMagick users, but we suspect a few will have additional questions or problems to consider. For example, what does one do if ImageMagick fails to configure or compile? Or what if you want to install ImageMagick in a place other than the <kbd>ImageMagick-7.0.8/VisualMagick/bin</kbd> folder? Or perhaps you want to build and install the <a href="ImageMagickObject.html">ImageMagickObject</a> COM+ component. You will find the answer to these questions, and more, in <a href="advanced-windows-installation.html">Advanced Windows Source Installation</a>.</p>
+<p>The above instructions will satisfy a great number of ImageMagick users, but we suspect a few will have additional questions or problems to consider. For example, what does one do if ImageMagick fails to configure or compile? Or what if you want to install ImageMagick in a place other than the <kbd>ImageMagick-7.0.8/VisualMagick/bin</kbd> folder? Or perhaps you want to build and install the <a href="ImageMagickObject.html">ImageMagickObject</a> COM+ component. You will find the answer to these questions, and more, in <a href="../www/advanced-windows-installation.html">Advanced Windows Source Installation</a>.</p>
</div>
</div>
@@ -189,4 +190,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 19:09 -->
\ No newline at end of file
diff --git a/www/jp2.html b/www/jp2.html
index 1994aa0..3db09c2 100644
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -99,42 +100,42 @@
<p>Use this command to convert a JPEG-2000 image to the PNG image format:</p>
-<pre class="highlight"><code>convert wizard.jp2 wizard.png
+<pre class="highlight"><code>magick convert wizard.jp2 wizard.png
</code></pre>
<p>Let's convert a JPEG image to a lossless JPEG-2000 image:</p>
-<pre class="highlight"><code>convert wizard.jpg -quality 0 wizard.jp2
+<pre class="highlight"><code>magick convert wizard.jpg -quality 0 wizard.jp2
</code></pre>
<p>Here we extract an area from the image:</p>
-<pre class="highlight"><code>convert 'wizard.jp2[640x480+0+0]' wizard.png
+<pre class="highlight"><code>magick convert 'wizard.jp2[640x480+0+0]' wizard.png
</code></pre>
<p>Extract a particular tile from the image:</p>
-<pre class="highlight"><code>convert 'wizard.jp2[2]' wizard.png
+<pre class="highlight"><code>magick convert 'wizard.jp2[2]' wizard.png
</code></pre>
<p>Specify a subsampling factor:</p>
-<pre class="highlight"><code>convert wizard.png -colorspace YUV -sampling-factor 2,2 wizard.jp2
+<pre class="highlight"><code>magick convert wizard.png -colorspace YUV -sampling-factor 2,2 wizard.jp2
</code></pre>
<p>Save a tiled JPEG-2000 image:</p>
-<pre class="highlight"><code>convert wizard.png 'wizard.png[512x512]'
+<pre class="highlight"><code>magick convert wizard.png 'wizard.png[512x512]'
</code></pre>
<p>Write a digital Cinema 4K profile compliant codestream:</p>
-<pre class="highlight"><code>convert wizard.png -resize 4096x2160! -depth 12 wizard.jp2
+<pre class="highlight"><code>magick convert wizard.png -resize 4096x2160! -depth 12 wizard.jp2
</code></pre>
<p>Here is a complete list of JPEG-2000 decoding options:</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td>jp2:quality-layers=<var>x</var></td>
@@ -148,7 +149,7 @@
<p>Here is a complete list of JPEG-2000 encoding options:</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td>jp2:number-resolutions=<var>x</var></td>
@@ -191,3 +192,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 2nd September 2019 15:51 -->
\ No newline at end of file
diff --git a/www/license.html b/www/license.html
index 22b3493..58ab702 100644
--- a/www/license.html
+++ b/www/license.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -236,3 +237,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 2nd September 2019 13:40 -->
\ No newline at end of file
diff --git a/www/links.html b/www/links.html
index f120450..3c8bfd0 100644
--- a/www/links.html
+++ b/www/links.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -166,7 +167,7 @@
<h2><a class="anchor" id="other-projects"></a>Other Projects</h2>
<ul>
- <dd class="col-md-8"><a href="https://github.com/puelocesar/android-lib-magick">ImageMagick API on the Android Platform</a></dd>
+ <dd class="col-md-8"><a href="https://github.com/cherryleafroad/Android-ImageMagick7">ImageMagick API on the Android Platform</a></dd>
<dd class="col-md-8"><a href="https://imagemagick.org/download/iOS/">ImageMagick API on the iOS / iPhone Platform</a></dd>
<dd class="col-md-8"><a href="http://www.wizards-toolkit.org/">Wizard's Toolkit</a></dd>
<dd class="col-md-8"><a href="http://www.multipole.org/">Computational Simulation of Multi-Body Interactions with O(n) Scaling</a></dd>
@@ -195,4 +196,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 18:43 -->
\ No newline at end of file
diff --git a/www/magick++.html b/www/magick++.html
index c13a242..15ed1a4 100644
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -117,7 +118,7 @@
functions which comprise the API. See a <a href="../Magick++/tutorial/Magick++_tutorial.pdf"> Gentle Introduction to Magick++</a> for an introductory tutorial to Magick++. We include the <a href="../Magick++/tutorial/Magick++_tutorial.odt" >source</a> if you want to correct, enhance, or expand the tutorial.</p>
<h2>Obtaining Magick++</h2>
<a class="anchor" id="get"></a>
-<p>Magick++ is included as part of <a href="api/montage.html">ImageMagick</a>
+<p>Magick++ is included as part of <a href="../www/api/composite.html">ImageMagick</a>
source releases and may be retrieved via <a href="download.html">HTTP</a>
or <a href="https://github.com/ImageMagick/ImageMagick/tree/master/Magick%2B%2B">GitHub</a>.
</p>
@@ -218,4 +219,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 27th April 2019 19:03 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:28 -->
\ No newline at end of file
diff --git a/www/magick-core.html b/www/magick-core.html
index 87dc2da..05a5c20 100644
--- a/www/magick-core.html
+++ b/www/magick-core.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -363,4 +364,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 27th April 2019 19:27 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:23 -->
\ No newline at end of file
diff --git a/www/magick-script.html b/www/magick-script.html
index 7270ada..070b396 100644
--- a/www/magick-script.html
+++ b/www/magick-script.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -102,7 +103,7 @@
<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">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td><a href="../www/command-line-options.html#adaptive-blur">-adaptive-blur <var>geometry</var></a></td>
@@ -1315,4 +1316,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 17:24 -->
\ No newline at end of file
diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html
index 868e520..c62ad50 100644
--- a/www/magick-vector-graphics.html
+++ b/www/magick-vector-graphics.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -375,7 +376,7 @@
<p>Here is a complete description of the MVG drawing primitives:</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<th>Primitive</th>
diff --git a/www/magick-wand.html b/www/magick-wand.html
index a1a521d..278862b 100644
--- a/www/magick-wand.html
+++ b/www/magick-wand.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
diff --git a/www/magick.html b/www/magick.html
index e00bf39..3823149 100644
--- a/www/magick.html
+++ b/www/magick.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -140,7 +141,7 @@
<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">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td><a href="../www/command-line-options.html#adaptive-blur">-adaptive-blur <var>geometry</var></a></td>
@@ -1358,3 +1359,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 2nd September 2019 14:24 -->
\ No newline at end of file
diff --git a/www/miff.html b/www/miff.html
index d96a9d0..4177aa4 100644
--- a/www/miff.html
+++ b/www/miff.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -98,7 +99,7 @@
<p>The following is a partial list of <var> key = value</var> combinations that are typically be found in a MIFF file:</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td>background-color = <var>color</var></td>
diff --git a/www/mirror.html b/www/mirror.html
index 58da97e..0aa8962 100644
--- a/www/mirror.html
+++ b/www/mirror.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -88,7 +89,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="http://git.imagemagick.org/repos/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.8-42.</p>
+<p>The latest release of ImageMagick is version 7.0.8-63.</p>
<dl>
<dt>Germany</dt>
<dd><a href="http://mirror.checkdomain.de/imagemagick/">http://mirror.checkdomain.de/imagemagick/</a></dd>
diff --git a/www/mogrify.html b/www/mogrify.html
index 516e7b5..43f8f56 100644
--- a/www/mogrify.html
+++ b/www/mogrify.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -1348,4 +1349,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 27th April 2019 18:15 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:26 -->
\ No newline at end of file
diff --git a/www/montage.html b/www/montage.html
index a8d092e..0db8597 100644
--- a/www/montage.html
+++ b/www/montage.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -670,4 +671,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 19:20 -->
\ No newline at end of file
diff --git a/www/motion-picture.html b/www/motion-picture.html
index 1305659..2b24811 100644
--- a/www/motion-picture.html
+++ b/www/motion-picture.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -224,4 +225,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 27th April 2019 18:42 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:11 -->
\ No newline at end of file
diff --git a/www/opencl.html b/www/opencl.html
index 7082cd3..dac3829 100644
--- a/www/opencl.html
+++ b/www/opencl.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -141,4 +142,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 27th April 2019 19:41 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:14 -->
\ No newline at end of file
diff --git a/www/openmp.html b/www/openmp.html
index 0022837..3d2727e 100644
--- a/www/openmp.html
+++ b/www/openmp.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -131,4 +132,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 19:41 -->
\ No newline at end of file
diff --git a/www/perl-magick.html b/www/perl-magick.html
index 1a1bf50..8c845ed 100644
--- a/www/perl-magick.html
+++ b/www/perl-magick.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -2596,4 +2597,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 27th April 2019 17:10 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:09 -->
\ No newline at end of file
diff --git a/www/porting.html b/www/porting.html
index 85c4970..481adf0 100644
--- a/www/porting.html
+++ b/www/porting.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -681,4 +682,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 27th April 2019 19:41 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:09 -->
\ No newline at end of file
diff --git a/www/quantize.html b/www/quantize.html
index 0edc91f..7e10bf7 100644
--- a/www/quantize.html
+++ b/www/quantize.html
@@ -57,7 +57,7 @@
<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>
+ <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">
@@ -216,7 +216,7 @@
<a href="http://pgp.mit.edu/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../www/support.html">Donate</a> •
- <a href="../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a>
+ <a href="../www/../www/../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
diff --git a/www/resources.html b/www/resources.html
index f9fc806..d0ecdf7 100644
--- a/www/resources.html
+++ b/www/resources.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -266,7 +267,7 @@
<p>Environment variables recognized by ImageMagick include:</p>
-<div class="table-responsive">
+<div class="table-responsive" style="font-size:87.5% !important;">
<table class="table table-sm table-striped">
<tr>
<td>HOME</td>
@@ -396,4 +397,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 27th April 2019 18:15 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 13:34 -->
\ No newline at end of file
diff --git a/www/search.html b/www/search.html
index a7ecba4..39eefc3 100644
--- a/www/search.html
+++ b/www/search.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
diff --git a/www/security-policy.html b/www/security-policy.html
index cab5296..802e202 100644
--- a/www/security-policy.html
+++ b/www/security-policy.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -269,4 +270,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 27th April 2019 18:42 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:40 -->
\ No newline at end of file
diff --git a/www/sitemap.html b/www/sitemap.html
index 510216e..16eb92e 100644
--- a/www/sitemap.html
+++ b/www/sitemap.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -146,7 +147,7 @@
<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="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>
+ <li><a href="../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>
</dl></li>
<li><a href="command-line-processing.html">Command line processing</a>: the anatomy of the command line.</li>
<li><a href="../www/command-line-options.html">Command line options</a>: annotated list of all options that can appear on the command-line.</li>
@@ -270,4 +271,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 27th April 2019 18:06 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 15:03 -->
\ No newline at end of file
diff --git a/www/stream.html b/www/stream.html
index ee27b64..dd61b8d 100644
--- a/www/stream.html
+++ b/www/stream.html
@@ -63,7 +63,7 @@
<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>
<form class="form-inline my-2 my-lg-0" action="https://imagemagick.org/script/search.php">
@@ -293,7 +293,7 @@
<br/>
<a href="support.html">Donate</a> •
<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>
+ <a href="../www/https://imagemagick.org/script/contact.php">Contact Us</a>
<br/>
<small>© 1999-2019 ImageMagick Studio LLC</small></p>
</footer>
diff --git a/www/support.html b/www/support.html
index f686c55..b31cf31 100644
--- a/www/support.html
+++ b/www/support.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -185,4 +186,3 @@
<script>window.jQuery || document.write('<script src="https://localhost/ajax/libs/jquery/3.3.1/jquery.min.js"><\/script>')</script>
</body>
</html>
-<!-- Magick Cache 27th April 2019 18:43 -->
\ No newline at end of file
diff --git a/www/webp.html b/www/webp.html
index faa0996..7887a1c 100644
--- a/www/webp.html
+++ b/www/webp.html
@@ -77,7 +77,8 @@
style="display:block"
data-ad-client="ca-pub-3129977114552745"
data-ad-slot="6345125851"
- data-ad-format="auto"></ins>
+ data-full-width-responsive="true"
+ data-ad-format="horizontal"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
@@ -219,4 +220,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 27th April 2019 19:04 -->
\ No newline at end of file
+<!-- Magick Cache 2nd September 2019 14:54 -->
\ No newline at end of file
