(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index d94577c594760a390cfd782fe3446c61669bd392..5df69c20a20859aa834d9b84c12c93e208d2eff4 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "12978:12983M"
+#define MagickSVNRevision  "13015:13034M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -39,7 +39,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  2
 #define MagickppLibMinInterface  2
-#define MagickReleaseDate  "2013-08-10"
+#define MagickReleaseDate  "2013-08-17"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/configure b/configure
index fe6117da8c14d7685f4a4e74b1c615a6d73f7a1f..0e424013c712c3e465fb27c7ae5f4f37bc234be2 100755 (executable)
--- a/configure
+++ b/configure
@@ -3693,7 +3693,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=12978:12983M
+MAGICK_SVN_REVISION=13015:13034M
 
 
 # Substitute library versioning
@@ -10113,6 +10113,9 @@ $as_echo "$ax_cv_c_compiler_ms" >&6; }
 fi
 
   ax_save_CPPFLAGS=$CPPFLAGS
+  ax_save_CL_CFLAGS=$CL_CFLAGS
+
+  found_opencl_header='no'
   CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
   for ac_header in CL/cl.h OpenCL/cl.h
 do :
@@ -10122,12 +10125,40 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
+ found_opencl_header='yes'
+                    break;
+else
+  found_opencl_header='no'
+fi
+
+done
+
 
+  if test X$found_opencl_header = Xno; then :
+  { ac_cv_header_CL_cl_h=; unset ac_cv_header_CL_cl_h;}
+         { ac_cv_header_OpenCL_cl_h=; unset ac_cv_header_OpenCL_cl_h;}
+         CL_CFLAGS="-I$AMDAPPSDKROOT/include"
+         CPPFLAGS="$ax_save_CPPFLAGS $CL_CFLAGS"
+         for ac_header in CL/cl.h OpenCL/cl.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ found_opencl_header='yes'
+                           break;
+else
+  found_opencl_header='no'
 fi
 
 done
 
-  CPPFLAGS=$ax_save_CPPFLAGS
+
+fi
+
+  CPPFLAGS="$ax_save_CPPFLAGS"
 
   for ac_header in windows.h
 do :
@@ -10151,8 +10182,12 @@ if ${ax_cv_check_cl_libcl+:} false; then :
 else
   ax_cv_check_cl_libcl=no
   case $host_cpu in
-    x86_64) ax_check_cl_libdir=lib64 ;;
-    *)      ax_check_cl_libdir=lib ;;
+    x86_64) ax_check_cl_libdir=lib64
+            ax_check_cl_amd_libdir=x86_64
+           ;;
+    *)      ax_check_cl_libdir=lib
+            ax_check_cl_amd_libdir=x86
+            ;;
   esac
   ax_save_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
@@ -10239,6 +10274,37 @@ clCreateContextFromType(0,0,0,0,0)
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_dylib_flag"; break
+else
+  ax_check_cl_amd_flags="-L$AMDAPPSDKROOT/lib/$ax_check_cl_amd_libdir" LIBS="$ax_try_lib $ax_check_cl_amd_flags $CL_LIBS $ax_save_LIBS"
+                                                                                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  # if defined(HAVE_WINDOWS_H) && defined(_WIN32)
+  #   include <windows.h>
+  # endif
+  # ifdef HAVE_CL_CL_H
+  #   include <CL/cl.h>
+  # elif defined(HAVE_OPENCL_CL_H)
+  #   include <OpenCL/cl.h>
+  # else
+  #   error no CL.h
+  # endif
+int
+main ()
+{
+clCreateContextFromType(0,0,0,0,0)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_amd_flags"; break
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -10305,6 +10371,7 @@ fi
 
 
 CFLAGS="$CL_CFLAGS $CFLAGS"
+CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
 LIBS="$CL_LIBS $LIBS"
 
 if test "$enable_opencl" != no; then
@@ -25964,7 +26031,7 @@ if test "$enable_delegate_build" != 'no'; then
     # Most delegates have includes in the same directory as the library, but not all...
     #
     # Includes
-    for dir in bzlib fftw mupdf fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do
+    for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick mupdf png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do
         if test -d "$builddir/$dir"; then
             CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
         else
@@ -25975,7 +26042,7 @@ if test "$enable_delegate_build" != 'no'; then
     done
 
     # Libraries
-    for dir in bzlib mupdf fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
+    for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick mupdf png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
     if test -d "$builddir/$dir/.libs"; then
         LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
     else

diff --git a/configure.ac b/configure.ac
index aeb659edd228f46e9a6c74aed5e4c430ffa085ca..1f8209cbd878e8b1027ef1b12853dbf3f02ffd12 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -517,6 +517,7 @@ fi
 # Enable support for OpenCL
 AX_OPENCL([C])
 CFLAGS="$CL_CFLAGS $CFLAGS"
+CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
 LIBS="$CL_LIBS $LIBS"
 AC_SUBST(CL_CFLAGS)
 if test "$enable_opencl" != no; then

diff --git a/m4/ax_opencl.m4 b/m4/ax_opencl.m4
index bd3fd6df90344fdf20576ab81b84e2d76a4e1c38..834b618008a8df2ecdae9464e2940d757bd40770 100644 (file)
--- a/m4/ax_opencl.m4
+++ b/m4/ax_opencl.m4
@@ -52,9 +52,28 @@ if test "$enable_opencl" = 'yes'; then
         [CL_CFLAGS="${PTHREAD_CFLAGS}"; CL_LIBS="${PTHREAD_LIBS} -lm"])
   
   ax_save_CPPFLAGS=$CPPFLAGS
