(no commit message)

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 117f6ed28ce924a747a7f52a7248d845c0c95fee..605112ef22c60d46d3b373b23a76c323087dd2e5 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1663,8 +1663,9 @@ static const OptionInfo
     { "Compare", CompareValidate, UndefinedOptionFlag, MagickFalse },
     { "Composite", CompositeValidate, UndefinedOptionFlag, MagickFalse },
     { "Convert", ConvertValidate, UndefinedOptionFlag, MagickFalse },
-    { "FormatsInMemory", FormatsInMemoryValidate, UndefinedOptionFlag, MagickFalse },
-    { "FormatsOnDisk", FormatsOnDiskValidate, UndefinedOptionFlag, MagickFalse },
+    { "FormatsDisk", FormatsDiskValidate, UndefinedOptionFlag, MagickFalse },
+    { "FormatsMap", FormatsMapValidate, UndefinedOptionFlag, MagickFalse },
+    { "FormatsMemory", FormatsMemoryValidate, UndefinedOptionFlag, MagickFalse },
     { "Identify", IdentifyValidate, UndefinedOptionFlag, MagickFalse },
     { "ImportExport", ImportExportValidate, UndefinedOptionFlag, MagickFalse },
     { "Montage", MontageValidate, UndefinedOptionFlag, MagickFalse },

diff --git a/MagickCore/option.h b/MagickCore/option.h
index 84417b3db2e100d80063923d974c3337a5da2a97..7c64536fa4d389a83c4f9b473eb44532b066676a 100644 (file)
--- a/MagickCore/option.h
+++ b/MagickCore/option.h
@@ -107,12 +107,13 @@ typedef enum
   CompareValidate = 0x00002,
   CompositeValidate = 0x00004,
   ConvertValidate = 0x00008,
-  FormatsInMemoryValidate = 0x00010,
-  FormatsOnDiskValidate = 0x00020,
-  IdentifyValidate = 0x00040,
-  ImportExportValidate = 0x00080,
-  MontageValidate = 0x00100,
-  StreamValidate = 0x00200,
+  FormatsDiskValidate = 0x00010,
+  FormatsMapValidate = 0x00020,
+  FormatsMemoryValidate = 0x00040,
+  IdentifyValidate = 0x00080,
+  ImportExportValidate = 0x00100,
+  MontageValidate = 0x00200,
+  StreamValidate = 0x00400,
   AllValidate = 0x7fffffff
 } ValidateType;
 

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 404f0021ec356c407fb86430c5593835c4aa52d3..579fde23d93a1fcf0d75ee0054af645316f97744 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "12412:12419"
+#define MagickSVNRevision  "12412:12442M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  1
 #define MagickLibMinInterface  1
-#define MagickReleaseDate  "2013-06-05"
+#define MagickReleaseDate  "2013-06-12"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/Makefile.in b/Makefile.in
index 7ad6fecc6681ca9d9456572d981fb81d8755fb07..8422e9604c5e9a51f7e8c27da64b8c14df439d8e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4971,12 +4971,13 @@ TESTS_TESTS = \
        tests/validate-compare.tap \
        tests/validate-composite.tap \
        tests/validate-convert.tap \
+       tests/validate-formats-disk.tap \
+       tests/validate-formats-map.tap \
+       tests/validate-formats-memory.tap \
        tests/validate-identify.tap \
        tests/validate-import.tap \
        tests/validate-montage.tap \
        tests/validate-stream.tap \
-       tests/validate-formats-in-memory.tap \
-       tests/validate-formats-on-disk.tap \
        tests/drawtest.tap \
        tests/wandtest.tap
 

diff --git a/configure b/configure
index 681af43dfaa0bf2bb67288648a47aac0e851bcf0..15ec85fe530096454e51cd8e4f4d8a511b5ef527 100755 (executable)
--- a/configure
+++ b/configure
@@ -3679,7 +3679,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=12412:12419
+MAGICK_SVN_REVISION=12412:12442M
 
 
 # Substitute library versioning

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f3692c2518b2dd017d7a0bfb62b0e53ee5a3af98..db362690708f400067d02eb40013d320ecee343c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -40,12 +40,13 @@ TESTS_TESTS = \
        tests/validate-compare.tap \
        tests/validate-composite.tap \
        tests/validate-convert.tap \
+       tests/validate-formats-disk.tap \
+       tests/validate-formats-map.tap \
+       tests/validate-formats-memory.tap \
        tests/validate-identify.tap \
        tests/validate-import.tap \
        tests/validate-montage.tap \
        tests/validate-stream.tap \
-       tests/validate-formats-in-memory.tap \
-       tests/validate-formats-on-disk.tap \
        tests/drawtest.tap \
        tests/wandtest.tap
 

