(no commit message)

diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c
index 9ad798a41159ba044fceaaca65b3f48dabfa6524..a2adb0f7c23eb766b20df42478680c0bae378c96 100644 (file)
--- a/MagickCore/fourier.c
+++ b/MagickCore/fourier.c
@@ -286,10 +286,22 @@ MagickExport Image *ComplexImages(const Image *images,
             Ci[i]=gamma*(Ai[i]*Br[i]-Ai[i]*Bi[i]);
             break;
           }
+          case MagnitudePhaseComplexOperator:
+          {
+            Cr[i]=(Ar[i]*Br[i]-Ai[i]*Bi[i]);
+            Ci[i]=(Ai[i]*Br[i]+Ar[i]*Bi[i]);
+            break;
+          }
           case MultiplyComplexOperator:
           {
-            Cr[i]=(Ar[i]*Br[i]+Ai[i]*Bi[i]);
-            Ci[i]=(Ai[i]*Br[i]-Ai[i]*Bi[i]);
+            Cr[i]=(Ar[i]*Br[i]-Ai[i]*Bi[i]);
+            Ci[i]=(Ai[i]*Br[i]+Ar[i]*Bi[i]);
+            break;
+          }
+          case RealImaginaryComplexOperator:
+          {
+            Cr[i]=(Ar[i]*Br[i]-Ai[i]*Bi[i]);
+            Ci[i]=(Ai[i]*Br[i]+Ar[i]*Bi[i]);
             break;
           }
           case SubtractComplexOperator:

diff --git a/MagickCore/fourier.h b/MagickCore/fourier.h
index e0cca4fddb00893713cd42b62d23fb4afba848a6..90434407141213f92bf8645c8cbb1b7dd1c6c17f 100644 (file)
--- a/MagickCore/fourier.h
+++ b/MagickCore/fourier.h
@@ -28,7 +28,9 @@ typedef enum
   AddComplexOperator,
   ConjugateComplexOperator,
   DivideComplexOperator,
+  MagnitudePhaseComplexOperator,
   MultiplyComplexOperator,
+  RealImaginaryComplexOperator,
   SubtractComplexOperator
 } ComplexOperator;
 

diff --git a/MagickCore/option.c b/MagickCore/option.c
index ee1355249929076e9566740fc0e101e9e3837467..9138de0734a58a29d8df5185cb7cccfa49a2ba05 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -926,7 +926,9 @@ static const OptionInfo
     { "Add", AddComplexOperator, UndefinedOptionFlag, MagickFalse },
     { "Conjugate", ConjugateComplexOperator, UndefinedOptionFlag, MagickFalse },
     { "Divide", DivideComplexOperator, UndefinedOptionFlag, MagickFalse },
+    { "MagnitudePhase", MagnitudePhaseComplexOperator, UndefinedOptionFlag, MagickFalse },
     { "Multiply", MultiplyComplexOperator, UndefinedOptionFlag, MagickFalse },
+    { "RealImaginary", RealImaginaryComplexOperator, UndefinedOptionFlag, MagickFalse },
     { "Subtract", SubtractComplexOperator, UndefinedOptionFlag, MagickFalse },
     { (char *) NULL, UndefinedComplexOperator, UndefinedOptionFlag, MagickFalse }
   },

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 145e7c35eff703632baf6b494db7fd5d67d5d9a1..3ad8ff7d5520eb9d8717dbb1c45ce2812e9e32cc 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  "13208:13229"
+#define MagickSVNRevision  "13384:13388M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -39,11 +39,11 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2013-10-05"
+#define MagickReleaseDate  "2013-10-06"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"
-#define MagickDelegates "bzlib djvu fftw fpx fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff webp x xml zlib"
+#define MagickDelegates "bzlib djvu mpeg fftw fpx fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff webp x xml zlib"
 #define MagickHomeURL  "file:///usr/share/doc/ImageMagick-7/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
 #define MagickQuantumDepth  "Q8"

diff --git a/MagickWand/mogrify-private.h b/MagickWand/mogrify-private.h
index 459c9ffd59fa14a536adad482d65632a89ec786f..016ab25d3b2afce7f29056bf80e7dcb9006fb7c6 100644 (file)
--- a/MagickWand/mogrify-private.h
+++ b/MagickWand/mogrify-private.h
@@ -52,9 +52,10 @@ extern "C" {
       else \
         if ((fire) != MagickFalse) \
           { \
-            status&=MogrifyImages(image_stack[k].image_info,postfix,(int) \
-              (i-j+1),(const char **) (argv+j),&image_stack[k].image, \
-              exception); \
+            if (status != 0) \
+              status&=MogrifyImages(image_stack[k].image_info,postfix,(int) \
+                (i-j+1),(const char **) (argv+j),&image_stack[k].image, \
+                exception); \
             image=image_stack[k].image; \
             if ((advance) != MagickFalse) \
               j=i+1; \

diff --git a/utilities/import.1 b/utilities/import.1
index b1f3f4141c9a7443ad62337c17a7a147f3bb535a..b08c988c534e2ec099e942da6a36a015c9db5903 100644 (file)
--- a/utilities/import.1
+++ b/utilities/import.1
@@ -39,7 +39,7 @@ Image Settings:
   \-limit type value    Area, Disk, Map, or Memory resource limit
   \-monitor             monitor progress
   \-page geometry       size and location of an image canvas
-  \-pause value         seconds delay between snapshots
+  \-pause seconds       seconds delay between snapshots
   \-pointsize value     font point size
   \-quality value       JPEG/MIFF/PNG compression level
   \-quiet               suppress all warning messages