(no commit message)

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index afc95520880a4e83ab2d350d10cde2673020f0df..bab72bd2d028c617e7df1d4e4ce5dfa61111e5ab 100755 (executable)
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -55,7 +55,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib -L/usr/lib'
       ;;
     --libs)
-      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread "
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 203ec963b6c1fb3392b19189d596340038691999..f7023325eb364107085c194fde410661e45ce479 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -2798,6 +2798,8 @@ void Magick::Image::colorSpace( const ColorspaceType colorSpace_ )
 
   modifyImage();
 
+  ExceptionInfo exceptionInfo;
+  GetExceptionInfo( &exceptionInfo );
   if ( colorSpace_ != RGBColorspace &&
        colorSpace_ != sRGBColorspace &&
        colorSpace_ != TransparentColorspace &&
@@ -2809,12 +2811,13 @@ void Magick::Image::colorSpace( const ColorspaceType colorSpace_ )
           image()->colorspace != GRAYColorspace)
         {
           /* Transform to RGB colorspace as intermediate step */
-          TransformRGBImage( image(), image()->colorspace );
+          TransformRGBImage( image(), image()->colorspace, &exceptionInfo );
           throwImageException();
         }
       /* Transform to final non-RGB colorspace */
-      RGBTransformImage( image(), colorSpace_ );
-      throwImageException();
+      RGBTransformImage( image(), colorSpace_, &exceptionInfo );
+      throwException( exceptionInfo );
+      (void) DestroyExceptionInfo( &exceptionInfo );
       return;
     }
 
@@ -2824,10 +2827,13 @@ void Magick::Image::colorSpace( const ColorspaceType colorSpace_ )
        colorSpace_ == GRAYColorspace )
     {
       /* Transform to a RGB-type colorspace */
-      TransformRGBImage( image(), image()->colorspace );
-      throwImageException();
+      TransformRGBImage( image(), image()->colorspace, &exceptionInfo );
+      throwException( exceptionInfo );
+      (void) DestroyExceptionInfo( &exceptionInfo );
       return;
     }
+  throwException( exceptionInfo );
+  (void) DestroyExceptionInfo( &exceptionInfo );
 }
 Magick::ColorspaceType Magick::Image::colorSpace ( void ) const
 {

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index ee31e69960aacec9337b16f9e4bc146f4f524ceb..4231ffd33868dec11c1b89aa76c696101e8d95d3 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -95,7 +95,7 @@ typedef struct _TransformPacket
 %  The format of the RGBTransformImage method is:
 %
 %      MagickBooleanType RGBTransformImage(Image *image,
-%        const ColorspaceType colorspace)
+%        const ColorspaceType colorspace,EsceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -103,6 +103,8 @@ typedef struct _TransformPacket
 %
 %    o colorspace: the colorspace to transform the image to.
 %
+%   o exception: return any errors or warnings in this structure.
+%
 */
 
 static inline void ConvertRGBToXYZ(const Quantum red,const Quantum green,
@@ -178,16 +180,13 @@ static inline void ConvertXYZToLab(const double X,const double Y,const double Z,
 }
 
 MagickExport MagickBooleanType RGBTransformImage(Image *image,
-  const ColorspaceType colorspace)
+  const ColorspaceType colorspace,ExceptionInfo *exception)
 {
 #define RGBTransformImageTag  "RGBTransform/Image"
 
   CacheView
     *image_view;
 
-  ExceptionInfo
-    *exception;
-
   MagickBooleanType
     status,
     sync;
@@ -230,7 +229,6 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
       break;
     }
   }
-  exception=(&image->exception);
   if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
     return(MagickFalse);
   status=MagickTrue;
@@ -1240,13 +1238,13 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
   if (image->colorspace == colorspace)
     return(MagickTrue);
   if ((colorspace == RGBColorspace) || (colorspace == TransparentColorspace))
-    return(TransformRGBImage(image,image->colorspace));
+    return(TransformRGBImage(image,image->colorspace,exception));
   status=MagickTrue;
   if ((image->colorspace != RGBColorspace) &&
       (image->colorspace != TransparentColorspace) &&
       (image->colorspace != GRAYColorspace))
