(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 45de1d06c719b9598dd69e21937bb224b996a6c3..9ca0e17634a7c5d2d027c99fd6e2c05076efe3c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-22  6.6.2-8 Cristy  <quetzlzacatenango@image...>
+  * Skip byte when DDS bitcount is 32 (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16487).
+
 2010-06-17  6.6.2-7 Cristy  <quetzlzacatenango@image...>
   * Support new label:pointsize property.
   * Miscellany->Slide Show, in the display program, now cycles through the

diff --git a/coders/dds.c b/coders/dds.c
index 1908764102f55486b6cfaddc3f227824bc7ea06f..b5ea3c97ab0e55cb20d25d2fd79f222e82f08736 100644 (file)
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -790,6 +790,8 @@ static MagickBooleanType ReadUncompressedRGB(Image *image, DDSInfo *dds_info)
       q->blue  = ScaleCharToQuantum( (unsigned char) ReadBlobByte(image) );
       q->green = ScaleCharToQuantum( (unsigned char) ReadBlobByte(image) );
       q->red   = ScaleCharToQuantum( (unsigned char) ReadBlobByte(image) );
+      if (dds_info->pixelformat.rgb_bitcount == 32)
+        (void) ReadBlobByte(image);
       q++;
     }
     

diff --git a/config/configure.xml b/config/configure.xml
index 197020987b954cb909cf38a06c7542c9a2b02e50..893ad56ec50bdb6c8e4ffc31a4639b83cebc564c 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <configure name="LIB_VERSION" value="0x662"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,2,8"/>
   <configure name="RELEASE_DATE" value="2010-06-22"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="CONFIGURE" value="./configure  '--without-magick-plus-plus'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.6.2"/>

diff --git a/magick/magick-config.h b/magick/magick-config.h
index 83cf54cc9b7324590906c9afbc5cb7ebf3741a21..6a7428321750d4b32b43259238d092d2e4dbe112 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -160,9 +160,7 @@
 #endif
 
 /* define if bool is a built-in type */
-#ifndef MAGICKCORE_HAVE_BOOL
-#define MAGICKCORE_HAVE_BOOL /**/
-#endif
+/* #undef HAVE_BOOL */
 
 /* Define to 1 if you have the `cimag' function. */
 #ifndef MAGICKCORE_HAVE_CIMAG
@@ -435,9 +433,7 @@
 #endif
 
 /* define if the compiler implements L"widestring" */
-#ifndef MAGICKCORE_HAVE_LSTRING
-#define MAGICKCORE_HAVE_LSTRING /**/
-#endif
+/* #undef HAVE_LSTRING */
 
 /* Define this if a modern libltdl is already installed */
 #ifndef MAGICKCORE_HAVE_LTDL
@@ -486,14 +482,10 @@
 #endif
 
 /* define if the compiler implements namespaces */
-#ifndef MAGICKCORE_HAVE_NAMESPACES
-#define MAGICKCORE_HAVE_NAMESPACES /**/
-#endif
+/* #undef HAVE_NAMESPACES */
 
 /* Define if g++ supports namespace std. */
-#ifndef MAGICKCORE_HAVE_NAMESPACE_STD
-#define MAGICKCORE_HAVE_NAMESPACE_STD /**/
-#endif
+/* #undef HAVE_NAMESPACE_STD */
 
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
@@ -679,9 +671,7 @@
 #endif
 
 /* define if the compiler supports ISO C++ standard library */
-#ifndef MAGICKCORE_HAVE_STD_LIBS
-#define MAGICKCORE_HAVE_STD_LIBS /**/
-#endif
+/* #undef HAVE_STD_LIBS */
 
 /* Define to 1 if you have the `strcasecmp' function. */
 #ifndef MAGICKCORE_HAVE_STRCASECMP

diff --git a/magick/version.h b/magick/version.h
index 127d34725ddfc56a5162fd1469aab22e83007316..f5c1ab27099719ce6a5e774c3c97d67c6d30e865 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-06-22"
-#define MagickChangeDate   "20100617"
+#define MagickChangeDate   "20100622"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.2/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)