From: cristy Date: Sat, 16 Oct 2010 16:49:53 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8676 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9a291985cb653d62a4e7c3b6aa3f9c4436d30eb;p=imagemagick --- diff --git a/config/configure.xml b/config/configure.xml index 50c7041d7..af8117a8f 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + diff --git a/config/delegates.xml b/config/delegates.xml index 8da9122e1..74b287de3 100644 --- a/config/delegates.xml +++ b/config/delegates.xml @@ -109,7 +109,7 @@ - + diff --git a/ltdl/ltdl.c b/ltdl/ltdl.c index 7c426351c..5313ed6e4 100644 --- a/ltdl/ltdl.c +++ b/ltdl/ltdl.c @@ -1511,7 +1511,7 @@ has_library_ext (const char *filename) assert (filename); - ext = strrchr (filename, '.'); + ext = (char *) strrchr (filename, '.'); if (ext && ((streq (ext, archive_ext)) #if defined(LT_MODULE_EXT) diff --git a/magick/image.c b/magick/image.c index 17e09bfec..a7652beb5 100644 --- a/magick/image.c +++ b/magick/image.c @@ -1489,6 +1489,9 @@ MagickExport void GetImageException(Image *image,ExceptionInfo *exception) */ MagickExport void GetImageInfo(ImageInfo *image_info) { + const char + *synchronize; + ExceptionInfo *exception; @@ -1504,6 +1507,9 @@ MagickExport void GetImageInfo(ImageInfo *image_info) image_info->quality=UndefinedCompressionQuality; image_info->antialias=MagickTrue; image_info->dither=MagickTrue; + synchronize=GetEnvironmentValue("MAGICK_SYNCHRONIZE"); + if (synchronize != (const char *) NULL) + image_info->synchronize=IsMagickTrue(synchronize); exception=AcquireExceptionInfo(); (void) QueryColorDatabase(BackgroundColor,&image_info->background_color, exception); diff --git a/magick/module.c b/magick/module.c index 59d519176..d441c8c5b 100644 --- a/magick/module.c +++ b/magick/module.c @@ -1639,7 +1639,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, #else { extern size_t - analyzeImage(Image **,const int,char **,ExceptionInfo *); + analyzeImage(Image **,const int,const char **,ExceptionInfo *); ImageFilterHandler *image_filter; diff --git a/magick/option.c b/magick/option.c index f3f0f4937..709ae548d 100644 --- a/magick/option.c +++ b/magick/option.c @@ -615,6 +615,10 @@ static const OptionInfo { "-swap", 1L, MagickFalse }, { "+swirl", 0L, MagickFalse }, { "-swirl", 1L, MagickFalse }, + { "+synchronize", 0L, MagickFalse }, + { "-synchronize", 0L, MagickFalse }, + { "+taint", 0L, MagickFalse }, + { "-taint", 0L, MagickFalse }, { "+text-font", 0L, MagickFalse }, { "-text-font", 1L, MagickFalse }, { "+texture", 0L, MagickFalse }, diff --git a/magick/version.h b/magick/version.h index b5110c462..2c5f02f1e 100644 --- a/magick/version.h +++ b/magick/version.h @@ -33,7 +33,7 @@ extern "C" { #define MagickLibAddendum "-1" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2010-10-14" +#define MagickReleaseDate "2010-10-16" #define MagickChangeDate "20101014" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/utilities/compare.1 b/utilities/compare.1 index 958502c1c..5370de830 100644 --- a/utilities/compare.1 +++ b/utilities/compare.1 @@ -44,6 +44,8 @@ Image Settings: \-set attribute value set an image attribute \-size geometry width and height of image \-subimage-search search for subimage + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-transparent-color color transparent color \-type type image type diff --git a/utilities/compare.1.in b/utilities/compare.1.in index 38d3ece4e..386ca8008 100644 --- a/utilities/compare.1.in +++ b/utilities/compare.1.in @@ -44,6 +44,8 @@ Image Settings: \-set attribute value set an image attribute \-size geometry width and height of image \-subimage-search search for subimage + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-transparent-color color transparent color \-type type image type diff --git a/utilities/composite.1 b/utilities/composite.1 index 682b55e3b..22716ec92 100644 --- a/utilities/composite.1 +++ b/utilities/composite.1 @@ -52,6 +52,8 @@ Image Settings: \-seed value seed a new sequence of pseudo-random numbers \-size geometry width and height of image \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-transparent-color color transparent color \-treedepth value color tree depth diff --git a/utilities/composite.1.in b/utilities/composite.1.in index 7bee28e37..2b3788d73 100644 --- a/utilities/composite.1.in +++ b/utilities/composite.1.in @@ -52,6 +52,8 @@ Image Settings: \-seed value seed a new sequence of pseudo-random numbers \-size geometry width and height of image \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-transparent-color color transparent color \-treedepth value color tree depth diff --git a/utilities/convert.1 b/utilities/convert.1 index 58fe750c7..255737dca 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -81,6 +81,8 @@ Image Settings: \-strokewidth value graphic primitive stroke width \-style type render text with this font style \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-texture filename name of texture to tile onto the image background \-tile-offset geometry tile offset diff --git a/utilities/convert.1.in b/utilities/convert.1.in index a866b6906..a0a1c8655 100644 --- a/utilities/convert.1.in +++ b/utilities/convert.1.in @@ -81,6 +81,8 @@ Image Settings: \-strokewidth value graphic primitive stroke width \-style type render text with this font style \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-texture filename name of texture to tile onto the image background \-tile-offset geometry tile offset diff --git a/utilities/import.1 b/utilities/import.1 index ba2a5a187..2c136d4b5 100644 --- a/utilities/import.1 +++ b/utilities/import.1 @@ -52,6 +52,8 @@ Image Settings: \-silent operate silently, i.e. don't ring any bells \-snaps value number of screen snapshots \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-transparent-color color transparent color \-treedepth value color tree depth diff --git a/utilities/import.1.in b/utilities/import.1.in index d3a797008..b6355a986 100644 --- a/utilities/import.1.in +++ b/utilities/import.1.in @@ -52,6 +52,8 @@ Image Settings: \-silent operate silently, i.e. don't ring any bells \-snaps value number of screen snapshots \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-transparent-color color transparent color \-treedepth value color tree depth diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index 3f289527c..eda7af90d 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -85,6 +85,8 @@ Image Settings: \-strokewidth value graphic primitive stroke width \-style type render text with this font style \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-texture filename name of texture to tile onto the image background \-tile-offset geometry tile offset diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in index e94e28855..090adba1b 100644 --- a/utilities/mogrify.1.in +++ b/utilities/mogrify.1.in @@ -85,6 +85,8 @@ Image Settings: \-strokewidth value graphic primitive stroke width \-style type render text with this font style \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device + \-taint declare the image as modified \-texture filename name of texture to tile onto the image background \-tile-offset geometry tile offset diff --git a/utilities/montage.1 b/utilities/montage.1 index ccdabeb07..7e15f9927 100644 --- a/utilities/montage.1 +++ b/utilities/montage.1 @@ -67,6 +67,7 @@ Image Settings: \-size geometry width and height of image \-stroke color color to use when stroking a graphic primitive \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device \-texture filename name of texture to tile onto the image background \-thumbnail geometry create a thumbnail of the image \-tile geometry number of tiles per row and column diff --git a/utilities/montage.1.in b/utilities/montage.1.in index b8dc97cdd..abcbc1ed9 100644 --- a/utilities/montage.1.in +++ b/utilities/montage.1.in @@ -67,6 +67,7 @@ Image Settings: \-size geometry width and height of image \-stroke color color to use when stroking a graphic primitive \-support factor resize support: > 1.0 is blurry, < 1.0 is sharp + \-synchronize synchronize image to storage device \-texture filename name of texture to tile onto the image background \-thumbnail geometry create a thumbnail of the image \-tile geometry number of tiles per row and column diff --git a/utilities/stream.1 b/utilities/stream.1 index 58e6eb227..8a2312e57 100644 --- a/utilities/stream.1 +++ b/utilities/stream.1 @@ -34,6 +34,7 @@ Image Settings: \-set attribute value set an image attribute \-size geometry width and height of image \-storage-type type pixel storage type + \-synchronize synchronize image to storage device \-transparent-color color transparent color \-verbose print detailed information about the image diff --git a/utilities/stream.1.in b/utilities/stream.1.in index 3d23fe78a..65fdc61ad 100644 --- a/utilities/stream.1.in +++ b/utilities/stream.1.in @@ -34,6 +34,7 @@ Image Settings: \-set attribute value set an image attribute \-size geometry width and height of image \-storage-type type pixel storage type + \-synchronize synchronize image to storage device \-transparent-color color transparent color \-verbose print detailed information about the image diff --git a/wand/compare.c b/wand/compare.c index ad4aee487..cb1064052 100644 --- a/wand/compare.c +++ b/wand/compare.c @@ -849,10 +849,14 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info, subimage_search=MagickTrue; break; } + if (LocaleCompare("synchronize",option+1) == 0) + break; ThrowCompareException(OptionError,"UnrecognizedOption",option) } case 't': { + if (LocaleCompare("taint",option+1) == 0) + break; if (LocaleCompare("transparent-color",option+1) == 0) { if (*option == '+') diff --git a/wand/composite.c b/wand/composite.c index f2644a41b..ee42e2472 100644 --- a/wand/composite.c +++ b/wand/composite.c @@ -315,6 +315,8 @@ static MagickBooleanType CompositeUsage(void) "-scene value image scene number", "-seed value seed a new sequence of pseudo-random numbers", "-size geometry width and height of image", + "-synchronize synchronize image to storage device", + "-taint declare the image as modified", "-transparent-color color", " transparent color", "-treedepth value color tree depth", @@ -1425,10 +1427,14 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info, ThrowCompositeInvalidArgumentException(option,argv[i]); break; } + if (LocaleCompare("synchronize",option+1) == 0) + break; ThrowCompositeException(OptionError,"UnrecognizedOption",option) } case 't': { + if (LocaleCompare("taint",option+1) == 0) + break; if (LocaleCompare("thumbnail",option+1) == 0) { if (*option == '+') diff --git a/wand/convert.c b/wand/convert.c index ecef89c43..5df6d8b10 100644 --- a/wand/convert.c +++ b/wand/convert.c @@ -387,7 +387,8 @@ static MagickBooleanType ConvertUsage(void) "-stroke color graphic primitive stroke color", "-strokewidth value graphic primitive stroke width", "-style type render text with this font style", - "-taint image as ineligible for bi-modal delegate", + "-synchronize synchronize image to storage device", + "-taint declare the image as modified", "-texture filename name of texture to tile onto the image background", "-tile-offset geometry", " tile offset", @@ -2661,6 +2662,8 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, ThrowConvertInvalidArgumentException(option,argv[i]); break; } + if (LocaleCompare("synchronize",option+1) == 0) + break; ThrowConvertException(OptionError,"UnrecognizedOption",option) } case 't': diff --git a/wand/import.c b/wand/import.c index b897a357b..772d40400 100644 --- a/wand/import.c +++ b/wand/import.c @@ -172,6 +172,8 @@ static MagickBooleanType ImportUsage(void) "-set property value set an image property", "-silent operate silently, i.e. don't ring any bells ", "-snaps value number of screen snapshots", + "-synchronize synchronize image to storage device", + "-taint declare the image as modified", "-transparent-color color", " transparent color", "-treedepth value color tree depth", @@ -1185,10 +1187,14 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, i++; /* deprecated */ break; } + if (LocaleCompare("synchronize",option+1) == 0) + break; ThrowImportException(OptionError,"UnrecognizedOption",option); } case 't': { + if (LocaleCompare("taint",option+1) == 0) + break; if (LocaleCompare("thumnail",option+1) == 0) { if (*option == '+') diff --git a/wand/mogrify.c b/wand/mogrify.c index 78fdff767..a0cada2d5 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -3867,7 +3867,8 @@ static MagickBooleanType MogrifyUsage(void) "-stroke color graphic primitive stroke color", "-strokewidth value graphic primitive stroke width", "-style type render text with this font style", - "-taint image as ineligible for bi-modal delegate", + "-synchronize synchronize image to storage device", + "-taint declare the image as modified", "-texture filename name of texture to tile onto the image background", "-tile-offset geometry", " tile offset", @@ -6063,6 +6064,8 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, ThrowMogrifyInvalidArgumentException(option,argv[i]); break; } + if (LocaleCompare("synchronize",option+1) == 0) + break; ThrowMogrifyException(OptionError,"UnrecognizedOption",option) } case 't': @@ -7340,6 +7343,16 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info, (void) SetImageOption(image_info,option+1,argv[i+1]); break; } + if (LocaleCompare("synchronize",option+1) == 0) + { + if (*option == '+') + { + image_info->synchronize=MagickFalse; + break; + } + image_info->synchronize=MagickTrue; + break; + } break; } case 't': diff --git a/wand/montage.c b/wand/montage.c index 5a25eaec8..5fa2a9678 100644 --- a/wand/montage.c +++ b/wand/montage.c @@ -187,6 +187,8 @@ static MagickBooleanType MontageUsage(void) "-shadow add a shadow beneath a tile to simulate depth", "-size geometry width and height of image", "-stroke color color to use when stroking a graphic primitive", + "-synchronize synchronize image to storage device", + "-taint declare the image as modified", "-texture filename name of texture to tile onto the image background", "-thumbnail geometry create a thumbnail of the image", "-tile geometry number of tiles per row and column", @@ -1492,10 +1494,14 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, i++; /* deprecated */ break; } + if (LocaleCompare("synchronize",option+1) == 0) + break; ThrowMontageException(OptionError,"UnrecognizedOption",option) } case 't': { + if (LocaleCompare("taint",option+1) == 0) + break; if (LocaleCompare("texture",option+1) == 0) { (void) CloneString(&montage_info->texture,(char *) NULL); diff --git a/wand/stream.c b/wand/stream.c index 362253d60..95e485392 100644 --- a/wand/stream.c +++ b/wand/stream.c @@ -127,6 +127,8 @@ static MagickBooleanType StreamUsage(void) "-set attribute value set an image attribute", "-size geometry width and height of image", "-storage-type type pixel storage type", + "-synchronize synchronize image to storage device", + "-taint declare the image as modified", "-transparent-color color", " transparent color", "-verbose print detailed information about the image", @@ -688,10 +690,14 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, SetStreamInfoStorageType(stream_info,(StorageType) type); break; } + if (LocaleCompare("synchronize",option+1) == 0) + break; ThrowStreamException(OptionError,"UnrecognizedOption",option) } case 't': { + if (LocaleCompare("taint",option+1) == 0) + break; if (LocaleCompare("transparent-color",option+1) == 0) { if (*option == '+')