(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 01dd3798d6dca363cc3e2aa567844acdd24317c3..54af9975ec519916b1cf549d04131138fd4bcbd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
   * Don't write empty tile if tile geometry matches the image width (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16064).
   * Support -regard-warnings in the mogrify utility.
+  * Output the correct units for the identify utility (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16075).
 
 2010-04-15  6.6.1-4 Cristy  <quetzlzacatenango@image...>
   * Do not set the resample virtual pixel method when undefined.

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index ee67aabdf717d3cc9f7a836ae76b5716ebafc9a0..126b6cae8c55e0a8222273d9f0f35b38e506bd48 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 '
       ;;
     --libs)
-      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread "
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index f02873dc69d17c0859e5c1ab2c44cd366eccd819..e1462aafa8f6642219c22720eb72a39a33f862a6 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -180,7 +180,7 @@ WriteMakefile
    'INC'       => $INC_magick,
 
    # C compiler
-   #'CC' => 'gcc -std=gnu99 -std=gnu99',
+   #'CC' => 'g++',
 
    # C pre-processor flags (e.g. -I & -D options)
    # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2",
@@ -189,7 +189,7 @@ WriteMakefile
    'CCFLAGS' => $CCFLAGS_magick,
 
    # Linker
-   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
+   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'g++' : $Config{'ld'},
 
    # Linker flags for building an executable
    'LDFLAGS' =>  $LDFLAGS_magick,
@@ -210,7 +210,7 @@ WriteMakefile
    # 'OPTIMIZE'        => '',
 
    # Use same compiler as ImageMagick
-   'PERLMAINCC'        => ' -fopenmp',
+   'PERLMAINCC'        => 'g++ -fopenmp',
 
    # Set Perl installation prefix to ImageMagick installation prefix
 #   'PREFIX'   => '/usr/local',

diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh
index dd59071fb3569ecdb3eadaaec77b4e4fff0e3a6e..c0259043d37bf6b58275370d30d4c6f4311ac2f7 100755 (executable)
--- a/PerlMagick/check.sh
+++ b/PerlMagick/check.sh
@@ -41,10 +41,10 @@ fi
 
 if test -x PerlMagick -a -f Makefile.aperl ; then
   # Static build test incantation
-  ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' test
+  ${MAKE} -f Makefile.aperl CC='g++' test
 elif test -f Makefile -a -f Magick.o; then
   # Shared build test incantation
-  ${MAKE} CC='gcc -std=gnu99 -std=gnu99' test
+  ${MAKE} CC='g++' test
 else
   echo 'PerlMagick has not been built!'
   exit 1

diff --git a/coders/psd.c b/coders/psd.c
index bca8d7e50eb1ef37abe0ffffa97b15965f076652..e0e048217209b7c3327d2dff4e703757d73b6460 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -219,12 +219,12 @@ static MagickBooleanType IsPSD(const unsigned char *magick,const size_t length)
 %
 */
 
-static const char *CompositeOperatorToPSDBlendMode(CompositeOperator operator)
+static const char *CompositeOperatorToPSDBlendMode(CompositeOperator op)
 {
   const char
     *blend_mode;
 
-  switch (operator)
+  switch (op)
   {
     case OverCompositeOp:    blend_mode = "norm";  break;
     case MultiplyCompositeOp:  blend_mode = "mul ";  break;

diff --git a/coders/wmf.c b/coders/wmf.c
index eb3ca5b1d2ff875695afa9560603833fff695a2f..62e42fb8e8371d82786409d92e2838e47a55cbd6 100644 (file)
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -126,6 +126,9 @@ static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception)
   ImageInfo
     *read_info;
 
+  MagickBooleanType
+    status;
+
   unsigned long
     flags;
 
@@ -142,7 +145,7 @@ static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception)
     *eps_info;
 
   wmf_error_t
