(no commit message)

diff --git a/configure b/configure
index 0e9fbf8cb2a0d527709e52fe68bb8655d21ae9ed..b644896cc9b0311ddf771de4594bb25ba4908049 100755 (executable)
--- a/configure
+++ b/configure
@@ -4387,7 +4387,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18759:18771M
+MAGICK_SVN_REVISION=18759:18773M
 
 
 # Substitute library versioning
@@ -35131,7 +35131,7 @@ fi
 #
 GSAlphaDevice=pngalpha
 GSColorDevice=pnmraw
-GSCMYKDevice=pam
+GSCMYKDevice=pamcmyk32
 GSMonoDevice=pbmraw
 GSPDFDevice=pdfwrite
 GSPSDevice=ps2write
@@ -35154,35 +35154,35 @@ $as_echo_n "checking for Ghostscript version... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSVersion" >&5
 $as_echo "$GSVersion" >&6; }
 
-    # GSAlphaDevice
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs alpha device" >&5
-$as_echo_n "checking for gs alpha device... " >&6; }
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
-        :
-    else
-        GSAlphaDevice=pnmraw
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSAlphaDevice" >&5
-$as_echo "$GSAlphaDevice" >&6; }
-
     # GSColorDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs color device" >&5
 $as_echo_n "checking for gs color device... " >&6; }
     if $PSDelegate -q -dBATCH -sDEVICE=$GSColorDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
-        GSColorDevice=pnmraw
+        GSColorDevice=ppmraw
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSColorDevice" >&5
 $as_echo "$GSColorDevice" >&6; }
 
+    # GSAlphaDevice
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs alpha device" >&5
+$as_echo_n "checking for gs alpha device... " >&6; }
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
+        :
+    else
+        GSAlphaDevice=$GSColorDevice
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSAlphaDevice" >&5
+$as_echo "$GSAlphaDevice" >&6; }
+
     # GSCMYKDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs CMYK device" >&5
 $as_echo_n "checking for gs CMYK device... " >&6; }
     if $PSDelegate -q -dBATCH -sDEVICE=$GSCMYKDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
-        GSCMYKDevice=bmpsep8
+        GSCMYKDevice=pam
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSCMYKDevice" >&5
 $as_echo "$GSCMYKDevice" >&6; }
@@ -35206,7 +35206,7 @@ $as_echo_n "checking for gs PDF writing device... " >&6; }
     else
         GSPDFDevice=nodevice
     fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSPDFDevice" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSPDFDevice" >&5
 $as_echo "$GSPDFDevice" >&6; }
 
     # GSPSDevice

diff --git a/configure.ac b/configure.ac
index 9a3604a9aa2e69b9b30db01ff5c99f160d790df8..2c72cfceb7b3bb276154a339b1732b9210da840d 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3403,7 +3403,7 @@ AC_SUBST(XPSVersion)
 #
 GSAlphaDevice=pngalpha
 GSColorDevice=pnmraw
-GSCMYKDevice=pam
+GSCMYKDevice=pamcmyk32
 GSMonoDevice=pbmraw
 GSPDFDevice=pdfwrite
 GSPSDevice=ps2write
@@ -3421,30 +3421,30 @@ if test $have_gs = 'yes'; then
     fi
     AC_MSG_RESULT([$GSVersion])
 
-    # GSAlphaDevice
-    AC_MSG_CHECKING([for gs alpha device])
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
-        :
-    else
-        GSAlphaDevice=pnmraw
-    fi
-    AC_MSG_RESULT([$GSAlphaDevice])
-
     # GSColorDevice
     AC_MSG_CHECKING([for gs color device])
     if $PSDelegate -q -dBATCH -sDEVICE=$GSColorDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
-        GSColorDevice=pnmraw
+        GSColorDevice=ppmraw
     fi
     AC_MSG_RESULT([$GSColorDevice])
 
+    # GSAlphaDevice
+    AC_MSG_CHECKING([for gs alpha device])
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
+        :
+    else
+        GSAlphaDevice=$GSColorDevice
+    fi
+    AC_MSG_RESULT([$GSAlphaDevice])
+
     # GSCMYKDevice
     AC_MSG_CHECKING([for gs CMYK device])
     if $PSDelegate -q -dBATCH -sDEVICE=$GSCMYKDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
-        GSCMYKDevice=bmpsep8
+        GSCMYKDevice=pam
     fi
     AC_MSG_RESULT([$GSCMYKDevice])
 
@@ -3464,7 +3464,7 @@ if test $have_gs = 'yes'; then
     else
         GSPDFDevice=nodevice
     fi
-        AC_MSG_RESULT([$GSPDFDevice])
+    AC_MSG_RESULT([$GSPDFDevice])
 
     # GSPSDevice
     AC_MSG_CHECKING([for gs PS writing device])