From: cristy Date: Thu, 13 Jun 2013 01:01:43 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~3602 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=247eebde3abe0b3cd9d9572e88a8ebef993f1ff5;p=imagemagick --- diff --git a/MagickCore/option.c b/MagickCore/option.c index 117f6ed28..605112ef2 100644 --- 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 84417b3db..7c64536fa 100644 --- 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 404f0021e..579fde23d 100644 --- 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 7ad6fecc6..8422e9604 100644 --- 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 681af43df..15ec85fe5 100755 --- 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 f3692c251..db3626907 100644 --- 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 b588aeb65..6db19a295 100755 --- 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 94434555c..1917adfba 100755 --- 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 3497990fd..3d3fc32f3 100644 --- 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,