rmagick 1.9.3 → 1.10.0

data/configure.ac

@@ -1,7 +1,7 @@
 
 # RMagick configure.ac
 
-AC_INIT(RMagick, 1.9.3, rmagick@rubyforge.org, RMagick-1.9.3.tar.gz)
+AC_INIT(RMagick, 1.10.0, rmagick@rubyforge.org, RMagick-1.10.0.tar.gz)
 echo "Configuring ${PACKAGE_STRING}"
 
 AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -42,6 +42,11 @@ else
             Magick-config )
                 MAGICKNAME=ImageMagick
                 MAGICKLIB=Magick
+                MAGICKVERS=`${MAGICKCONFIG} --version | tr -d .`
+                if test $MAGICKVERS -lt 600; then
+                   MAGICKVERS=`${MAGICKCONFIG} --version`
+                   AC_MSG_ERROR([Can't install RMagick. You must have ImageMagick 6.0.0 or later installed. Your version of ImageMagick is ${MAGICKVERS}])
+                fi
                 ;;
             GraphicsMagick-config )
                 MAGICKNAME=GraphicsMagick
@@ -82,16 +87,7 @@ AC_CHECK_FUNCS([snprintf])
 LIBS="${LIBS} `${MAGICKCONFIG} --libs`"
 
 # What ImageMagick/GraphicsMagick functions?
-AC_CHECK_FUNCS([AdaptiveThresholdImage AppendImageToList LevelImageChannel])
-AC_CHECK_FUNCS([ThumbnailImage RemoveFirstImageFromList GetNextImageInList])
-AC_CHECK_FUNCS([SetLogFormat XImportImage ExportImagePixels ImportImagePixels])
-AC_CHECK_FUNCS([ThresholdImageChannel RandomChannelThresholdImage StripImage])
-AC_CHECK_FUNCS([AcquireMagickMemory BlackThresholdImage WhiteThresholdImage])
-AC_CHECK_FUNCS([GetMagickInfoArray GetColorInfoArray GetLocaleExceptionMessage])
-AC_CHECK_FUNCS([GetMagickGeometry ParseSizeGeometry TintImage GetColorHistogram])
-AC_CHECK_FUNCS([GetImageHistogram FuzzyColorCompare GetImageProfile GetNextImageProfile])
-AC_CHECK_FUNCS([GetImageChannelDepth GetImageChannelExtrema GetImageChannelMean])
-AC_CHECK_FUNCS([CompareImageChannels PreviewImage SetImageColorspace GetNextImageAttribute])
+AC_CHECK_FUNCS([AcquireMagickMemory])
 
 # We need to be able to query this later in the configure script, so set a shell variable here
 # as well as defining a symbol.
@@ -102,19 +98,11 @@ if test "$rm_have_acquirestringinfo" = yes; then
    AC_DEFINE(HAVE_ACQUIRESTRINGINFO)
 fi
 
-# We need to be able to query this later in the configure script, so set a shell variable here
-# as well as defining a symbol.
-AC_CHECK_FUNC(GetImageQuantumDepth,
-              rm_have_getimagequantumdepth=yes,
-              rm_have_getimagequantumdepth=no)
-if test "$rm_have_getimagequantumdepth" = yes; then
-   AC_DEFINE(HAVE_GETIMAGEQUANTUMDEPTH)
-fi
-
-AC_CHECK_FUNCS([BilevelImageChannel GammaImageChannel NegateImageChannel])
-AC_CHECK_FUNCS([SetImageOption AddDefinitions GrayscalePseudoClassImage])
-AC_CHECK_FUNCS([RadialBlurImage RandomThresholdImageChannel SeparateImageChannel])
-AC_CHECK_FUNCS([QuantumOperatorRegionImage GetImageStatistics])
+AC_CHECK_FUNCS([AdaptiveThresholdImage AddDefinitions AddNoiseImageChannel BilevelImageChannel])
+AC_CHECK_FUNCS([BlackThresholdImage BlurImageChannel CompareImageChannels ConvolveImageChannel])
+AC_CHECK_FUNCS([EvaluateImageChannel ExportImagePixels FuzzyColorCompare])
+AC_CHECK_FUNCS([GammaImageChannel GaussianBlurImageChannel])
+AC_CHECK_FUNCS([GetColorHistogram GetColorInfoArray])
 
 # We need to be able to query these symbols later in the configure script, so set a shell
 # variable here as well as defining symbols.
@@ -125,13 +113,21 @@ if test "$rm_have_getcolorinfolist" = yes; then
    AC_DEFINE(HAVE_GETCOLORINFOLIST)
 fi
 
-AC_CHECK_FUNC(GetTypeInfoList,
-              rm_have_gettypeinfolist=yes,
-              rm_have_gettypeinfolist=no)
-if test "$rm_have_gettypeinfolist" = yes; then
-   AC_DEFINE(HAVE_GETTYPEINFOLIST)
+AC_CHECK_FUNCS([GetImageChannelDepth GetImageChannelDistortion])
+AC_CHECK_FUNCS([GetImageChannelExtrema GetImageChannelMean])
+AC_CHECK_FUNCS([GetImageHistogram GetImageProfile])
+
+# We need to be able to query this later in the configure script, so set a shell variable here
+# as well as defining a symbol.
+AC_CHECK_FUNC(GetImageQuantumDepth,
+              rm_have_getimagequantumdepth=yes,
+              rm_have_getimagequantumdepth=no)
+if test "$rm_have_getimagequantumdepth" = yes; then
+   AC_DEFINE(HAVE_GETIMAGEQUANTUMDEPTH)
 fi
 
+AC_CHECK_FUNCS([GetImageStatistics GetMagickInfoArray])
+
 AC_CHECK_FUNC(GetMagickInfoList,
               rm_have_getmagickinfolist=yes,
               rm_have_getmagickinfolist=no)
@@ -139,12 +135,25 @@ if test "$rm_have_getmagickinfolist" = yes; then
    AC_DEFINE(HAVE_GETMAGICKINFOLIST)
 fi
 
-AC_CHECK_FUNCS([EvaluateImageChannel PosterizeImage GaussianBlurImageChannel])
-AC_CHECK_FUNCS([ConvolveImageChannel SpliceImage SharpenImageChannel])
-AC_CHECK_FUNCS([SetImageChannelDepth BlurImageChannel GetMultilineTypeMetrics])
-AC_CHECK_FUNCS([NormalizeImageChannel UnsharpMaskImageChannel ShadowImage])
-AC_CHECK_FUNCS([SepiaToneImage SigmoidalContrastImageChannel SetImageProgressMonitor])
-AC_CHECK_FUNCS([GetImageChannelDistortion ImagesToBlob])
+AC_CHECK_FUNCS([GetMultilineTypeMetrics GetNextImageAttribute GetNextImageProfile])
+
+AC_CHECK_FUNC(GetTypeInfoList,
+              rm_have_gettypeinfolist=yes,
+              rm_have_gettypeinfolist=no)
+if test "$rm_have_gettypeinfolist" = yes; then
+   AC_DEFINE(HAVE_GETTYPEINFOLIST)
+fi
+
+AC_CHECK_FUNCS([GrayscalePseudoClassImage ImagesToBlob ImportImagePixels])
+AC_CHECK_FUNCS([IsColorSimilar NegateImageChannel NormalizeImageChannel])
+AC_CHECK_FUNCS([ParseSizeGeometry PosterizeImage PreviewImage QuantumOperatorRegionImage])
+AC_CHECK_FUNCS([RadialBlurImage RandomChannelThresholdImage RandomThresholdImageChannel])
+AC_CHECK_FUNCS([SeparateImageChannel SepiaToneImage SetImageBackgroundColor])
+AC_CHECK_FUNCS([SetImageChannelDepth SetImageColorspace SetImageOption])
+AC_CHECK_FUNCS([SetImageProgressMonitor ShadowImage SharpenImageChannel])
+AC_CHECK_FUNCS([SigmoidalContrastImageChannel SpliceImage StripImage])
+AC_CHECK_FUNCS([ThresholdImageChannel TintImage])
+AC_CHECK_FUNCS([UnsharpMaskImageChannel VignetteImage WhiteThresholdImage XImportImage])
 
 # What typedefs?
 
@@ -161,8 +170,7 @@ if test "$rm_have_magickbooleantype" = yes; then
    AC_DEFINE(HAVE_MAGICKBOOLEANTYPE)
 fi
 
-AC_CHECK_TYPES([DisposeType,
-                magick_int64_t,
+AC_CHECK_TYPES([magick_int64_t,
                 magick_uint64_t,
                 ExtendedSignedIntegralType,
                 ExtendedUnsignedIntegralType,
@@ -191,6 +199,13 @@ AC_CHECK_MEMBERS([Image.orientation],,,
                  #endif
                  #include "magick/api.h"])
 
+AC_CHECK_MEMBERS([ImageInfo.orientation],,,
+                [#include <stdio.h>
+                 #if HAVE_SYS_TYPES_H
+                 #include <sys/types.h>
+                 #endif
+                 #include "magick/api.h"])
+
 AC_CHECK_MEMBERS([Image.quality],,,
                 [#include <stdio.h>
                  #if HAVE_SYS_TYPES_H
@@ -220,80 +235,127 @@ if test "$rm_cv_member_Image_extract_info" = yes; then
   AC_DEFINE(HAVE_IMAGE_EXTRACT_INFO)
 fi
 
-AC_CACHE_CHECK(for ImageInfo.number_scenes, rm_cv_member_ImageInfo_number_scenes,
-  AC_TRY_COMPILE([
+AC_CACHE_CHECK(for HSBColorspace enum value, rm_cv_enum_hsbcolorspace,
+  [AC_TRY_COMPILE(
+[#include <stdio.h>
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <stdio.h>
 #include "magick/api.h"],
-    [ImageInfo i; i.number_scenes = 0;],
-    rm_cv_member_ImageInfo_number_scenes=yes,
-    rm_cv_member_ImageInfo_number_scenes=no))
-if test "$rm_cv_member_ImageInfo_number_scenes" = yes; then
-  AC_DEFINE(HAVE_IMAGEINFO_NUMBER_SCENES)
+     [ColorspaceType x; x = HSBColorspace],
+     rm_cv_enum_hsbcolorspace='yes',
+     rm_cv_enum_hsbcolorspace='no')])
+
+if test "$rm_cv_enum_hsbcolorspace" = yes; then
+  AC_DEFINE(HAVE_HSBCOLORSPACE)
 fi
 
-AC_CACHE_CHECK(for NoCompliance enum value, rm_cv_enum_nocompliance,
+AC_CACHE_CHECK(for CineonLogRGBColorspace enum value, rm_cv_enum_cineonlogrgbcolorspace,
   [AC_TRY_COMPILE(
 [#include <stdio.h>
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #include "magick/api.h"],
-     [ComplianceType x; x = NoCompliance],
-     rm_cv_enum_nocompliance='yes',
-     rm_cv_enum_nocompliance='no')])
+     [ColorspaceType x; x = CineonLogRGBColorspace],
+     rm_cv_enum_cineonlogrgbcolorspace='yes',
+     rm_cv_enum_cineonlogrgbcolorspace='no')])
 
-if test "$rm_cv_enum_nocompliance" = yes; then
-  AC_DEFINE(HAVE_NOCOMPLIANCE)
+if test "$rm_cv_enum_cineonlogrgbcolorspace" = yes; then
+  AC_DEFINE(HAVE_CINEONLOGRGBCOLORSPACE)
 fi
 
-AC_CACHE_CHECK(for HSLColorspace enum value, rm_cv_enum_hslcolorspace,
+AC_CACHE_CHECK(for LABColorspace enum value, rm_cv_enum_labcolorspace,
   [AC_TRY_COMPILE(
 [#include <stdio.h>
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #include "magick/api.h"],
-     [ColorspaceType x; x = HSLColorspace],
-     rm_cv_enum_hslcolorspace='yes',
-     rm_cv_enum_hslcolorspace='no')])
+     [ColorspaceType x; x = LABColorspace],
+     rm_cv_enum_labcolorspace='yes',
+     rm_cv_enum_labcolorspace='no')])
 
-if test "$rm_cv_enum_hslcolorspace" = yes; then
-  AC_DEFINE(HAVE_HSLCOLORSPACE)
+if test "$rm_cv_enum_labcolorspace" = yes; then
+  AC_DEFINE(HAVE_LABCOLORSPACE)
 fi
 
-AC_CACHE_CHECK(for HWBColorspace enum value, rm_cv_enum_hwbcolorspace,
+AC_CACHE_CHECK(for Rec601LumaColorspace enum value, rm_cv_enum_rec601lumacolorspace,
   [AC_TRY_COMPILE(
 [#include <stdio.h>
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #include "magick/api.h"],
-     [ColorspaceType x; x = HWBColorspace],
-     rm_cv_enum_hwbcolorspace='yes',
-     rm_cv_enum_hwbcolorspace='no')])
+     [ColorspaceType x; x = Rec601LumaColorspace],
+     rm_cv_enum_rec601lumacolorspace='yes',
+     rm_cv_enum_rec601lumacolorspace='no')])
 
-if test "$rm_cv_enum_hwbcolorspace" = yes; then
-  AC_DEFINE(HAVE_HWBCOLORSPACE)
+if test "$rm_cv_enum_rec601lumacolorspace" = yes; then
+  AC_DEFINE(HAVE_REC601LUMACOLORSPACE)
 fi
 
-AC_CACHE_CHECK(for HSBColorspace enum value, rm_cv_enum_hsbcolorspace,
+AC_CACHE_CHECK(for Rec601YCbCrColorspace enum value, rm_cv_enum_rec601ycbcrcolorspace,
   [AC_TRY_COMPILE(
 [#include <stdio.h>
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #include "magick/api.h"],
-     [ColorspaceType x; x = HSBColorspace],
-     rm_cv_enum_hsbcolorspace='yes',
-     rm_cv_enum_hsbcolorspace='no')])
+     [ColorspaceType x; x = Rec601YCbCrColorspace],
+     rm_cv_enum_rec601ycbcrcolorspace='yes',
+     rm_cv_enum_rec601ycbcrcolorspace='no')])
 
-if test "$rm_cv_enum_hsbcolorspace" = yes; then
-  AC_DEFINE(HAVE_HSBCOLORSPACE)
+if test "$rm_cv_enum_rec601ycbcrcolorspace" = yes; then
+  AC_DEFINE(HAVE_REC601YCBCRCOLORSPACE)
+fi
+
+AC_CACHE_CHECK(for Rec709LumaColorspace enum value, rm_cv_enum_rec709lumacolorspace,
+  [AC_TRY_COMPILE(
+[#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include "magick/api.h"],
+     [ColorspaceType x; x = Rec709LumaColorspace],
+     rm_cv_enum_rec709lumacolorspace='yes',
+     rm_cv_enum_rec709lumacolorspace='no')])
+
+if test "$rm_cv_enum_rec709lumacolorspace" = yes; then
+  AC_DEFINE(HAVE_REC709LUMACOLORSPACE)
 fi
 
+AC_CACHE_CHECK(for Rec709YCbCrColorspace enum value, rm_cv_enum_rec709ycbcrcolorspace,
+  [AC_TRY_COMPILE(
+[#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include "magick/api.h"],
+     [ColorspaceType x; x = Rec709YCbCrColorspace],
+     rm_cv_enum_rec709ycbcrcolorspace='yes',
+     rm_cv_enum_rec709ycbcrcolorspace='no')])
+
+if test "$rm_cv_enum_rec709ycbcrcolorspace" = yes; then
+  AC_DEFINE(HAVE_REC709YCBCRCOLORSPACE)
+fi
+
+AC_CACHE_CHECK(for LogColorspace enum value, rm_cv_enum_logcolorspace,
+  [AC_TRY_COMPILE(
+[#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include "magick/api.h"],
+     [ColorspaceType x; x = LogColorspace],
+     rm_cv_enum_logcolorspace='yes',
+     rm_cv_enum_logcolorspace='no')])
+
+if test "$rm_cv_enum_logcolorspace" = yes; then
+  AC_DEFINE(HAVE_LOGCOLORSPACE)
+fi
+
+
 AC_CACHE_CHECK(for CopyCyanCompositeOp enum value, rm_cv_enum_copycyancompositeop,
   [AC_TRY_COMPILE(
 [#include <stdio.h>
@@ -440,6 +502,9 @@ AC_CACHE_CHECK(for QuantumPixel enum value, rm_cv_enum_quantumpixel,
      [StorageType x; x = QuantumPixel],
      rm_cv_enum_quantumpixel='yes',
      rm_cv_enum_quantumpixel='no')])
+if test "$rm_cv_enum_quantumpixel" = yes; then
+  AC_DEFINE(HAVE_QUANTUMPIXEL)
+fi
 
 AC_CACHE_CHECK(for TransparentVirtualPixelMethod enum value, rm_cv_enum_transparentvirtualpixelmethod,
   [AC_TRY_COMPILE(

data/doc/comtasks.html

@@ -4,14 +4,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st March 2005), see www.w3.org" />
+  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
 
   <title>RMagick: Common Tasks</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
   <meta name="Copyright" content=
-  "Copyright (C) 2005 by Timothy P. Hunter" />
+  "Copyright (C) 2006 by Timothy P. Hunter" />
   <link rel="stylesheet" type="text/css" href="css/doc.css" />
 <script type="text/javascript" src="scripts/doc.js">
 </script>
@@ -194,6 +194,14 @@ thumb.write "thumb.gif"
   applications when you want to modify an image and then stream it
   back to the client.</p>
 
+  <p>Use <a href=
+  "image2.html#import_pixels">Image#import_pixels</a> to load pixel
+  data from a string buffer into an image. The pixel data must be
+  in scanline order, right-to-left and top-to-bottom. The data can
+  be packed as 8-bit bytes, 16-bit halfwords, 32-bit fullwords, or
+  as C floats or doubles. The reciprocal method is <a href=
+  "image3.html#export_pixels_to_str">Image#export_pixels_to_str</a>.</p>
+
   <h2 id="gray">Converting a color image to grayscale</h2>
 
   <p>Use the <a href=
@@ -248,7 +256,7 @@ img.write("myimage.jpg") { self.quality = 50 }
   </div>
   <hr />
 
-  <p class="spacer">&nbsp;</p>
+  <p class="spacer"> </p>
 
   <div class="nav">
     &laquo; <a href="imusage.html">Prev</a> | <a href=

data/doc/constants.html

@@ -4,14 +4,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st March 2005), see www.w3.org" />
+  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
 
   <title>RMagick: Constants</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
   <meta name="Copyright" content=
-  "Copyright (C) 2005 by Timothy P. Hunter" />
+  "Copyright (C) 2006 by Timothy P. Hunter" />
   <link rel="stylesheet" type="text/css" href="css/doc.css" />
 <script type="text/javascript" src="scripts/doc.js">
 </script>
@@ -94,13 +94,13 @@
         <li><a href="#CompositeOperator">CompositeOperator</a></li>
 
         <li><a href="#CompressionType">CompressionType</a></li>
+
+        <li><a href="#DecorationType">DecorationType</a></li>
       </ul>
     </div>
 
     <div class="toccol">
       <ul>
-        <li><a href="#DecorationType">DecorationType</a></li>
-
         <li><a href="#DisposeType">DisposeType</a></li>
 
         <li><a href="#EndianType">EndianType</a></li>
@@ -114,14 +114,16 @@
         <li><a href="#InterlaceType">InterlaceType</a></li>
 
         <li><a href="#MetricType">MetricType</a></li>
+
+        <li><a href="#NoiseType">NoiseType</a></li>
+
+        <li><a href="#Opacity">Opacity</a></li>
       </ul>
     </div>
 
     <div class="toccol">
       <ul>
-        <li><a href="#NoiseType">NoiseType</a></li>
-
-        <li><a href="#Opacity">Opacity</a></li>
+        <li><a href="#OrientationType">OrientationType</a></li>
 
         <li><a href="#PaintMethod">PaintMethod</a></li>
 
@@ -131,6 +133,8 @@
 
         <li><a href="#StretchType">StretchType</a></li>
 
+        <li><a href="#StorageType">StorageType</a></li>
+
         <li><a href="#StyleType">StyleType</a></li>
 
         <li><a href="#WeightType">WeightType</a></li>
@@ -148,11 +152,11 @@
 
     <dd>An extended form of the <code>Version</code> constant with
     the format shown here:<br />
-    <code>This is RMagick 1.4.0 ($Date: 2005/09/26 23:35:06 $)
-    Copyright (C) 2005 by Timothy P. Hunter<br />
-    Built with ImageMagick 6.0.0 02/25/04 Q8
-    http://www.imagemagick.org<br />
-    Built for ruby 1.8.1 (2003-12-25) [i686-linux]<br />
+    <code>This is RMagick 1.10.0 ($Date: 2006/01/21 15:27:19 $)
+    Copyright (C) 2006 by Timothy P. Hunter<br />
+    Built with GraphicsMagick 1.2 unreleased Q16
+    http://www.GraphicsMagick.org/<br />
+    Built for ruby 1.8.4 (2005-12-24) [i686-linux]<br />
     Web page: http://rmagick.rubyforge.org<br />
     Email: rmagick@rubyforge.org</code></dd>
 
@@ -162,7 +166,7 @@
     <code>@(#)ImageMagick X.Y.Z MM/DD/YY Q:16
     http://www.imagemagick.org</code><br />
     or<br />
-    <code>GraphicsMagick 1.0 05/05/03 Q8
+    <code>GraphicsMagick X.Y.Z MM/DD/YY Q8
     http://www.GraphicsMagick.org/</code></dd>
 
     <dt>MaxRGB</dt>
@@ -302,6 +306,13 @@
   files.</span> See <a href=
   "imageattrs.html#colorspace">colorspace</a>.</p>
 
+  <p>Each version of ImageMagick and GraphicsMagick defines a
+  subset of the colorspaces listed below. To list the subset
+  supported by your version, issue the command:</p>
+  <pre class="example">
+ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
+</pre>
+
   <dl>
     <dt>UndefinedColorspace</dt>
 
@@ -313,7 +324,7 @@
 
     <dt>GRAYColorspace</dt>
 
-    <dd>&nbsp;</dd>
+    <dd>Full-range grayscale</dd>
 
     <dt>TransparentColorspace</dt>
 
@@ -327,19 +338,23 @@
 
     <dt>XYZColorspace</dt>
 
-    <dd>&nbsp;</dd>
+    <dd>CIE XYZ</dd>
+
+    <dt>YCCColorspace</dt>
+
+    <dd>Kodak PhotoCD PhotoYCC</dd>
 
     <dt>YCbCrColorspace</dt>
 
-    <dd>&nbsp;</dd>
+    <dd>&nbsp; </dd>
 
     <dt>YIQColorspace</dt>
 
-    <dd>&nbsp;</dd>
+    <dd>&nbsp; </dd>
 
     <dt>YPbPrColorspace</dt>
 
-    <dd>&nbsp;</dd>
+    <dd>&nbsp; </dd>
 
     <dt>YUVColorspace</dt>
 
@@ -356,17 +371,56 @@
 
     <dt>SRGBColorspace</dt>
 
-    <dd>In &times;Magick, this constant is named sRGBColorspace,
-    but since Ruby constants must start with an uppercase letter, I
-    had to change it.</dd>
+    <dd>Kodak PhotoCD sRGB. In &times;Magick, this constant is
+    named sRGBColorspace, but since Ruby constants must start with
+    an uppercase letter, I had to change it.</dd>
 
     <dt>HSLColorspace</dt>
 
-    <dd>Available in ImageMagick 5.5.7.</dd>
+    <dd>Hue, saturation, luminosity</dd>
 
     <dt>HWBColorspace</dt>
 
-    <dd>Available in ImageMagick 5.5.7.</dd>
+    <dd>Hue, whiteness, blackness</dd>
+
+    <dt>HSBColorspace</dt>
+
+    <dd>&nbsp; </dd>
+
+    <dt>LogColorspace</dt>
+
+    <dd>&nbsp; </dd>
+
+    <dt>LABColorspace</dt>
+
+    <dd>&nbsp; </dd>
+  </dl>
+
+  <p>The colorspaces in this group are typically associated with the DPX
+  and Cineon image formats used in the motion picture industry.</p>
+
+  <dl>
+    <dt>CineonLogRGBColorspace</dt>
+
+    <dd>A logarithmic RGB space based on Kodak's Cineon log
+    definition. RGB data with Cineon Log scaling, 2.048 density
+    range.</dd>
+
+    <dt>Rec601LumaColorspace</dt>
+
+    <dd>Luma (Y) according to ITU-R 601</dd>
+
+    <dt>Rec601YCbCrColorspace</dt>
+
+    <dd>YCbCr according to ITU-R 601</dd>
+
+    <dt>Rec709LumaColorspace</dt>
+
+    <dd>Luma (Y) according to ITU-R 709</dd>
+
+    <dt>Rec709YCbCrColorspace</dt>
+
+    <dd>YCbCr according to ITU-R 709</dd>
   </dl>
 
   <h3 class="const" id="ComplianceType">ComplianceType</h3>
@@ -447,10 +501,9 @@
 
     <dt>PlusCompositeOp</dt>
 
-    <dd class="imquote">The result is just the sum of
-    the&nbsp;image data. Output values are cropped to 255 (no
-    overflow). This operation is independent of the matte
-    channels.</dd>
+    <dd class="imquote">The result is just the sum of the image
+    data. Output values are cropped to 255 (no overflow). This
+    operation is independent of the matte channels.</dd>
 
     <dt>MinusCompositeOp</dt>
 
@@ -529,7 +582,7 @@
 
     <dt>DissolveCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
+    <dd> </dd>
 
     <dt>DisplaceCompositeOp</dt>
 
@@ -540,15 +593,15 @@
 
     <dt>ModulateCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
+    <dd> </dd>
 
     <dt>ThresholdCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
+    <dd> </dd>
 
     <dt>NoCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
+    <dd> </dd>
 
     <dt>DarkenCompositeOp</dt>
 
@@ -593,7 +646,7 @@
 
     <dt>OverlayCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
+    <dd> </dd>
 
     <dt>CopyCyanCompositeOp</dt>
 
@@ -694,8 +747,8 @@
     <dt>BZipCompression</dt>
 
     <dd class="imquote">BZip (Burrows-Wheeler block-sorting text
-    compression algorithm and Huffman coding)&nbsp; as used by
-    bzip2 utilities</dd>
+    compression algorithm and Huffman coding)  as used by bzip2
+    utilities</dd>
 
     <dt>FaxCompression</dt>
 
@@ -948,11 +1001,11 @@
 
     <dt>ColorSeparationMatteType</dt>
 
-    <dd>&nbsp;</dd>
+    <dd> </dd>
 
     <dt>OptimizeType</dt>
 
-    <dd>&nbsp;</dd>
+    <dd> </dd>
   </dl>
 
   <h3 class="const" id="InterlaceType">InterlaceType</h3>
@@ -1051,6 +1104,34 @@
     <dd>The maximum amount of opacity.</dd>
   </dl>
 
+  <h3 class="const" id="OrientationType">OrientationType</h3>
+
+  <p>Specify the orientation of the image pixels. See <a href=
+  "imageattrs.html#orientation">Image#orientation</a> and <a href=
+  "info.html#orientation">Info#orientation</a>. See <a href=
+  "http://jpegclub.org/exif_orientation.html">http://jpegclub.org/exif_orientation.html</a>
+  for an explanation of these values.</p>
+
+  <dl>
+    <dt>UndefinedOrientation</dt>
+
+    <dt>TopLeftOrientation</dt>
+
+    <dt>TopRightOrientation</dt>
+
+    <dt>BottomRightOrientation</dt>
+
+    <dt>BottomLeftOrientation</dt>
+
+    <dt>LeftTopOrientation</dt>
+
+    <dt>RightTopOrientation</dt>
+
+    <dt>RightBottomOrientation</dt>
+
+    <dt>LeftBottomOrientation</dt>
+  </dl>
+
   <h3 class="const" id="PaintMethod">PaintMethod</h3>
 
   <p class="imquote">Specify how pixel colors are to be replaced in
@@ -1178,6 +1259,47 @@
     <dt>AnyStretch</dt>
   </dl>
 
+  <h3 class="const" id="StorageType">StorageType</h3>
+
+  <p>See <a href="image2.html#import_pixels">import_pixels</a> and
+  <a href=
+  "image2.html#export_pixels_to_str">export_pixels_to_str</a>.</p>
+
+  <dl>
+    <dt>CharPixel</dt>
+
+    <dd>corresponds to a C <code>unsigned char</code>, range
+    0-255.</dd>
+
+    <dt>ShortPixel</dt>
+
+    <dd>corresponds to a C <code>unsigned short</code>, range
+    0-65535.</dd>
+
+    <dt>IntegerPixel</dt>
+
+    <dd>corresponds to a C <code>unsigned int</code>, range
+    0-4294967295.</dd>
+
+    <dt>LongPixel</dt>
+
+    <dd>corresponds to a C <code>unsigned long</code>, range
+    0-4294967295 (for 32-bit longs).</dd>
+
+    <dt>FloatPixel</dt>
+
+    <dd>corresponds to a C <code>float</code>, range 0.0-1.0.</dd>
+
+    <dt>DoublePixel</dt>
+
+    <dd>corresponds to a C <code>double</code>, range 0.0-1.0.</dd>
+
+    <dt>QuantumPixel</dt>
+
+    <dd>corresponds to the Quantum type used by &times;Magick,
+    range 0-MaxRGB.</dd>
+  </dl>
+
   <h3 class="const" id="StyleType">StyleType</h3>
 
   <p>See <a href="draw.html#font_style_eq">font_style=</a>.</p>
@@ -1220,12 +1342,12 @@
     <dd>Decreases weight by 100</dd>
   </dl>
 
-  <p class="spacer">&nbsp;</p>
+  <p class="spacer"> </p>
 
   <div class="nav">
-    &laquo;&nbsp;<a href="info.html">Prev</a> | <a href=
-    "index.html">Contents</a> | <a href=
-    "rvgtut.html">Next</a>&nbsp;&raquo;
+    &laquo; <a href="info.html">Prev</a> | <a href=
+    "index.html">Contents</a> | <a href="rvgtut.html">Next</a>
+    &raquo;
   </div>
 </body>
 </html>