(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index b75c549e7bae96bded718bc1236d5db533dc12e1..353045a182f127ec99592b0af1b227b1dc5600e1 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9117:9136M"
+#define MagickSVNRevision  "9117:9197M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-08-28"
+#define MagickReleaseDate  "2012-09-01"
 #define MagickChangeDate   "20120808"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index cda53053785f65a261598128d7010f4515f23476..094afeebdb6d8309de96ee57159accbed8dea4f0 100644 (file)
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
     <name>ImageMagick</name>
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-08-28</created>
+    <created>2012-09-01</created>
 
     <description xml:lang="en">
 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
@@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line
     <release>
       <Version>
           <name>stable</name>
-          <created>2012-08-28</created>
+          <created>2012-09-01</created>
           <revision>7.0.0</revision>
           <patch-level>-0</patch-level>
       </Version>

diff --git a/config/configure.xml b/config/configure.xml
index 010f87d1b8545c1707844eb89150848e7e8a43ba..679e417baf3b39976545a504d8757c368812b619 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="9117:9136M" />
-  <configure name="RELEASE_DATE" value="2012-08-28"/>
+  <configure name="SVN_REVISION" value="9117:9197M" />
+  <configure name="RELEASE_DATE" value="2012-09-01"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 2100401bebe5c792a6b67ecdb1cebd411d1f5d4b..8bd08682278f948cbb7d8b856d6275ef4069d8e0 100755 (executable)
--- a/configure
+++ b/configure
@@ -3666,7 +3666,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=9117:9136M
+MAGICK_SVN_REVISION=9117:9197M
 
 
 

diff --git a/configure.ac b/configure.ac
index 2a8d175e5f4953578540bf1f9bd71b5d7bd9dd2d..846b0c04acfa41f6e79f9e5dcab6b65fc1bfc438 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -135,7 +135,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl
 # Ensure that make can run correctly
 AM_SANITY_CHECK
 
-AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip])
+AM_INIT_AUTOMAKE([1.12 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip])
 
 # Enable support for silent build rules
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

diff --git a/m4/ax_opencl.m4 b/m4/ax_opencl.m4
index 28c17a76279a4ea1d427d7eee5fde34512c8c8f6..bd3fd6df90344fdf20576ab81b84e2d76a4e1c38 100644 (file)
--- a/m4/ax_opencl.m4
+++ b/m4/ax_opencl.m4
@@ -40,12 +40,12 @@ AC_REQUIRE([AC_PROG_SED])dnl
 AC_REQUIRE([ACX_PTHREAD])dnl
 
 AC_ARG_ENABLE([opencl],
-    [AC_HELP_STRING([--disable-opencl],
-                    [do not use OpenCL])],
-    [disable_opencl=$enableval],
-    [disable_opencl='yes'])
+    [AC_HELP_STRING([--enable-opencl],
+                    [enable OpenCL support])],
+    [enable_opencl=$enableval],
+    [enable_opencl='no'])
 
-if test "$disable_opencl" = 'yes'; then
+if test "$enable_opencl" = 'yes'; then
   AC_LANG_PUSH([$1])
   AX_LANG_COMPILER_MS
   AS_IF([test X$ax_compiler_ms = Xno],