(no commit message)

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index 917a32b52036e16b2d0c1e20f94053e1575b0942..341145e0f422438ea156abd809fe01a7b2dd2fba 100755 (executable)
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -43,7 +43,7 @@ while test $# -gt 0; do
       echo '6.6.4 Q16 '
       ;;
     --cflags)
-      echo "-I${includedir} -fopenmp"
+      echo "-I${includedir} "
       ;;
     --cxxflags)
       echo '-g -O2 -pthread'
@@ -55,7 +55,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 4d6ff497cbed0fc3985afced69749f7afe4474f0..c2a6b0401387d2ac2ffc11ceaa0c69c0ca219032 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -2294,9 +2294,11 @@ void Magick::Image::zoom( const Geometry &geometry_ )
   ExceptionInfo exceptionInfo;
   GetExceptionInfo( &exceptionInfo );
   MagickCore::Image* newImage =
-    ZoomImage( image(),
+    ResizeImage( image(),
                width,
                height,
+               image()->filter,
+               image()->blur,
                &exceptionInfo);
   replaceImage( newImage );
   throwException( exceptionInfo );
@@ -2370,26 +2372,20 @@ std::string Magick::Image::attribute ( const std::string name_ )
 }
 
 // Background color
-void Magick::Image::backgroundColor ( const Color &color_ )
+void Magick::Image::backgroundColor ( const Color &backgroundColor_ )
 {
   modifyImage();
 
-  if ( color_.isValid() )
+  if ( backgroundColor_.isValid() )
     {
-      image()->background_color.red   = color_.redQuantum();
-      image()->background_color.green = color_.greenQuantum();
-      image()->background_color.blue  = color_.blueQuantum();
-      image()->background_color.opacity  = color_.alphaQuantum();
+      image()->background_color = backgroundColor_;
     }
   else
     {
-      image()->background_color.red   = 0;
-      image()->background_color.green = 0;
-      image()->background_color.blue  = 0;
-      image()->background_color.opacity  = OpaqueOpacity;
+      image()->background_color = Color();
     }
 
-  options()->backgroundColor( color_ );
+  options()->backgroundColor( backgroundColor_ );
 }
 Magick::Color Magick::Image::backgroundColor ( void ) const
 {
@@ -2426,26 +2422,20 @@ size_t Magick::Image::baseRows ( void ) const
 }
 
 // Border color
-void Magick::Image::borderColor ( const Color &color_ )
+void Magick::Image::borderColor ( const Color &borderColor_ )
 {
   modifyImage();
 
-  if ( color_.isValid() )
+  if ( borderColor_.isValid() )
     {
-      image()->border_color.red   = color_.redQuantum();
-      image()->border_color.green = color_.greenQuantum();
-      image()->border_color.blue  = color_.blueQuantum();
-      image()->border_color.opacity  = color_.alphaQuantum();
+      image()->border_color = borderColor_;
     }
   else
     {
-      image()->border_color.red   = 0;
-      image()->border_color.green = 0;
-      image()->border_color.blue  = 0;
-      image()->border_color.opacity = OpaqueOpacity;
+      image()->border_color = Color();
     }
 
-  options()->borderColor( color_ );
+  options()->borderColor( borderColor_ );
 }
 Magick::Color Magick::Image::borderColor ( void ) const
 {
@@ -3251,22 +3241,14 @@ void Magick::Image::matteColor ( const Color &matteColor_ )
   
   if ( matteColor_.isValid() )
     {
-      image()->matte_color.red   = matteColor_.redQuantum();
-      image()->matte_color.green = matteColor_.greenQuantum();
-      image()->matte_color.blue  = matteColor_.blueQuantum();
-      image()->matte_color.opacity  = matteColor_.alphaQuantum();
-
-      options()->matteColor( matteColor_ ); 
+      image()->matte_color = matteColor_;
+      options()->matteColor( matteColor_ );
     }
   else
     {
       // Set to default matte color
       Color tmpColor( "#BDBDBD" );
-      image()->matte_color.red   = tmpColor.redQuantum();
-      image()->matte_color.green = tmpColor.greenQuantum();
-      image()->matte_color.blue  = tmpColor.blueQuantum();
-      image()->matte_color.opacity  = tmpColor.alphaQuantum();
-
+      image()->matte_color = tmpColor;
       options()->matteColor( tmpColor );
     }
 }
