Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/cite/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h4>Citation in Vancouver style</h4>
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary"><code>1. ImageMagick Studio LLC. ImageMagick [Internet]. 2024. Available from: https://imagemagick.org</code></pre>

<h4>Citation in Harvard style</h4>
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary"><sampl>ImageMagick Studio LLC, 2024. ImageMagick, Available at: https://imagemagick.org.</code></pre>
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary"><code>ImageMagick Studio LLC, 2024. ImageMagick, Available at: https://imagemagick.org.</code></pre>
<h4>Citation in Bibtex format</h4>
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary"><code>{% raw %}@software{imagemagick,
author = {{ImageMagick Studio LLC}},
Expand Down
8 changes: 4 additions & 4 deletions docs/command-line-options/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ <h2><a class="anchor" id="auto-orient"></a>-auto-orient</h2>
<p>This EXIF profile setting is usually set using a gravity sensor in digital
camera, however photos taken directly downward or upward may not have an
appropriate value. Also images that have been orientation 'corrected' without
reseting this setting, may be 'corrected' again resulting in a incorrect
resetting this setting, may be 'corrected' again resulting in a incorrect
result. If the EXIF profile was previously stripped, the <a
href="#auto-orient" >-auto-orient</a> operator will do nothing. </p>

Expand Down Expand Up @@ -1330,7 +1330,7 @@ <h2><a class="anchor" id="channel-fx"></a>-channel-fx <var>expression</var></h2>

<p>Let's create two meta channels and populate them with a copy of the gray pixels:</p>
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary cli"><pre><samp>$ magick gray.pgm -channel-fx "gray=>meta, gray=>meta1" gray.tif</samp></pre></pre>
<p>Notice we save the results into a TIFF image file. Not all formats support multipectral images. TIFF, MIFF, MPC, and FTXT do.</p>
<p>Notice we save the results into a TIFF image file. Not all formats support multispectral images. TIFF, MIFF, MPC, and FTXT do.</p>

<p>Add <code>-debug pixel</code> prior to the <code>-channel-fx</code> option to track the channel morphology.</p>

Expand Down Expand Up @@ -4336,7 +4336,7 @@ <h2><a class="anchor" id="grayscale"></a>-grayscale <var>method</var></h2>
</samp></pre>

<p>Note that a 'colorspace' intensity method will produce the same result
regardless of the current colorpsace of the image. But a 'mathematical'
regardless of the current colorspace of the image. But a 'mathematical'
intensity method depends on the current colorspace the image is currently
using. </p>

Expand Down Expand Up @@ -4594,7 +4594,7 @@ <h2><a class="anchor" id="intensity"></a>-intensity <var>method</var></h2>

<p>The <a href="#colorspace" >-colorspace gray</a> image conversion also uses
the current intensity setting, but will always convert the image to the
appropriate sRGB or linear-RGB colorspace before appling the above
appropriate sRGB or linear-RGB colorspace before applying the above
function.</p>

<p>To print a complete list of possible pixel intensity setting methods, use <a href="#list">-list intensity</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/compare/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2><a class="anchor" id="usage"></a>Example Usage</h2>
Gray: 65532.9 (0.999967) 417,44
</samp></pre>

<p>The value in the brackets is the normalized simularity metric.</p>
<p>The value in the brackets is the normalized similarity metric.</p>

<p>Note, similarity search respects the virtual page offset. To ensure expected results, make sure your image page offset is +0+0.</p>

Expand Down
4 changes: 2 additions & 2 deletions docs/escape/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ <h2>Long Form Attribute Percent Escapes</h2>
</tr>
<tr>
<td>%[channels]</td>
<td>colorspace neumonic followed by total number of channels and meta channels, e.g., <code>cmyka 8.3</code> indicates a CMYK image with alpha channel for a total of 8 channels and 3 meta channels.</td>
<td>colorspace mnemonic followed by total number of channels and meta channels, e.g., <code>cmyka 8.3</code> indicates a CMYK image with alpha channel for a total of 8 channels and 3 meta channels.</td>
</tr>
<tr>
<td>%[colors]</td>
Expand Down Expand Up @@ -612,7 +612,7 @@ <h2>Artifacts and Options</h2>
associated images. </p>

