Skip to content

Commit

Permalink
bump minor release
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristy committed Feb 8, 2021
1 parent efb5ce8 commit 9f1d23f
Show file tree
Hide file tree
Showing 19 changed files with 259 additions and 259 deletions.
2 changes: 1 addition & 1 deletion PerlMagick/Magick.pm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require AutoLoader;
ConfigureError FatalErrorException
);

$VERSION = '6.9.11';
$VERSION = '6.9.12';

sub AUTOLOAD {
# This AUTOLOAD is used to 'autoload' constants from the constant()
Expand Down
4 changes: 2 additions & 2 deletions PerlMagick/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Installation

Get the PerlMagick distribution and type the following:

gunzip ImageMagick-6.9.11-58.tar.gz
tar xvf ImageMagick-6.9.11
gunzip ImageMagick-6.9.12-0.tar.gz
tar xvf ImageMagick-6.9.12-0

Follow the ImageMagick installation instructions in INSTALL-unix.txt
then type
Expand Down
24 changes: 12 additions & 12 deletions QuickStart.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This file documents how to use the binary distribution packages built by
ImageMagick Studio LLC, and found in the ImageMagick 'binaries' subdirectory
of ImageMagick ftp sites. Those who want to build ImageMagick from source
of ImageMagick download sites. Those who want to build ImageMagick from source
code should refer to https://imagemagick.org/script/install-source.php.

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

export MAGICK_HOME="$HOME/ImageMagick-6.9.11"
export MAGICK_HOME="$HOME/ImageMagick-6.9.12"

On Linux and Solaris machines set the LD_LIBRARY_PATH environment variable:

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

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

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

Now, test ImageMagick to see if it is working

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

To install PerlMagick type

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

$MAGICK_CONFIGURE_PATH
$MAGICK_HOME/etc/ImageMagick
$MAGICK_HOME/share/ImageMagick-6.9.11/config
$MAGICK_HOME/share/ImageMagick-6.9.12/config
$HOME/.config/ImageMagick
<client path>/etc/ImageMagick/
<current directory>/
Expand All @@ -81,7 +81,7 @@ Unix/Linux/Darwin/Mac OS X/Cygwin/MinGW Install:

$MAGICK_CONFIGURE_PATH
$MAGICK_HOME/etc/ImageMagick
$MAGICK_HOME/share/ImageMagick-6.9.11/config
$MAGICK_HOME/share/ImageMagick-6.9.12/config
$HOME/.config/ImageMagick
<client path>/etc/ImageMagick/
<current directory>/
Expand All @@ -98,7 +98,7 @@ Unix/Linux/Darwin/Mac OS X/Cygwin/MinGW Install:
$HOME/.config/ImageMagick
<client path>/../etc/ImageMagick/modules-Q16/coders/
$MAGICK_HOME/etc/ImageMagick/modules-Q16/coders
$MAGICK_HOME/share/ImageMagick-6.9.11/modules-Q16/coders
$MAGICK_HOME/share/ImageMagick-6.9.12/modules-Q16/coders
$HOME/.config/ImageMagick
<client path>/etc/ImageMagick/modules-Q16/coders
<current directory>/
Expand All @@ -107,10 +107,10 @@ Windows Vista, XP, and NT Install:

Download one of

ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.9.11-85-Q16-windows-dll.exe
ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.9.11-85-Q16-windows-static.exe
ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.9.11-85-Q8-windows-dll.exe
ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.9.11-85-Q8-windows-static.exe
https://download.imagemagick.org/ImageMagick/download/binaries/ImageMagick-6.9.12-0-Q16-windows-dll.exe
https://download.imagemagick.org/ImageMagick/download/binaries/ImageMagick-6.9.12-0-Q16-windows-static.exe
https://download.imagemagick.org/ImageMagick/download/binaries/ImageMagick-6.9.12-0-Q8-windows-dll.exe
https://download.imagemagick.org/ImageMagick/download/binaries/ImageMagick-6.9.12-0-Q8-windows-static.exe

and execute it (or "open" it from your browser) to start the installation
program.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ImageMagick is free software delivered as a ready-to-run binary distribution or

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.

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

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.

Expand Down
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Introduction to ImageMagick
that includes memory error and thread data race detection to prevent
security vulnerabilities.

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

The authoritative ImageMagick version 6 web site is
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h1 class="text-center">ImageMagick (legacy)</h1>

<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">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>
<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>

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

Expand Down Expand Up @@ -274,4 +274,4 @@ <h2><a class="anchor" id="features"></a>Features and Capabilities</h2>
<script src="www/assets/magick.js" ></script>
</body>
</html>
<!-- Magick Cache 7th February 2021 09:17 -->
<!-- Magick Cache 7th February 2021 09:17 -->
4 changes: 2 additions & 2 deletions magick/image-private.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ static inline ssize_t CastDoubleToLong(const double value)
{
if (IsNaN(value) != 0)
return(0);
if (value > (double) MAGICK_SSIZE_MAX)
if (floor(value) > ((double) MAGICK_SSIZE_MAX-1))
return((ssize_t) MAGICK_SSIZE_MAX);
if (value < (double) MAGICK_SSIZE_MIN)
if (ceil(value) < ((double) MAGICK_SSIZE_MIN+1))
return((ssize_t) MAGICK_SSIZE_MIN);
return((ssize_t) value);
}
Expand Down
2 changes: 1 addition & 1 deletion www/ImageMagickObject.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h1 class="text-center">COM+ Component</h1>

<p>ImageMagick provides a statically-built ImageMagick object as part of its <a href="download.html#windows">Windows installation package</a>. When this package is installed, ImageMagickObject and its sample programs are installed to this path:</p>

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

<p>The ImageMagickObject is registered if the checkbox, <code>Register ImageMagickObject</code>, is checked at install time.</p>
Expand Down
8 changes: 4 additions & 4 deletions www/advanced-unix-installation.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h2><a class="anchor" id="configure"></a>Configure</h2>

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

<pre><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>
<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>
<p>Watch the configure script output to verify that it finds everything that
you think it should. Pay particular attention to the last lines of the script output. For example, here is a recent report from our system:</p>

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

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

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

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

<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>
<p>Unpack and change into the top-level ImageMagick directory:</p>
<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>
<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>
<pre class="highlight"><code>./configure --prefix=/opt --with-quantum-depth=16 \
--disable-dependency-tracking --with-x=yes \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \
Expand All @@ -585,7 +585,7 @@ <h2><a class="anchor" id="mingw"></a>MinGW-specific Build instructions</h2>

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

<pre><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>
<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>
<h2><a class="anchor" id="problems"></a>Dealing with Unexpected Problems</h2>

<p>Chances are the download, configure, build, and install of ImageMagick went flawlessly as it is intended, however, certain systems and environments may cause one or more steps to fail. We discuss a few problems we've run across and how to take corrective action to ensure you have a working release of ImageMagick</p>
Expand Down
2 changes: 1 addition & 1 deletion www/architecture.html
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ <h3>Create the Pixel Cache</h3>

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

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

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

0 comments on commit 9f1d23f

Please sign in to comment.