...
diff --git a/MagickCore/token.c b/MagickCore/token.c
index cb55449..48ee8f6 100644
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -501,38 +501,37 @@
done=MagickTrue;
break;
}
+ if (match != MagickFalse)
+ {
+ expression=p;
+ while ((GetUTFCode(pattern) != '}') &&
+ (GetUTFCode(pattern) != 0))
+ {
+ pattern+=GetUTFOctets(pattern);
+ if (GetUTFCode(pattern) == '\\')
+ {
+ pattern+=GetUTFOctets(pattern);
+ if (GetUTFCode(pattern) == '}')
+ pattern+=GetUTFOctets(pattern);
+ }
+ }
+ }
else
- if (match != MagickFalse)
+ {
+ while ((GetUTFCode(pattern) != '}') &&
+ (GetUTFCode(pattern) != ',') &&
+ (GetUTFCode(pattern) != 0))
{
- expression=p;
- while ((GetUTFCode(pattern) != '}') &&
- (GetUTFCode(pattern) != 0))
- {
- pattern+=GetUTFOctets(pattern);
- if (GetUTFCode(pattern) == '\\')
- {
+ pattern+=GetUTFOctets(pattern);
+ if (GetUTFCode(pattern) == '\\')
+ {
+ pattern+=GetUTFOctets(pattern);
+ if ((GetUTFCode(pattern) == '}') ||
+ (GetUTFCode(pattern) == ','))
pattern+=GetUTFOctets(pattern);
- if (GetUTFCode(pattern) == '}')
- pattern+=GetUTFOctets(pattern);
- }
- }
+ }
}
- else
- {
- while ((GetUTFCode(pattern) != '}') &&
- (GetUTFCode(pattern) != ',') &&
- (GetUTFCode(pattern) != 0))
- {
- pattern+=GetUTFOctets(pattern);
- if (GetUTFCode(pattern) == '\\')
- {
- pattern+=GetUTFOctets(pattern);
- if ((GetUTFCode(pattern) == '}') ||
- (GetUTFCode(pattern) == ','))
- pattern+=GetUTFOctets(pattern);
- }
- }
- }
+ }
if (GetUTFCode(pattern) != 0)
pattern+=GetUTFOctets(pattern);
}
diff --git a/configure b/configure
index e3cefc3..b9327da 100755
--- a/configure
+++ b/configure
@@ -4517,7 +4517,7 @@
MAGICK_VERSION=7.0.2-8
-MAGICK_GIT_REVISION=18674:d67c907:20160806
+MAGICK_GIT_REVISION=18675:c1c7fb4:20160807
# Substitute library versioning
@@ -28894,6 +28894,51 @@
fi
fi
+ # Clang (passes for GCC but uses different OpenMP implementation)
+ if test "x$LIB_OMP" = x ; then
+ if $CC --version 2>&1 | grep clang > /dev/null ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOMP_parallel_start in -lomp" >&5
+$as_echo_n "checking for GOMP_parallel_start in -lomp... " >&6; }
+if ${ac_cv_lib_omp_GOMP_parallel_start+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lomp $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char GOMP_parallel_start ();
+int
+main ()
+{
+return GOMP_parallel_start ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_omp_GOMP_parallel_start=yes
+else
+ ac_cv_lib_omp_GOMP_parallel_start=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_omp_GOMP_parallel_start" >&5
+$as_echo "$ac_cv_lib_omp_GOMP_parallel_start" >&6; }
+if test "x$ac_cv_lib_omp_GOMP_parallel_start" = xyes; then :
+ LIB_OMP="-lomp"
+fi
+
+ fi
+ fi
# GCC
if test "x$GOMP_LIBS" = x ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOMP_parallel_start in -lgomp" >&5
diff --git a/configure.ac b/configure.ac
index 3c3a228..3fb79c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1409,6 +1409,12 @@
AC_CHECK_LIB(openmp,omp_get_num_procs,GOMP_LIBS="-lopenmp",,)
fi
fi
+ # Clang (passes for GCC but uses different OpenMP implementation)
+ if test "x$LIB_OMP" = x ; then
+ if $CC --version 2>&1 | grep clang > /dev/null ; then
+ AC_CHECK_LIB(omp,GOMP_parallel_start,LIB_OMP="-lomp",,)
+ fi
+ fi
# GCC
if test "x$GOMP_LIBS" = x ; then
AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,)