<p>As such you can use <code>-set 'option:distort:viewport' '100x100'</code> to
achieve the same result of setting a Artifact for the disort operation to use.
achieve the same result of setting a Artifact for the distort operation to use.
</p>

<p><b>Internal Handling of a Global Option...</b></p>
Expand Down
4 changes: 2 additions & 2 deletions docs/formats/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ <h2><a class="anchor" id="supported"></a>Supported Image Formats</h2>
<td>MAN</td>
<td>R</td>
<td>Linux reference manual pages</td>
<td>Requires that GNU groff and Ghostcript are installed.</td>
<td>Requires that GNU groff and Ghostscript are installed.</td>
</tr>

<tr>
Expand Down Expand Up @@ -1595,7 +1595,7 @@ <h2><a class="anchor" id="pseudo"></a>Pseudo-image Formats</h2>
<td>R</td>
<td>Canvas image of specified color</td>
<td>An backward compatible alias for the '<code>canvas:</code>'
psuedo-file format, used to create a solid color <var>canvas</var> image.
pseudo-file format, used to create a solid color <var>canvas</var> image.
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion docs/magick++/Drawable.html
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ <h1 style="text-align:center">Magick::Drawable</h1>
<td width="21%">
<p class="western">void</p></td>
<td width="52%">
<p class="western"><font size="2" style="font-size: 11pt">Push Graphic Context. When a graphic context is pushed, options set after the context is pushed (such as coordinate transformations, color settings, etc.) are saved to a new graphic context. This allows related options to be saved on a graphic context "stack" in order to support heirarchical nesting of options. When</font> <a href="#DrawablePopGraphicContext"><i><font size="2" style="font-size: 11pt">DrawablePopGraphicContext</font></i></a> <font size="2" style="font-size: 11pt">is used to pop the current graphic context, the options in effect during the last <i>DrawablePushGraphicContext</i> operation are restored.</font></p></td></tr>
<p class="western"><font size="2" style="font-size: 11pt">Push Graphic Context. When a graphic context is pushed, options set after the context is pushed (such as coordinate transformations, color settings, etc.) are saved to a new graphic context. This allows related options to be saved on a graphic context "stack" in order to support hierarchical nesting of options. When</font> <a href="#DrawablePopGraphicContext"><i><font size="2" style="font-size: 11pt">DrawablePopGraphicContext</font></i></a> <font size="2" style="font-size: 11pt">is used to pop the current graphic context, the options in effect during the last <i>DrawablePushGraphicContext</i> operation are restored.</font></p></td></tr>
<tr>
<td width="27%">
<p class="western" style="text-align:center">DrawablePushPattern</p></td>
Expand Down
4 changes: 2 additions & 2 deletions docs/magick++/Future.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ <h1 align="center">Future Plans</h1>
<blockquote>STL is used as the framework in which to store images. Template functions (e.g. montage) are provided to build the image lists required by ImageMagick and then invoke the list-oriented ImageMagick API. STL is quite powerful yet easy to use. At this stage Magick++ has matched what is currently available/possible using the PerlMagick API due to leveraging the power of STL.</blockquote>
<p><b>2.0</b> <a href="http://www.omg.org/">CORBA</a> and/or COM IDL based client API with server implementation for executing image processing operations on a remote (or local) computer.</p>
<blockquote>This version provides an IDL-based API. A C++ wrapper API compatible with that developed for release 2.0 is available for use by clients. Client wrappers may also be developed for other languages (e.g. Java). COM and CORBA servers are provided which are implemented in terms of the Magick++ API in order to satisfy client requests (which may run a different operating system than the server).</blockquote>
<p><b>3.0</b> Integration of IDL-based API with an existing open source work-queing system in order to load-share image processing tasks and the image frame and file level across a large number of machines.</p>
<blockquote>This version is the culmination of the effort. By intelligently spreading work over many machines, the performance of ImageMagick is magnified. In order for this to be a success algorithms for efficient transfer of image data must be developed. Algorithms that take into account processor afinity and the CPU vs I/O tradeoff for the task to be performed must be developed. At this point in time, the queuing system to be employed has not been identified.</blockquote>
<p><b>3.0</b> Integration of IDL-based API with an existing open source work-queuing system in order to load-share image processing tasks and the image frame and file level across a large number of machines.</p>
<blockquote>This version is the culmination of the effort. By intelligently spreading work over many machines, the performance of ImageMagick is magnified. In order for this to be a success algorithms for efficient transfer of image data must be developed. Algorithms that take into account processor affinity and the CPU vs I/O tradeoff for the task to be performed must be developed. At this point in time, the queuing system to be employed has not been identified.</blockquote>
</ul>
</body>
</html>
10 changes: 5 additions & 5 deletions docs/magick++/Image++.html
Original file line number Diff line number Diff line change
Expand Up @@ -2220,7 +2220,7 @@ <h3>
parameter specifies the percentage of the difference between the
original and the blur image that is added back into the original. The <i>threshold</i>_
parameter specifies the threshold in pixels needed to apply the
diffence amount.
difference amount.
</font>
</td>
</tr>
Expand Down Expand Up @@ -2250,7 +2250,7 @@ <h3>
parameter specifies the percentage of the difference between the
original and the blur image that is added back into the original. The <i>threshold</i>_
parameter specifies the threshold in pixels needed to apply the
diffence amount.
difference amount.
</font>
</td>
</tr>
Expand Down Expand Up @@ -3263,7 +3263,7 @@ <h3> <a name="Image Attributes"></a> Image Attributes</h3>
<td>
<font size="-1">
Filter to use when resizing image. The
reduction filter employed has a sigificant effect on the time required
reduction filter employed has a significant effect on the time required
to resize an image and the resulting quality. The default filter is <i>Lanczos</i>
which has been shown to produce high quality results when reducing most
images.
Expand Down Expand Up @@ -3390,7 +3390,7 @@ <h3> <a name="Image Attributes"></a> Image Attributes</h3>
<td>
<font size="-1">
ICC color profile. Supplied via a <a href="Blob.html">Blob</a> since Magick++/ and ImageMagick do not
currently support formating this data structure directly.&#160;
currently support formatting this data structure directly.&#160;
Specifications are available from the <a href="http://www.color.org/">
International Color Consortium
</a> for the format of ICC color profiles.
Expand Down Expand Up @@ -3449,7 +3449,7 @@ <h3> <a name="Image Attributes"></a> Image Attributes</h3>
<td>
<font size="-1">
IPTC profile. Supplied via a <a href="Blob.html">Blob</a> since Magick++ and ImageMagick do not
currently&#160; support formating this data structure directly.
currently&#160; support formatting this data structure directly.
Specifications are available from the <a href="http://www.iptc.org/">
International Press Telecommunications Council
</a> for IPTC profiles.
Expand Down
2 changes: 1 addition & 1 deletion docs/magick++/Install.html
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ <h3 align="center">Windows '9X, NT, 2003, 2008, XP, &amp; Windows 7</h3>
<h4>Visual C++</h4>
<p>Windows NT through Windows Vista are supported by the ImageMagick source package for NT available in the 'win2k' subdirectory of the ImageMagick ftp site (and mirrors). The ImageMagick source package for NT provides sources to ImageMagick, Magick++, add-on libraries (e.g. JPEG), and a ready-made Visual C++ 8.0 build environment. Please read the configuration and build instructions in README.txt (under the heading "Windows Win2K/XP VISUAL C++ 8.0 COMPILATION") in order to build Magick++.</p>
<h4>Cygwin &amp; GCC</h4>
<p>It is possible to build both ImageMagick and Magick++ under the Cygwin Unix-emulation environment for Windows NT. Obtain and install Cgywin from <a href="http://www.cygwin.com/">http://www.cygwin.com/</a> . An X11R6 environment for Cygwin is available from <a href="http://www.cygwin.com/xfree/">http://www.cygwin.com/xfree/</a> .To build using Cygwin and GCC, follow the instructions for building under Unix.</p>
<p>It is possible to build both ImageMagick and Magick++ under the Cygwin Unix-emulation environment for Windows NT. Obtain and install Cygwin from <a href="http://www.cygwin.com/">http://www.cygwin.com/</a> . An X11R6 environment for Cygwin is available from <a href="http://www.cygwin.com/xfree/">http://www.cygwin.com/xfree/</a> .To build using Cygwin and GCC, follow the instructions for building under Unix.</p>
</div>
</body>
</html>
6 changes: 3 additions & 3 deletions docs/magick++/STL.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="doc-section">
<h1> Magick++ STL Support</h1>
Magick++ provides a set of <a href="http://www.sgi.com/tech/stl/">Standard
Template Libary</a> (<a href="http://www.sgi.com/tech/stl/">STL</a> )
Template Library</a> (<a href="http://www.sgi.com/tech/stl/">STL</a> )
algorithms for operating across ranges of image frames in a container.
It also provides a set of STL unary function objects to apply an
operation on image frames in a container via an algorithm which uses
Expand Down Expand Up @@ -144,7 +144,7 @@ <h1> Magick++ STL Support</h1>
relied on page offsets and disposal methods that the resulting sequence
will be larger (perhaps much larger) then the original. This is useful
for GIF animation sequences that have page offsets and disposal methods.
The resuting image sequence is returned via <i>coalescedImages_.</i></font></td>
The resulting image sequence is returned via <i>coalescedImages_.</i></font></td>
</tr>
<tr>
<td>
Expand Down Expand Up @@ -1407,7 +1407,7 @@ <h3> Magick++ Unary Function Objects</h3>
<td><font size="-1"><a href="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
reduction filter employed has a significant effect on the time required
to resize an image and the resulting quality. The default filter is <i>Lanczos</i>
which has been shown to produce good results when reducing images.</font></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/magick-cache/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ <h4>Delete a MagickCache</h4>
<pre class="p-3 mb-2 text-body-secondary bg-body-tertiary"><samp>$ magick-cache -passkey passkey.txt delete /opt/magick-cache /</samp></pre>
<p>Be careful, after this command, your cached content is irrevocably lost.</p>
<h4>Security</h4>
<p>MagickCache security is not crytographically strong. Instead it generates a unique hash for each resource ensuring the resource ID cannot be discovered. A resource is accessible to both the user of the cache and the cache owner provided they can present their respective passkeys. They are also accessible to anyone with sufficient privileges to access the MagickCache disk path.</p>
<p>MagickCache security is not cryptographically strong. Instead it generates a unique hash for each resource ensuring the resource ID cannot be discovered. A resource is accessible to both the user of the cache and the cache owner provided they can present their respective passkeys. They are also accessible to anyone with sufficient privileges to access the MagickCache disk path.</p>
</div>
2 changes: 1 addition & 1 deletion docs/mirror/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p class="lead">ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below. ImageMagick stable and development source releases are also available from <a href="https://github.com/ImageMagick">Git</a>. Before you download, you may want to review recent <a href="/changelog/">changes</a> to the ImageMagick distribution. The authoritative source code repository is <a href="https://github.com/ImageMagick/ImageMagick" rel="noopener noreferrer" target="_blank">https://github.com/ImageMagick</a>.</p>
<p>The latest release of ImageMagick is version {{ site.magick.version }}.</p>
<dl>
<dt>Austrailia</dt>
<dt>Australia</dt>
<dd><a href="https://mirror.endianness.com/imagemagick" rel="noopener noreferrer" target="_blank">https://mirror.endianness.com/imagemagick</a></dd>
<dd><a href="https://mirror.aarnet.edu.au/pub/imagemagick/" rel="noopener noreferrer" target="_blank">https://mirror.aarnet.edu.au/pub/imagemagick/</a></dd>
<dt>Germany</dt>
Expand Down
2 changes: 1 addition & 1 deletion docs/security-policy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ <h2><a class="anchor" id="example"></a>Example Security Policy</h2>
&lt;policymap>
&lt;!-- Set maximum parallel threads. -->
&lt;policy domain="resource" name="thread" value="2"/>
&lt;!-- Set maximum time in seconds or neumonics, e.g. "2 minutes". When this
&lt;!-- Set maximum time in seconds or mnemonics, e.g. "2 minutes". When this
limit is exceeded, an exception is thrown and processing stops. -->
&lt;policy domain="resource" name="time" value="60"/>
&lt;!-- Set maximum number of open pixel cache files. When this limit is
Expand Down