-    status;
+    wmf_status;
 
   /*
     Read WMF image.
@@ -159,16 +162,16 @@ static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception)
   flags|=WMF_OPT_IGNORE_NONFATAL;
   flags|=WMF_OPT_FUNCTION;
   options.function=wmf_eps_function;
-  status=wmf_api_create(&wmf_info,flags,&options);
-  if (status != wmf_E_None)
+  wmf_status=wmf_api_create(&wmf_info,flags,&options);
+  if (wmf_status != wmf_E_None)
     {
       if (wmf_info != (wmfAPI *) NULL)
         wmf_api_destroy(wmf_info);
       ThrowReaderException(DelegateError,"UnableToInitializeWMFLibrary");
     }
-  status=wmf_bbuf_input(wmf_info,WMFReadBlob,WMFSeekBlob,WMFTellBlob,
+  wmf_status=wmf_bbuf_input(wmf_info,WMFReadBlob,WMFSeekBlob,WMFTellBlob,
     (void *) image);
-  if (status != wmf_E_None)
+  if (wmf_status != wmf_E_None)
     {
       wmf_api_destroy(wmf_info);
       ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
@@ -176,8 +179,8 @@ static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception)
       image=DestroyImageList(image);
       return((Image *) NULL);
     }
-  status=wmf_scan(wmf_info,0,&bounding_box);
-  if (status != wmf_E_None)
+  wmf_status=wmf_scan(wmf_info,0,&bounding_box);
+  if (wmf_status != wmf_E_None)
     {
       wmf_api_destroy(wmf_info);
       ThrowReaderException(DelegateError,"FailedToScanFile");
@@ -194,8 +197,8 @@ static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception)
     }
   eps_info->out=wmf_stream_create(wmf_info,file);
   eps_info->bbox=bounding_box;
-  status=wmf_play(wmf_info,0,&bounding_box);
-  if (status != wmf_E_None)
+  wmf_status=wmf_play(wmf_info,0,&bounding_box);
+  if (wmf_status != wmf_E_None)
     {
       wmf_api_destroy(wmf_info);
       ThrowReaderException(DelegateError,"FailedToRenderFile");

diff --git a/config/configure.xml b/config/configure.xml
index c33dc86bbeeac2be5116ecee96234c74f56d9ae5..58ff3891728f324286d70614003af993377c5556 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,21 +9,21 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x661"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,1,5"/>
-  <configure name="RELEASE_DATE" value="2010-04-17"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="RELEASE_DATE" value="2010-04-23"/>
+  <configure name="CONFIGURE" value="./configure  '--disable-shared' 'CC=g++'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.6.1"/>
-  <configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>
+  <configure name="CC" value="g++"/>
   <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -W -pthread"/>
   <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib "/>
-  <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
+  <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread "/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -Wall -W -pthread"/>
-  <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath="/>
+  <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=g++' --disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
   <configure name="HOST" value="x86_64-unknown-linux-gnu"/>
   <configure name="DELEGATES" value="bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg png rsvg tiff x11 xml wmf zlib"/>
   <configure name="COPYRIGHT" value="Copyright (C) 1999-2010 ImageMagick Studio LLC"/>

diff --git a/libtool b/libtool
index 76e04a984fdd36fc82c7e9ef95720865e47aff99..0e7ca73bd3158c722f4181bc92e6405239c19947 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -67,7 +67,7 @@ DLLTOOL=dlltool
 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
@@ -76,7 +76,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=
@@ -95,7 +95,7 @@ NM="/usr/bin/nm -B"
 LN_S="ln -s"
 
 # What is the maximum length of a command?
-max_cmd_len=1572864
+max_cmd_len=1966080
 
 # Object file suffix (normally "o").
 objext=o
@@ -135,7 +135,7 @@ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
 # A C compiler.
-LTCC="gcc -std=gnu99 -std=gnu99"
+LTCC="g++"
 
 # LTCC compiler flags.
 LTCFLAGS="-fopenmp -g -O2 -Wall -W -pthread"
@@ -249,10 +249,10 @@ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/alliance/
 dlopen_support=yes
 
 # Whether dlopen of programs is supported.
-dlopen_self=yes
+dlopen_self=no
 
 # Whether dlopen of statically linked programs is supported.
-dlopen_self_static=yes
+dlopen_self_static=unknown
 
 # Commands to strip libraries.
 old_striplib="strip --strip-debug"
@@ -266,13 +266,13 @@ LD="/usr/bin/ld -m elf_x86_64"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
 
 # A language specific compiler.
-CC="gcc -std=gnu99 -std=gnu99"
+CC="g++"
 
 # Is the compiler the GNU compiler?
 with_gcc=yes
 
 # Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
+no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
 
 # How to pass a linker flag through the compiler.
 wl="-Wl,"
@@ -287,7 +287,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

diff --git a/magick/Magick-config b/magick/Magick-config
index 617b8958dca604bf8b2d96aa811be43ff476e51a..9f9e874901c51a2211e9200a87719e1fd2a6dd31 100755 (executable)
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread "
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/magick/histogram.c b/magick/histogram.c
index 4de60176057eb731c41769831833a0d3f84d2f9f..dd42ad32f546ffafdd82fd00be9458484443d4c1 100644 (file)
--- a/magick/histogram.c
+++ b/magick/histogram.c
@@ -987,7 +987,8 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image,
   const ChannelType channel,const double black_value,const double white_value)
 {
   double
-    min,max;
+    min,
+    max;
 
   MagickStatusType
     status;
@@ -1001,9 +1002,9 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image,
       (void) GetImageChannelRange(image,channel,&min,&max,&image->exception);
       min+=black_value;
       max-=white_value;
-      if ( fabs(min-max) >= MagickEpsilon )
-        status = LevelImageChannel(image,channel,min,max,1.0);
-      return(status);
+      if (fabs(min-max) >= MagickEpsilon)
+        status&=LevelImageChannel(image,channel,min,max,1.0);
+      return(status != 0 ? MagickTrue : MagickFalse);
     }
   /*
     Auto-level each channel separately.
@@ -1013,7 +1014,7 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image,
       (void) GetImageChannelRange(image,RedChannel,&min,&max,&image->exception);
       min+=black_value;
       max-=white_value;
-      if ( fabs(min-max) >= MagickEpsilon )
+      if (fabs(min-max) >= MagickEpsilon)
         status&=LevelImageChannel(image,RedChannel,min,max,1.0);
     }
   if ((channel & GreenChannel) != 0)
@@ -1022,7 +1023,7 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image,
         &image->exception);
       min+=black_value;
       max-=white_value;
-      if ( fabs(min-max) >= MagickEpsilon )
+      if (fabs(min-max) >= MagickEpsilon)
         status&=LevelImageChannel(image,GreenChannel,min,max,1.0);
     }
   if ((channel & BlueChannel) != 0)
@@ -1031,7 +1032,7 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image,
         &image->exception);
       min+=black_value;
       max-=white_value;
-      if ( fabs(min-max) >= MagickEpsilon )
+      if (fabs(min-max) >= MagickEpsilon)
         status&=LevelImageChannel(image,BlueChannel,min,max,1.0);
     }
   if (((channel & OpacityChannel) != 0) &&
@@ -1041,7 +1042,7 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image,
         &image->exception);
       min+=black_value;
       max-=white_value;
-      if ( fabs(min-max) >= MagickEpsilon )
+      if (fabs(min-max) >= MagickEpsilon)
         status&=LevelImageChannel(image,OpacityChannel,min,max,1.0);
     }
   if (((channel & IndexChannel) != 0) &&
@@ -1051,10 +1052,10 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image,
         &image->exception);
       min+=black_value;
       max-=white_value;
-      if ( fabs(min-max) >= MagickEpsilon )
+      if (fabs(min-max) >= MagickEpsilon)
         status&=LevelImageChannel(image,IndexChannel,min,max,1.0);
     }
-  return(status);
+  return(status != 0 ? MagickTrue : MagickFalse);
 }
 \f
 /*

diff --git a/magick/image.c b/magick/image.c
index 5e26c06932e6d0cedd52e00a734d6dfcd956ce58..a5f9b69bb380d30dc7a3431db1446de6a376907f 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -3964,6 +3964,9 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
   MagickStatusType
     flags;
 
+  ResolutionType
+    units;
+
   /*
     Sync image options.
   */