@@ -3274,8 +3256,7 @@ Magick::Color Magick::Image::matteColor ( void ) const
 {
   return Color( constImage()->matte_color.red,
                constImage()->matte_color.green,
-               constImage()->matte_color.blue,
-               constImage()->matte_color.opacity );
+               constImage()->matte_color.blue );
 }
 
 double Magick::Image::meanErrorPerPixel ( void ) const

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 8178f18c27b720511173ac307548c2ee7dc3c700..0211588c8127f83156826096af6ee1caf521e77f 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -140,7 +140,7 @@ foreach $delegate (qw/bzlib fontconfig freetype jpeg jng jp2 png tiff x11 xml zl
 # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
 my $INC_magick = '-I../ -I.. -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 -I"' . $Config{'usrinc'} . '/ImageMagick"';
 my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm';
-my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
+my $CCFLAGS_magick = "$Config{'ccflags'} -g -O2 -Wall -pthread";
 my $LDFLAGS_magick   = "-L../magick/.libs -lMagickCore $Config{'ldflags'} ";
 my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} ";
 
@@ -210,7 +210,7 @@ WriteMakefile
    # 'OPTIMIZE'        => '',
 
    # Use same compiler as ImageMagick
-   'PERLMAINCC'        => ' -fopenmp',
+   'PERLMAINCC'        => ' ',
 
    # Set Perl installation prefix to ImageMagick installation prefix
 #   'PREFIX'   => '/usr/local',

diff --git a/config/configure.xml b/config/configure.xml
index 911367714b533e5f13d38bb6903e75f9f1db0a82..fc71df2960db334b5d37b5320d9e645f65290a73 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,23 +9,23 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x664"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,4,1"/>
-  <configure name="RELEASE_DATE" value="2010-09-04"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="RELEASE_DATE" value="2010-09-09"/>
+  <configure name="CONFIGURE" value="./configure  '--disable-openmp'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.6.4"/>
   <configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>
-  <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -pthread"/>
+  <configure name="CFLAGS" value="-g -O2 -Wall -pthread"/>
   <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>
-  <configure name="PCFLAGS" value="-fopenmp"/>
+  <configure name="PCFLAGS" value=""/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib "/>
-  <configure name="LIBS" value="-lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
+  <configure name="LIBS" value="-lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lpthread -lltdl"/>
   <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"/>
   <configure name="HOST" value="x86_64-unknown-linux-gnu"/>
-  <configure name="FEATURES" value="OpenMP "/>
+  <configure name="FEATURES" value=""/>
   <configure name="DELEGATES" value="bzlib fontconfig freetype jpeg jng jp2 png tiff x11 xml zlib"/>
   <configure name="COPYRIGHT" value="Copyright (C) 1999-2010 ImageMagick Studio LLC"/>
   <configure name="WEBSITE" value="http://www.imagemagick.org"/>

diff --git a/configure b/configure
index 05484cab5d0221e2d75d240fa42ea741d603e224..d7e93aa8e5dfff6119b4069036900e33d5fd9fa1 100755 (executable)
--- a/configure
+++ b/configure
@@ -8505,12 +8505,11 @@ $as_echo "$ac_cv_prog_c_openmp" >&6; }
 CFLAGS="$OPENMP_CFLAGS $CFLAGS"
 MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
 
-case $ac_cv_prog_c_openmp in #(
-  "none needed" | unsupported)
-    ;; #(
-  *)
-  MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
-esac
+if test "$enable_openmp" != no; then
+  if test "$ac_cv_prog_c_openmp" != 'unsupported'; then
+    MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
+  fi
+fi
 
 # Enable support for OpenCL
 
@@ -9113,8 +9112,10 @@ fi
 CFLAGS="$CL_CFLAGS $CFLAGS"
 LIBS="$CL_LIBS $LIBS"
 
-if test "_OPENCL" = '1'; then
-  MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
+if test "$enable_opencl" != no; then
+  if test "_OPENCL" = '1'; then
+    MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
+  fi
 fi
 
 ########

diff --git a/configure.ac b/configure.ac
index 4d3ea71dc0cf852d41f91349af9a152a2a4bae8d..49c09ecf5ad784baefd89b73c7ffdd06ca358306 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -397,20 +397,21 @@ AC_OPENMP([C])
 CFLAGS="$OPENMP_CFLAGS $CFLAGS"
 MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
 AC_SUBST(OPENMP_CFLAGS)
-case $ac_cv_prog_c_openmp in #(
-  "none needed" | unsupported)
-    ;; #(
-  *)
-  MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
-esac
+if test "$enable_openmp" != no; then
+  if test "$ac_cv_prog_c_openmp" != 'unsupported'; then
+    MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
+  fi
+fi
 
 # Enable support for OpenCL
 AX_OPENCL([C])
 CFLAGS="$CL_CFLAGS $CFLAGS"
 LIBS="$CL_LIBS $LIBS"
 AC_SUBST(CL_CFLAGS)