-    status=TransformRGBImage(image,image->colorspace);
-  if (RGBTransformImage(image,colorspace) == MagickFalse)
+    status=TransformRGBImage(image,image->colorspace,exception);
+  if (RGBTransformImage(image,colorspace,exception) == MagickFalse)
     status=MagickFalse;
   return(status);
 }
@@ -1270,7 +1268,7 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
 %  The format of the TransformRGBImage method is:
 %
 %      MagickBooleanType TransformRGBImage(Image *image,
-%        const ColorspaceType colorspace)
+%        const ColorspaceType colorspace,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -1278,6 +1276,8 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
 %
 %    o colorspace: the colorspace to transform the image to.
 %
+%   o exception: return any errors or warnings in this structure.
+%
 */
 
 static double LabF2(double alpha)
@@ -1372,7 +1372,7 @@ static inline void ConvertCMYKToRGB(PixelInfo *pixel)
 }
 
 MagickExport MagickBooleanType TransformRGBImage(Image *image,
-  const ColorspaceType colorspace)
+  const ColorspaceType colorspace,ExceptionInfo *exception)
 {
 #define D50X  (0.9642)
 #define D50Y  (1.0)
@@ -1621,9 +1621,6 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
   CacheView
     *image_view;
 
-  ExceptionInfo
-    *exception;
-
   MagickBooleanType
     status;
 
@@ -1659,7 +1656,6 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
   }
   status=MagickTrue;
   progress=0;
-  exception=(&image->exception);
   switch (colorspace)
   {
     case CMYColorspace:

diff --git a/MagickCore/colorspace.h b/MagickCore/colorspace.h
index fdc998103f1b5b57e65b987a60f3244de6cde81b..697dc5f8f9a9d1a4d1b04342a64fd1bff111f94a 100644 (file)
--- a/MagickCore/colorspace.h
+++ b/MagickCore/colorspace.h
@@ -50,10 +50,10 @@ typedef enum
 } ColorspaceType;
 
 extern MagickExport MagickBooleanType
-  RGBTransformImage(Image *,const ColorspaceType),
+  RGBTransformImage(Image *,const ColorspaceType,ExceptionInfo *),
   SetImageColorspace(Image *,const ColorspaceType,ExceptionInfo *),
   TransformImageColorspace(Image *,const ColorspaceType,ExceptionInfo *),