diff --git a/tests/validate-formats-on-disk.tap b/tests/validate-formats-disk.tap
similarity index 91%
rename from tests/validate-formats-on-disk.tap
rename to tests/validate-formats-disk.tap
index b588aeb659069c03ce81843b2d8089169fff43f9..6db19a295ef1a1ed2d6a528410723770d06b91dd 100755 (executable)
--- a/tests/validate-formats-on-disk.tap
+++ b/tests/validate-formats-disk.tap
@@ -20,5 +20,5 @@
 . ${srcdir}/tests/common.shi
 echo "1..1"
 
-${VALIDATE} -validate formats-on-disk && echo "ok" || echo "not ok"
+${VALIDATE} -validate formats-disk && echo "ok" || echo "not ok"
 :

diff --git a/tests/validate-formats-in-memory.tap b/tests/validate-formats-memory.tap
similarity index 91%
rename from tests/validate-formats-in-memory.tap
rename to tests/validate-formats-memory.tap
index 94434555cd283f96ff9a1337e8e2b282f1155885..1917adfba972bf987808543e4183337081e6ffdc 100755 (executable)
--- a/tests/validate-formats-in-memory.tap
+++ b/tests/validate-formats-memory.tap
@@ -20,5 +20,5 @@
 . ${srcdir}/tests/common.shi
 echo "1..1"
 
-${VALIDATE} -validate formats-in-memory && echo "ok" || echo "not ok"
+${VALIDATE} -validate formats-memory && echo "ok" || echo "not ok"
 :

diff --git a/tests/validate.c b/tests/validate.c
index 3497990fd51971135fd32d1ca27b4dde9f20991f..3d3fc32f3cbcab42016b0887e386716e1b8daa31 100644 (file)
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -2699,37 +2699,38 @@ int main(int argc,char **argv)
           if ((type & ConvertValidate) != 0)
             tests+=ValidateConvertCommand(image_info,reference_filename,
               output_filename,&fail,exception);
-          if ((type & FormatsInMemoryValidate) != 0)
+          if ((type & FormatsDiskValidate) != 0)
             {
-              (void) FormatLocaleFile(stdout,"[pixel-cache: memory] ");
-              tests+=ValidateImageFormatsInMemory(image_info,reference_filename,
-                output_filename,&fail,exception);
-              (void) FormatLocaleFile(stdout,"[pixel-cache: memory-mapped] ");
               memory_resource=SetMagickResourceLimit(MemoryResource,0);
+              map_resource=SetMagickResourceLimit(MapResource,0);
+              (void) FormatLocaleFile(stdout,"[pixel-cache: disk] ");
               tests+=ValidateImageFormatsInMemory(image_info,reference_filename,
                 output_filename,&fail,exception);
               (void) FormatLocaleFile(stdout,"[pixel-cache: disk] ");
-              map_resource=SetMagickResourceLimit(MapResource,0);
-              tests+=ValidateImageFormatsInMemory(image_info,reference_filename,
+              tests+=ValidateImageFormatsOnDisk(image_info,reference_filename,
                 output_filename,&fail,exception);
               (void) SetMagickResourceLimit(MemoryResource,memory_resource);
               (void) SetMagickResourceLimit(MapResource,map_resource);
             }
-          if ((type & FormatsOnDiskValidate) != 0)
+          if ((type & FormatsMapValidate) != 0)
             {
-              (void) FormatLocaleFile(stdout,"[pixel-cache: memory] ");
-              tests+=ValidateImageFormatsOnDisk(image_info,reference_filename,
+              memory_resource=SetMagickResourceLimit(MemoryResource,0);
+              (void) FormatLocaleFile(stdout,"[pixel-cache: memory-mapped] ");
+              tests+=ValidateImageFormatsInMemory(image_info,reference_filename,
                 output_filename,&fail,exception);
               (void) FormatLocaleFile(stdout,"[pixel-cache: memory-mapped] ");
-              memory_resource=SetMagickResourceLimit(MemoryResource,0);
               tests+=ValidateImageFormatsOnDisk(image_info,reference_filename,
                 output_filename,&fail,exception);
-              (void) FormatLocaleFile(stdout,"[pixel-cache: disk] ");
-              map_resource=SetMagickResourceLimit(MapResource,0);
+              (void) SetMagickResourceLimit(MemoryResource,memory_resource);
+            }
+          if ((type & FormatsMemoryValidate) != 0)
+            {
+              (void) FormatLocaleFile(stdout,"[pixel-cache: memory] ");
+              tests+=ValidateImageFormatsInMemory(image_info,reference_filename,
+                output_filename,&fail,exception);
+              (void) FormatLocaleFile(stdout,"[pixel-cache: memory] ");
               tests+=ValidateImageFormatsOnDisk(image_info,reference_filename,
                 output_filename,&fail,exception);
-              (void) SetMagickResourceLimit(MemoryResource,memory_resource);
-              (void) SetMagickResourceLimit(MapResource,map_resource);
             }
           if ((type & IdentifyValidate) != 0)
             tests+=ValidateIdentifyCommand(image_info,reference_filename,