@@ -4155,16 +4158,18 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
       option);
   option=GetImageOption(image_info,"units");
   if (option != (const char *) NULL)
-    image->units=(ResolutionType) ParseMagickOption(MagickResolutionOptions,
+    units=(ResolutionType) ParseMagickOption(MagickResolutionOptions,
       MagickFalse,option);
-  if (image_info->units != UndefinedResolution)
+  else
+    units = image_info->units;
+  if (units != UndefinedResolution)
     {
-      if (image->units != image_info->units)
+      if (image->units != units)
         switch (image->units)
         {
           case PixelsPerInchResolution:
           {
-            if (image_info->units == PixelsPerCentimeterResolution)
+            if (units == PixelsPerCentimeterResolution)
               {
                 image->x_resolution/=2.54;
                 image->y_resolution/=2.54;
@@ -4173,7 +4178,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
           }
           case PixelsPerCentimeterResolution:
           {
-            if (image_info->units == PixelsPerInchResolution)
+            if (units == PixelsPerInchResolution)
               {
                 image->x_resolution*=2.54;
                 image->y_resolution*=2.54;
@@ -4183,7 +4188,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
           default:
             break;
         }
-      image->units=image_info->units;
+      image->units=units;
     }
   option=GetImageOption(image_info,"white-point");
   if (option != (const char *) NULL)

diff --git a/magick/magick-config.h b/magick/magick-config.h
index 3771119b4b33be7c6635a55d895db18c96b84adf..39804ba40f331e93bc2d74f8ce11b2a8c5602de6 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -472,9 +472,7 @@
 #endif
 
 /* Define to 1 if you have a working `mmap' system call. */
-#ifndef MAGICKCORE_HAVE_MMAP_FILEIO 
-#define MAGICKCORE_HAVE_MMAP_FILEIO  1 
-#endif
+/* #undef HAVE_MMAP_FILEIO */
 
 /* Define to 1 if you have the `munmap' function. */
 #ifndef MAGICKCORE_HAVE_MUNMAP 
@@ -966,9 +964,7 @@
 #endif
 
 /* Define to 1 if the system has the type `_Bool'. */
-#ifndef MAGICKCORE_HAVE__BOOL 
-#define MAGICKCORE_HAVE__BOOL  1 
-#endif
+/* #undef HAVE__BOOL */
 
 /* Define to 1 if you have the `_exit' function. */
 #ifndef MAGICKCORE_HAVE__EXIT 
@@ -1034,9 +1030,7 @@
 /* #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 */
@@ -1319,9 +1313,7 @@
 #endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
-#ifndef MAGICKCORE__FILE_OFFSET_BITS 
-#define MAGICKCORE__FILE_OFFSET_BITS  64 
-#endif
+/* #undef _FILE_OFFSET_BITS */
 
 /* enable run-time bounds-checking */
 /* #undef _FORTIFY_SOURCE */

diff --git a/magick/morphology.c b/magick/morphology.c
index 3edf892d7c6fdbd9493abc8519460fc22ac65412..36f2a7d6c44f5884ac3df14e6647c8613531c382 100644 (file)
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -954,25 +954,21 @@ MagickExport KernelInfo *CloneKernelInfo(const KernelInfo *kernel)
   register long
     i;
 
-  KernelInfo *
-    new;
+  KernelInfo
+    *kernel_info;
 
   assert(kernel != (KernelInfo *) NULL);
-
-  new=(KernelInfo *) AcquireMagickMemory(sizeof(*kernel));
-  if (new == (KernelInfo *) NULL)
-    return(new);
-  *new = *kernel; /* copy values in structure */
-
-  new->values=(double *) AcquireQuantumMemory(kernel->width,
-                              kernel->height*sizeof(double));
-  if (new->values == (double *) NULL)
-    return(DestroyKernelInfo(new));
-
+  kernel_info=(KernelInfo *) AcquireMagickMemory(sizeof(*kernel));
+  if (kernel_info == (KernelInfo *) NULL)
+    return(kernel_info);
+  *kernel_info=(*kernel); /* copy values in structure */
+  kernel_info->values=(double *) AcquireQuantumMemory(kernel->width,
+    kernel->height*sizeof(double));
+  if (kernel_info->values == (double *) NULL)
+    return(DestroyKernelInfo(kernel_info));
   for (i=0; i < (long) (kernel->width*kernel->height); i++)
-    new->values[i] = kernel->values[i];
-
-  return(new);
+    kernel_info->values[i]=kernel->values[i];
+  return(kernel_info);
 }
 \f
 /*
@@ -1678,7 +1674,7 @@ MagickExport Image *MorphologyImageChannel(const Image *image,
       */
       artifact = GetImageArtifact(image,"convolve:scale");
       if ( artifact != (char *)NULL ) {
-        MagickStatusType
+        GeometryFlags
           flags;
         GeometryInfo
           args;
@@ -1687,7 +1683,7 @@ MagickExport Image *MorphologyImageChannel(const Image *image,
           curr_kernel = CloneKernelInfo(kernel);
 
         args.rho = 1.0;
-        flags = ParseGeometry(artifact, &args);
+        flags = (GeometryFlags) ParseGeometry(artifact, &args);
         ScaleKernelInfo(curr_kernel, args.rho, flags);
       }
       /* FALL-THRU to do the first, and typically the only iteration */

diff --git a/magick/resize.c b/magick/resize.c
index e59f8677878a708c1f657ae1cdda89bd9395aadf..6fa1914890e1d51153ced71f32c034eff5006cfe 100644 (file)
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -697,10 +697,7 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
           if ((UndefinedFilter < option) && (option < SentinelFilter))
             {
               option=cylindrical != MagickFalse ? BesselFilter : SincFilter;
-              if (option != LanczosFilter)
-                window_type=(FilterTypes) option;
-              else
-                window_type=option;
+              window_type=(FilterTypes) option;
             }
         }
     }

diff --git a/magick/version.h b/magick/version.h
index c413679a9dc724800824750ae07f6ffbd5b35183..1a66f5d5f46b51386c9f1f2d91663ee5d228b1be 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,7 +33,7 @@ extern "C" {
 #define MagickLibAddendum  "-5"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
-#define MagickReleaseDate  "2010-04-17"
+#define MagickReleaseDate  "2010-04-23"
 #define MagickChangeDate   "20100417"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.1/index.html"

diff --git a/wand/Wand-config b/wand/Wand-config
index 61d7a3483e7aea7433d8c2d6bac1f1389ad14ef5..15baea635bcdbad527c3141ebe814fb11a340e49 100755 (executable)
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread "
       ;;
     *)
       echo "${usage}" 1>&2