-  TransformRGBImage(Image *,const ColorspaceType);
+  TransformRGBImage(Image *,const ColorspaceType,ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 4de7f9ad5913053721d6de86356f211ef9eeff75..0616c229b8b29ee5ee22d0ca8363790eaa9c8c3f 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,9 +12,7 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-#ifndef MAGICKCORE_BUILD_MODULES
-#define MAGICKCORE_BUILD_MODULES 1
-#endif
+/* #undef BUILD_MODULES */
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -77,9 +75,7 @@
 #endif
 
 /* Define if you have FFTW library */
-#ifndef MAGICKCORE_FFTW_DELEGATE
-#define MAGICKCORE_FFTW_DELEGATE 1
-#endif
+/* #undef FFTW_DELEGATE */
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH
@@ -221,9 +217,7 @@
 #endif
 
 /* Define to 1 if you have the <CL/cl.h> header file. */
-#ifndef MAGICKCORE_HAVE_CL_CL_H
-#define MAGICKCORE_HAVE_CL_CL_H 1
-#endif
+/* #undef HAVE_CL_CL_H */
 
 /* Define to 1 if you have the <complex.h> header file. */
 #ifndef MAGICKCORE_HAVE_COMPLEX_H
@@ -441,15 +435,15 @@
 #endif
 
 /* Define if you have the <lcms2.h> header file. */
-/* #undef HAVE_LCMS2_H */
+#ifndef MAGICKCORE_HAVE_LCMS2_H
+#define MAGICKCORE_HAVE_LCMS2_H 1
+#endif
 
 /* Define if you have the <lcms2/lcms2.h> header file. */
 /* #undef HAVE_LCMS2_LCMS2_H */
 
 /* Define if you have the <lcms.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS_H
-#define MAGICKCORE_HAVE_LCMS_H 1
-#endif
+/* #undef HAVE_LCMS_H */
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
@@ -1172,9 +1166,7 @@
 #endif
 
 /* Define if you have JBIG library */
-#ifndef MAGICKCORE_JBIG_DELEGATE
-#define MAGICKCORE_JBIG_DELEGATE 1
-#endif
+/* #undef JBIG_DELEGATE */
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
@@ -1203,21 +1195,17 @@
 #endif
 
 /* Define if you have LQR library */
-#ifndef MAGICKCORE_LQR_DELEGATE
-#define MAGICKCORE_LQR_DELEGATE 1
-#endif
+/* #undef LQR_DELEGATE */
 
 /* Define if using libltdl to support dynamically loadable modules */
-#ifndef MAGICKCORE_LTDL_DELEGATE
-#define MAGICKCORE_LTDL_DELEGATE 1
-#endif
+/* #undef LTDL_DELEGATE */
 
 /* Define if the OS needs help to load dependent libraries for dlopen(). */
 /* #undef LTDL_DLOPEN_DEPLIBS */
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/opt/intel/lib/intel64:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/tracker-0.12:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */
@@ -1268,9 +1256,7 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-#ifndef MAGICKCORE_OPENEXR_DELEGATE
-#define MAGICKCORE_OPENEXR_DELEGATE 1
-#endif
+/* #undef OPENEXR_DELEGATE */
 
 /* Name of package */
 #ifndef MAGICKCORE_PACKAGE
@@ -1330,9 +1316,7 @@
 #endif
 
 /* Define if you have RSVG library */
-#ifndef MAGICKCORE_RSVG_DELEGATE
-#define MAGICKCORE_RSVG_DELEGATE 1
-#endif
+/* #undef RSVG_DELEGATE */
 
 /* Define to the type of arg 1 for `select'. */
 #ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1479,9 +1463,7 @@
 #endif
 
 /* Define if you have WEBP library */
-#ifndef MAGICKCORE_WEBP_DELEGATE
-#define MAGICKCORE_WEBP_DELEGATE 1
-#endif
+/* #undef WEBP_DELEGATE */
 
 /* Define to use the Windows GDI32 library */
 /* #undef WINGDI32_DELEGATE */
@@ -1490,9 +1472,7 @@
 /* #undef WITH_DMALLOC */
 
 /* Define if you have WMF library */
-#ifndef MAGICKCORE_WMF_DELEGATE
-#define MAGICKCORE_WMF_DELEGATE 1
-#endif
+/* #undef WMF_DELEGATE */
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 577d9a2cd599e3c618bd3da11e6ee48deaecbecc..bacc20e4ffc6dc232735bf602304b8994ad8dab0 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "exported"
+#define MagickSVNRevision  "5659"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-10-17"
+#define MagickReleaseDate  "2011-10-18"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/config/configure.xml b/config/configure.xml
index 11fc4d7995a7ec30e48d207982acef1371301d3c..c51ac5654598dfde4c8168e4d2fe0f34aded34ce 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,8 +11,8 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="5659" />
-  <configure name="RELEASE_DATE" value="2011-10-15"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="RELEASE_DATE" value="2011-10-18"/>
+  <configure name="CONFIGURE" value="./configure  '--disable-shared'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
@@ -28,7 +28,7 @@
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib -L/usr/lib"/>
-  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
+  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread "/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
   <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>

diff --git a/libtool b/libtool
index 025fcf37e68489c2ddc449bacc75b73f489fa894..b07ec29d58656440e2e89e918cfacadc61a5beab 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -74,7 +74,7 @@ DLLTOOL="false"
 OBJDUMP="objdump"
 
 # Whether or not to build shared libraries.
-build_libtool_libs=yes
+build_libtool_libs=no
 
 # Whether or not to build static libraries.
 build_old_libs=yes
@@ -83,7 +83,7 @@ build_old_libs=yes
 pic_mode=default
 
 # Whether or not to optimize for fast installation.
-fast_install=yes
+fast_install=needless
 
 # The host system.
 host_alias=
@@ -323,7 +323,7 @@ link_static_flag=""
 compiler_c_o="yes"
 
 # Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
+build_libtool_need_lc=yes
 
 # Whether or not to disallow shared libs when runtime libs are static.
 allow_libtool_libs_with_static_runtimes=no