diff --git a/MagickCore/version.h b/MagickCore/version.h
index 353045a..4ee4c78 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision "9117:9197M"
+#define MagickSVNRevision "9117:9208"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 7,0,0
diff --git a/coders/wmf.c b/coders/wmf.c
index 76314ba..9c424af 100644
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -2251,6 +2251,7 @@
*/
static float lite_font_stringwidth( wmfAPI* API, wmfFont* font, char* str)
{
+#if 0
wmf_magick_t
*ddata = WMF_MAGICK_GetData(API);
@@ -2315,6 +2316,13 @@
image->units = orig_resolution_units;
return stringwidth;
+#else
+ (void) API;
+ (void) font;
+ (void) str;
+
+ return 0;
+#endif
}
/* Map font (similar to wmf_ipa_font_map) */
diff --git a/config/configure.xml b/config/configure.xml
index 679e417..8f11c1b 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
<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:9197M" />
+ <configure name="SVN_REVISION" value="9117:9208" />
<configure name="RELEASE_DATE" value="2012-09-01"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
diff --git a/configure b/configure
index 8bd0868..55e3b6f 100755
--- a/configure
+++ b/configure
@@ -1854,7 +1854,7 @@
--enable-osx-universal-binary
build universal binary on OS X [[default=no]]
--disable-openmp do not use OpenMP
- --disable-opencl do not use OpenCL
+ --enable-opencl enable OpenCL support
--disable-largefile omit support for large files
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
@@ -3666,7 +3666,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=9117:9197M
+MAGICK_SVN_REVISION=9117:9208
@@ -9786,13 +9786,13 @@
# Check whether --enable-opencl was given.
if test "${enable_opencl+set}" = set; then :
- enableval=$enable_opencl; disable_opencl=$enableval
+ enableval=$enable_opencl; enable_opencl=$enableval
else
- disable_opencl='yes'
+ enable_opencl='no'
fi
-if test "$disable_opencl" = 'yes'; then
+if test "$enable_opencl" = 'yes'; then
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'