+  ax_save_CL_CFLAGS=$CL_CFLAGS
+
+  found_opencl_header='no'
   CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
-  AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h])
-  CPPFLAGS=$ax_save_CPPFLAGS
+  AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h],
+                   [found_opencl_header='yes'
+                    break;],
+                   [found_opencl_header='no'])
+
+  AS_IF([test X$found_opencl_header = Xno],
+        [AS_UNSET([ac_cv_header_CL_cl_h])
+         AS_UNSET([ac_cv_header_OpenCL_cl_h])
+         CL_CFLAGS="-I$AMDAPPSDKROOT/include"
+         CPPFLAGS="$ax_save_CPPFLAGS $CL_CFLAGS"
+         AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h],
+                          [found_opencl_header='yes'
+                           break;],
+                          [found_opencl_header='no'])
+        ],
+        [])
+
+  CPPFLAGS="$ax_save_CPPFLAGS"
   
   AC_CHECK_HEADERS([windows.h])
   
@@ -75,8 +94,12 @@ if test "$enable_opencl" = 'yes'; then
   AC_CACHE_CHECK([for OpenCL library], [ax_cv_check_cl_libcl],
   [ax_cv_check_cl_libcl=no
   case $host_cpu in
-    x86_64) ax_check_cl_libdir=lib64 ;;
-    *)      ax_check_cl_libdir=lib ;;
+    x86_64) ax_check_cl_libdir=lib64
+            ax_check_cl_amd_libdir=x86_64 
+           ;;
+    *)      ax_check_cl_libdir=lib
+            ax_check_cl_amd_libdir=x86 
+            ;;
   esac
   ax_save_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
@@ -95,7 +118,13 @@ if test "$enable_opencl" = 'yes'; then
                                 [ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_nvidia_flags"; break],
                                 [ax_check_cl_dylib_flag='-Wl,-framework,OpenCL -L/System/Library/Frameworks/OpenCL.framework/Versions/A/Libraries' LIBS="$ax_try_lib $ax_check_cl_dylib_flag $CL_LIBS $ax_save_LIBS"
                                 AC_LINK_IFELSE([AX_OPENCL_PROGRAM],
-                                               [ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_dylib_flag"; break])])])
+                                               [ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_dylib_flag"; break],
+                                                                                  [ax_check_cl_amd_flags="-L$AMDAPPSDKROOT/lib/$ax_check_cl_amd_libdir" LIBS="$ax_try_lib $ax_check_cl_amd_flags $CL_LIBS $ax_save_LIBS"
+                                                                                  AC_LINK_IFELSE([AX_OPENCL_PROGRAM],
+                                                                                        [ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_amd_flags"; break]
+                                                                                                 )
+                                                                                  ]
+                                                                                  )])])
   done
   
   AS_IF([test "X$ax_cv_check_cl_libcl" = Xno],