-if test "_OPENCL" = '1'; then
-  MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
+if test "$enable_opencl" != no; then
+  if test "_OPENCL" = '1'; then
+    MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
+  fi
 fi
 
 ########

diff --git a/libtool b/libtool
index 2720f8f07b2d53da405e4001bf4dfb5b3843e6e7..950f5a4e7078bc25ec566fe81a0ab0ad33372650 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -144,7 +144,7 @@ lock_old_archive_extraction=no
 LTCC="gcc -std=gnu99 -std=gnu99"
 
 # LTCC compiler flags.
-LTCFLAGS="-fopenmp -g -O2 -Wall -pthread"
+LTCFLAGS="-g -O2 -Wall -pthread"
 
 # Take the output of nm and produce a listing of raw symbols and C names.
 global_symbol_pipe="sed -n -e 's/^.*[   ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[       ][      ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
@@ -9403,7 +9403,7 @@ compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.5.1 /usr/lib/gcc/x8
 predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.5.1/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.5.1/crtbeginS.o"
 postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.5.1/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.5.1/../../../../lib64/crtn.o"
 predeps=""
-postdeps="-lstdc++ -lm -lgomp -lgcc_s -lpthread -lc -lgcc_s"
+postdeps="-lstdc++ -lm -lgcc_s -lpthread -lc -lgcc_s"
 
 # The library search path used internally by the compiler when linking
 # a shared library.

diff --git a/magick/ImageMagick.pc b/magick/ImageMagick.pc
index 7f3df55c3d5abc11c53754fde27979ca68a018b2..e382aaca44000daceed0b1f0371f9925691c5eb4 100644 (file)
--- a/magick/ImageMagick.pc
+++ b/magick/ImageMagick.pc
@@ -7,4 +7,4 @@ Name: ImageMagick
 Description: ImageMagick - Convert, Edit, and Compose Images
 Version: 6.6.4
 Libs: -L${libdir} -lMagickCore
-Cflags: -I${includedir} -fopenmp
+Cflags: -I${includedir} 

diff --git a/magick/Magick-config b/magick/Magick-config
index ed474943cfce37d71316a80e9e70fca6e2c9b5bc..585a0d3963bb138dd3c9ac85a58297630e9aa1cb 100755 (executable)
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -40,7 +40,7 @@ while test $# -gt 0; do
       echo '6.6.4 Q16 '
       ;;
     --cflags)
-      echo "-I${includedir} -fopenmp"
+      echo "-I${includedir} "
       ;;
     --cxxflags)
       echo '-g -O2 -pthread'
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/magick/version.h b/magick/version.h
index 12c1a2e1558b894339878ad2f0434645c9974ec6..026366413dcbef4b5ae79e82277e0d1ff48283f6 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,10 +33,10 @@ extern "C" {
 #define MagickLibAddendum  "-1"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2010-09-04"
-#define MagickChangeDate   "20100902"
+#define MagickReleaseDate  "2010-09-09"
+#define MagickChangeDate   "20100909"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
-#define MagickFeatures  "OpenMP "
+#define MagickFeatures  ""
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.4/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
 #define MagickQuantumDepth  "Q8"

diff --git a/wand/Wand-config b/wand/Wand-config
index 47228f64d623d97efce88182e80f00ede5bb799f..c603b2723c5176c23d91fbcf50aeac75002a0adc 100755 (executable)
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -40,7 +40,7 @@ while test $# -gt 0; do
       echo '6.6.4 Q16 '
       ;;
     --cflags)
-      echo "-I${includedir} -fopenmp"
+      echo "-I${includedir} "
       ;;
     --cxxflags)
       echo '-g -O2 -pthread'
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/wand/Wand.pc b/wand/Wand.pc
index d72598a39d9a4f3b150921f0bb4c41e35ce4bea4..62f78841c3a981fcb5a72303b1fa74e2f8a108d4 100644 (file)
--- a/wand/Wand.pc
+++ b/wand/Wand.pc
@@ -8,4 +8,4 @@ Version: 6.6.4
 Description:  MagickWand - C API for ImageMagick
 Requires: ImageMagick
 Libs: -L${libdir} -lMagickWand -lMagickCore
-Cflags: -I${includedir} -fopenmp
+Cflags: -I${includedir}