(no commit message)

[imagemagick] / www / command-line-options.html

diff --git a/www/command-line-options.html b/www/command-line-options.html
index 5ec3c698465beb94b53188440c2d6f8a4f239bf0..182ecab653f7d9c6bd4b8939e7c1eddb20b04fe9 100644 (file)
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -131,7 +131,7 @@
 
 <div class="sponsbox">
 <div  class="sponsor">
-   <a title="Sponsor: Online-Magazin" href="http://www.unkostenbeitrag.de/">Online-Magazin</a><!-- 20101101000200 -->
+   <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
 </div>
 <div  class="sponsor">
   <a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
@@ -188,7 +188,6 @@ otherwise noted, each option is recognized by the commands <a href="../www/conve
 </div>
 
 <table style='background-color:#FFFFE0; margin-left:40px; margin-right:40px; width:88%'><tr><td style='width:75%'>Adaptively blur pixels, with decreasing effect near edges.</td><td style='text-align:right;'></td></tr></table>
- "direction",
 <p>A Gaussian operator of the given radius and standard deviation (<em class="arg">sigma</em>) is used. If <em class="arg">sigma</em> is not given it defaults to 1.</p>
 
 <div style="margin: auto;">
@@ -2573,6 +2572,12 @@ multi-value version of evaluate. </P>
 <table style='background-color:#FFFFE0; margin-left:40px; margin-right:40px; width:88%'><tr><td style='width:75%'>Set the image size and offset.</td><td style='text-align:right;'></td></tr></table>
 
 <p>If the image is enlarged, unfilled areas are set to the background color. To position the image, use offsets in the <em class="arg">geometry</em> specification or precede with a <a href="#gravity">-gravity</a> setting.  To specify how to compose the image with the background, use <a href="#compose" >-compose</a>.</p>
+<p>This command reduces or expands a JPEG image to fit on an 800x600
+display.  If the aspect ratio of the input image isn't exactly 4:3, then the
+image is centered on an 800x600 black canvas: </p>
+
+<p class='crt'><span class="crtprompt"> $magick&gt; </span><span class='crtin'>convert input.jpg -resize 800x600 -background black -compose Copy \ <br />  -gravity center -extent 800x600 -quality 92 output.jpg</span></p>
+
 
 <p>See <a href="../www/command-line-processing.html#geometry">Image Geometry</a> for complete details about the <em class="arg">geometry</em> argument.</p>
 
@@ -4311,26 +4316,30 @@ given number of <em class="arg">levels</em> per color channel .  </td><td style=
 <p>You can choose from these standard threshold maps:</p>
 
 <pre class="text">
-  threshold
-  checks
-  o2x2
-  o3x3
-  o4x4
-  o8x8
-  h4x4a
-  h6x6a
-  h8x8a
-  h4x4o
-  h6x6o
-  h8x8o
-  h16x16o
+threshold        1x1          Threshold 1x1 (non-dither)
+checks           2x1          Checkerboard 2x1 (dither)
+o2x2             2x2          Ordered 2x2 (dispersed)
+o3x3             3x3          Ordered 3x3 (dispersed)
+o4x4             4x4          Ordered 4x4 (dispersed)
+o8x8             8x8          Ordered 8x8 (dispersed)
+h4x4a            4x1          Halftone 4x4 (angled)
+h6x6a            6x1          Halftone 6x6 (angled)
+h8x8a            8x1          Halftone 8x8 (angled)
+h4x4o                         Halftone 4x4 (orthogonal)
+h6x6o                         Halftone 6x6 (orthogonal)
+h8x8o                         Halftone 8x8 (orthogonal)
+h16x16o                       Halftone 16x16 (orthogonal)
+c5x5b            c5x5         Circles 5x5 (black)
+c5x5w                         Circles 5x5 (white)
+c6x6b            c6x6         Circles 6x6 (black)
+c6x6w                         Circles 6x6 (white)
+c7x7b            c7x7         Circles 7x7 (black)
+c7x7w                         Circles 7x7 (white)
 </pre>
 
-<p>The '<kbd>o</kbd>' maps are ordered diffused pixel threshold maps, while the
-'<kbd>h</kbd>' maps are halftone threshold maps which are either 'a' angled, or
-'o' orthogonal. The '<kbd>checks</kbd>' produce a 3 level checkerbord dither
+<p> The <kbd>checks</kbd> pattern produces a 3 level checkerbord dither
 pattern.  Or you can define your own <em class="arg" >threshold map</em> in a
-personal or system "<kbd>thresholds.xml</kbd>" XML file. </p>
+personal or system <kbd>thresholds.xml</kbd> XML file. </p>
 
 <p>To print a complete list of threshold, use the <a href="#list" >-list
 threshold</a> option.</p>