Skip to content

Commit 9f1d23f

Browse files
author
Cristy
committed
bump minor release
1 parent efb5ce8 commit 9f1d23f

19 files changed

+259
-259
lines changed

‎PerlMagick/Magick.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ require AutoLoader;
4343
ConfigureError FatalErrorException
4444
);
4545

46-
$VERSION = '6.9.11';
46+
$VERSION = '6.9.12';
4747

4848
sub AUTOLOAD {
4949
# This AUTOLOAD is used to 'autoload' constants from the constant()

‎PerlMagick/README.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Installation
2323

2424
Get the PerlMagick distribution and type the following:
2525

26-
gunzip ImageMagick-6.9.11-58.tar.gz
27-
tar xvf ImageMagick-6.9.11
26+
gunzip ImageMagick-6.9.12-0.tar.gz
27+
tar xvf ImageMagick-6.9.12-0
2828

2929
Follow the ImageMagick installation instructions in INSTALL-unix.txt
3030
then type

‎QuickStart.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This file documents how to use the binary distribution packages built by
22
ImageMagick Studio LLC, and found in the ImageMagick 'binaries' subdirectory
3-
of ImageMagick ftp sites. Those who want to build ImageMagick from source
3+
of ImageMagick download sites. Those who want to build ImageMagick from source
44
code should refer to https://imagemagick.org/script/install-source.php.
55

66
Unix/Linux/Darwin/Mac OS X/Cygwin/MinGW Install:
@@ -27,15 +27,15 @@ Unix/Linux/Darwin/Mac OS X/Cygwin/MinGW Install:
2727
Set the MAGICK_HOME environment variable to the path where you extracted the
2828
ImageMagick files. For example
2929

30-
export MAGICK_HOME="$HOME/ImageMagick-6.9.11"
30+
export MAGICK_HOME="$HOME/ImageMagick-6.9.12"
3131

3232
On Linux and Solaris machines set the LD_LIBRARY_PATH environment variable:
3333

34-
export LD_LIBRARY_PATH="$HOME/ImageMagick-6.9.11/lib"
34+
export LD_LIBRARY_PATH="$HOME/ImageMagick-6.9.12/lib"
3535

3636
On Mac OS X (Darwin) machines set the DYLD_LIBRARY_PATH environment variable:
3737

38-
export DYLD_LIBRARY_PATH="$HOME/ImageMagick-6.9.11/lib"
38+
export DYLD_LIBRARY_PATH="$HOME/ImageMagick-6.9.12/lib"
3939

4040
Now, test ImageMagick to see if it is working
4141

@@ -44,7 +44,7 @@ Unix/Linux/Darwin/Mac OS X/Cygwin/MinGW Install:
4444

4545
To install PerlMagick type
4646

47-
cd ImageMagick-6.9.11/PerlMagick
47+
cd ImageMagick-6.9.12/PerlMagick
4848
perl Makefile.PL
4949
make
5050
make install
@@ -68,7 +68,7 @@ Unix/Linux/Darwin/Mac OS X/Cygwin/MinGW Install:
6868

6969
$MAGICK_CONFIGURE_PATH
7070
$MAGICK_HOME/etc/ImageMagick
71-
$MAGICK_HOME/share/ImageMagick-6.9.11/config
71+
$MAGICK_HOME/share/ImageMagick-6.9.12/config
7272
$HOME/.config/ImageMagick
7373
<client path>/etc/ImageMagick/
7474
<current directory>/
@@ -81,7 +81,7 @@ Unix/Linux/Darwin/Mac OS X/Cygwin/MinGW Install:
8181

8282
$MAGICK_CONFIGURE_PATH
8383
$MAGICK_HOME/etc/ImageMagick
84-
$MAGICK_HOME/share/ImageMagick-6.9.11/config
84+
$MAGICK_HOME/share/ImageMagick-6.9.12/config
8585
$HOME/.config/ImageMagick
8686
<client path>/etc/ImageMagick/
8787
<current directory>/
@@ -98,7 +98,7 @@ Unix/Linux/Darwin/Mac OS X/Cygwin/MinGW Install:
9898
$HOME/.config/ImageMagick
9999
<client path>/../etc/ImageMagick/modules-Q16/coders/
100100
$MAGICK_HOME/etc/ImageMagick/modules-Q16/coders
101-
$MAGICK_HOME/share/ImageMagick-6.9.11/modules-Q16/coders
101+
$MAGICK_HOME/share/ImageMagick-6.9.12/modules-Q16/coders
102102
$HOME/.config/ImageMagick
103103
<client path>/etc/ImageMagick/modules-Q16/coders
104104
<current directory>/
@@ -107,10 +107,10 @@ Windows Vista, XP, and NT Install:
107107

108108
Download one of
109109

110-
ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.9.11-85-Q16-windows-dll.exe
111-
ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.9.11-85-Q16-windows-static.exe
112-
ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.9.11-85-Q8-windows-dll.exe
113-
ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.9.11-85-Q8-windows-static.exe
110+
https://download.imagemagick.org/ImageMagick/download/binaries/ImageMagick-6.9.12-0-Q16-windows-dll.exe
111+
https://download.imagemagick.org/ImageMagick/download/binaries/ImageMagick-6.9.12-0-Q16-windows-static.exe
112+
https://download.imagemagick.org/ImageMagick/download/binaries/ImageMagick-6.9.12-0-Q8-windows-dll.exe
113+
https://download.imagemagick.org/ImageMagick/download/binaries/ImageMagick-6.9.12-0-Q8-windows-static.exe
114114

115115
and execute it (or "open" it from your browser) to start the installation
116116
program.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ImageMagick is free software delivered as a ready-to-run binary distribution or
1919

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

22-
The current release is the ImageMagick 6.9.11-* series. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.
22+
The current release is the ImageMagick 6.9.12-* series. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.
2323

2424
The authoritative ImageMagick version 6 web site is https://legacy.imagemagick.org. The authoritative source code repository is https://github.com/ImageMagick/ImageMagick6. We maintain a source code mirror at https://gitlab.com/ImageMagick/ImageMagick6.
2525

‎README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Introduction to ImageMagick
3030
that includes memory error and thread data race detection to prevent
3131
security vulnerabilities.
3232

33-
The current release is the ImageMagick 6.9.11-* series. It runs on Linux,
33+
The current release is the ImageMagick 6.9.12-* series. It runs on Linux,
3434
Windows, Mac Os X, iOS, Android OS, and others.
3535

3636
The authoritative ImageMagick version 6 web site is

‎index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ <h1 class="text-center">ImageMagick (legacy)</h1>
102102

103103
<p>ImageMagick utilizes multiple computational threads to increase performance and can read, process, or write mega-, giga-, or tera-pixel image sizes.</p>
104104

105-
<p>The current release is ImageMagick <a href="www/download.html">6.9.11-61</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>
105+
<p>The current release is ImageMagick <a href="www/download.html">6.9.12-0</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>
106106

107107
<p>The authoritative ImageMagick version 6 web site is <a href="index.html">https://legacy.imagemagick.org</a>. The authoritative source code repository is <a href="https://github.com/ImageMagick/ImageMagick6" target="_blank">https://github.com/ImageMagick/ImageMagick6</a>. Find the latest release of ImageMagick, version 7, at <a href="./">https://imagemagick.org</a>.</p>
108108

@@ -274,4 +274,4 @@ <h2><a class="anchor" id="features"></a>Features and Capabilities</h2>
274274
<script src="www/assets/magick.js" ></script>
275275
</body>
276276
</html>
277-
<!-- Magick Cache 7th February 2021 09:17 -->
277+
<!-- Magick Cache 7th February 2021 09:17 -->

‎magick/image-private.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ static inline ssize_t CastDoubleToLong(const double value)
5454
{
5555
if (IsNaN(value) != 0)
5656
return(0);
57-
if (value > (double) MAGICK_SSIZE_MAX)
57+
if (floor(value) > ((double) MAGICK_SSIZE_MAX-1))
5858
return((ssize_t) MAGICK_SSIZE_MAX);
59-
if (value < (double) MAGICK_SSIZE_MIN)
59+
if (ceil(value) < ((double) MAGICK_SSIZE_MIN+1))
6060
return((ssize_t) MAGICK_SSIZE_MIN);
6161
return((ssize_t) value);
6262
}

‎www/ImageMagickObject.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ <h1 class="text-center">COM+ Component</h1>
102102

103103
<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>
104104

105-
<pre class="highlight"><code> c:\Program Files\ImageMagick-6.9.11-Q16\ImageMagickObject
105+
<pre class="highlight"><code> c:\Program Files\ImageMagick-6.9.12-Q16\ImageMagickObject
106106
</code></pre>
107107

108108
<p>The ImageMagickObject is registered if the checkbox, <code>Register ImageMagickObject</code>, is checked at install time.</p>

‎www/advanced-unix-installation.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ <h2><a class="anchor" id="configure"></a>Configure</h2>
114114

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

117-
<pre><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-6.9.11-61</span><span class='crtout'></span><span class="crtprompt">$ </span><span class='crtin'>./configure</span></pre>
117+
<pre><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-6.9.12-61</span><span class='crtout'></span><span class="crtprompt">$ </span><span class='crtin'>./configure</span></pre>
118118
<p>Watch the configure script output to verify that it finds everything that
119119
you think it should. Pay particular attention to the last lines of the script output. For example, here is a recent report from our system:</p>
120120

@@ -533,7 +533,7 @@ <h2><a class="anchor" id="linux"></a>Linux-specific Build instructions</h2>
533533

534534
<p>After the build you, locate the RPMS folder and install the ImageMagick binary RPM distribution:</p>
535535

536-
<pre><span class="crtprompt">$ </span><span class='crtin'>rpm -ivh ImageMagick-6.9.11-?.*.rpm</span></pre>
536+
<pre><span class="crtprompt">$ </span><span class='crtin'>rpm -ivh ImageMagick-6.9.12-?.*.rpm</span></pre>
537537
<h2><a class="anchor" id="macosx"></a>Mac OS X-specific Build instructions</h2>
538538

539539
<p>Perform these steps as an administrator or with the <tt>sudo</tt> command:</p>
@@ -558,7 +558,7 @@ <h2><a class="anchor" id="macosx"></a>Mac OS X-specific Build instructions</h2>
558558

559559
<p><a href="mirror.html">Download</a> the ImageMagick source distribution and verify the distribution against its <a href="https://download.imagemagick.org/ImageMagick/download/digest.rdf">message digest</a>.</p>
560560
<p>Unpack and change into the top-level ImageMagick directory:</p>
561-
<pre><span class="crtprompt">$ </span><span class='crtin'>tar xvzf ImageMagick-6.9.11-61.tar.gz</span><span class='crtout'></span><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-6.9.11-61</span></pre> <p>Configure ImageMagick:</p>
561+
<pre><span class="crtprompt">$ </span><span class='crtin'>tar xvzf ImageMagick-6.9.12-61.tar.gz</span><span class='crtout'></span><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-6.9.12-61</span></pre> <p>Configure ImageMagick:</p>
562562
<pre class="highlight"><code>./configure --prefix=/opt --with-quantum-depth=16 \
563563
--disable-dependency-tracking --with-x=yes \
564564
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \
@@ -585,7 +585,7 @@ <h2><a class="anchor" id="mingw"></a>MinGW-specific Build instructions</h2>
585585

586586
<p>Although you can download and install delegate libraries yourself, many are already available in the <a href="http://gnuwin32.sourceforge.net/">GnuWin32</a> distribution. Download and install whichever delegate libraries you require such as JPEG, PNG, TIFF, etc. Make sure you specify the development headers when you install a package. Next type,</p>
587587

588-
<pre><span class="crtprompt">$ </span><span class='crtin'>tar jxvf ImageMagick-6.9.11-?.tar.bz2</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-6.9.11-61</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>./configure --without-perl</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>make</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>sudo make install</span></pre>
588+
<pre><span class="crtprompt">$ </span><span class='crtin'>tar jxvf ImageMagick-6.9.12-?.tar.bz2</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>cd ImageMagick-6.9.12-61</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>./configure --without-perl</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>make</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>sudo make install</span></pre>
589589
<h2><a class="anchor" id="problems"></a>Dealing with Unexpected Problems</h2>
590590

591591
<p>Chances are the download, configure, build, and install of ImageMagick went flawlessly as it is intended, however, certain systems and environments may cause one or more steps to fail. We discuss a few problems we've run across and how to take corrective action to ensure you have a working release of ImageMagick</p>

‎www/architecture.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ <h3>Create the Pixel Cache</h3>
172172

173173
<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 a 4 channel 8-bit RGBA image, if you are using the Q8 version of ImageMagick, and 16-bit RGBA for the Q16 version. You can determine which version you have with the <a class="text-nowrap" href="command-line-options.html#version">-version</a> option: </p>
174174

175-
<pre><span class="crtprompt">$ </span><span class='crtin'>identify -version</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>Version: ImageMagick 6.9.11-61 2021-01-30 Q16 https://imagemagick.org</span></pre>
175+
<pre><span class="crtprompt">$ </span><span class='crtin'>identify -version</span><span class='crtout'><br/></span><span class="crtprompt">$ </span><span class='crtin'>Version: ImageMagick 6.9.12-61 2021-01-30 Q16 https://imagemagick.org</span></pre>
176176
<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 RGBA is wasteful) and speed (i.e. storing the entire image in memory is generally slower than accessing one scanline of pixels at a time). In most cases, the benefits of the pixel cache typically outweigh any disadvantages.</p>
177177

178178
<h3><a class="anchor" id="authentic-pixels"></a>Access the Pixel Cache</h3>

0 commit comments

Comments
 (0)