From: cristy Date: Sat, 3 Mar 2012 19:19:12 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6088 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d04e7bfd3f183453b5c0f8e0a8fbb0a988a1d541;p=imagemagick --- diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h index 1dc4c4c48..98ce2e1c5 100644 --- a/MagickCore/MagickCore.h +++ b/MagickCore/MagickCore.h @@ -69,6 +69,7 @@ extern "C" { #include "MagickCore/blob.h" #include "MagickCore/cache.h" #include "MagickCore/cache-view.h" +#include "MagickCore/channel.h" #include "MagickCore/cipher.h" #include "MagickCore/client.h" #include "MagickCore/coder.h" diff --git a/MagickCore/Make.com b/MagickCore/Make.com index 62aee9483..3828ac555 100644 --- a/MagickCore/Make.com +++ b/MagickCore/Make.com @@ -30,6 +30,7 @@ $call Make attribute.c $call Make blob.c $call Make cache.c $call Make cache-view.c +$call Make channel.c $call Make cipher.c $call Make client.c $call Make coder.c @@ -138,10 +139,10 @@ $ deass magick $ deass wand $library/create libMagick.olb - accelerate, animate, annotate, artifact, attribute, blob, cache, cache-view, - - cipher, client, coder, color, colormap, colorspace, compare, composite, - - compress, configure, constitute, decorate, delegate, deprecate, display, - - distort, draw, effect, enhance, exception, feature, fourier, fx, gem, - - geometry, hashmap, histogram, identify, image, image-view, layer, list, - + channel, cipher, client, coder, color, colormap, colorspace, compare, - + composite, compress, configure, constitute, decorate, delegate, deprecate, - + display, distort, draw, effect, enhance, exception, feature, fourier, fx, - + gem, geometry, hashmap, histogram, identify, image, image-view, layer, list, - locale, log, magic, magick, matrix, memory, mime, module, monitor, montage, - morphology, option, paint, pixel, PreRvIcccm, profile, quantize, quantum, - quantum-export, quantum-import,random, registry, resample, resize, resource, - diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am index a559a4dc3..87f3e23ea 100644 --- a/MagickCore/Makefile.am +++ b/MagickCore/Makefile.am @@ -70,6 +70,8 @@ MAGICKCORE_BASE_SRCS = \ MagickCore/cache-private.h \ MagickCore/cache-view.c \ MagickCore/cache-view.h \ + MagickCore/channel.c \ + MagickCore/channel.h \ MagickCore/cipher.c \ MagickCore/cipher.h \ MagickCore/client.c \ @@ -297,6 +299,7 @@ MAGICKCORE_INCLUDE_HDRS = \ MagickCore/blob.h \ MagickCore/cache.h \ MagickCore/cache-view.h \ + MagickCore/channel.h \ MagickCore/cipher.h \ MagickCore/client.h \ MagickCore/coder.h \ diff --git a/MagickCore/channel.c b/MagickCore/channel.c new file mode 100644 index 000000000..b09bb47b1 --- /dev/null +++ b/MagickCore/channel.c @@ -0,0 +1,78 @@ +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% CCCC H H AAA N N N N EEEEE L % +% C H H A A NN N NN N E L % +% C HHHHH AAAAA N N N N N N RRR L % +% C H H A A N NN N NN E L % +% CCCC H H A A N N N N EEEEE LLLLL % +% % +% % +% MagickCore Image Channel Methods % +% % +% Software Design % +% John Cristy % +% December 2003 % +% % +% % +% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization % +% dedicated to making software imaging solutions freely available. % +% % +% You may not use this file except in compliance with the License. You may % +% obtain a copy of the License at % +% % +% http://www.imagemagick.org/script/license.php % +% % +% Unless required by applicable law or agreed to in writing, software % +% distributed under the License is distributed on an "AS IS" BASIS, % +% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. % +% See the License for the specific language governing permissions and % +% limitations under the License. % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% +% +*/ + +/* + Include declarations. +*/ +#include "MagickCore/studio.h" +#include "MagickCore/utility.h" +#include "MagickCore/version.h" + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% C h a n n e l O p e r a t i o n I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% ChannelOperationImage() applies a channel expression to the specified image. +% +% The format of the ChannelOperationImage method is: +% +% Image *ChannelOperationImage(const Image *image, +% const char *expression,ExceptionInfo *exception) +% +% A description of each parameter follows: +% +% o image: the image. +% +% o expression: A channel expression. +% +% o exception: return any errors or warnings in this structure. +% +*/ +MagickExport Image *ChannelOperationImage(const Image *image, + const char *expression,ExceptionInfo *exception) +{ + return((Image *) NULL); +} diff --git a/MagickCore/channel.h b/MagickCore/channel.h new file mode 100644 index 000000000..76c81857e --- /dev/null +++ b/MagickCore/channel.h @@ -0,0 +1,32 @@ +/* + Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization + dedicated to making software imaging solutions freely available. + + You may not use this file except in compliance with the License. + obtain a copy of the License at + + http://www.imagemagick.org/script/license.php + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + MagickCore image channel methods. +*/ +#ifndef _MAGICKCORE_CHANNEL_H +#define _MAGICKCORE_CHANNEL_H + +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + +extern MagickExport Image + *ChannelOperationImage(const Image *,const char *,ExceptionInfo *); + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif + +#endif diff --git a/MagickCore/option.c b/MagickCore/option.c index d08999712..b11a05747 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -241,9 +241,8 @@ static const OptionInfo { "-cdl", 1L, SimpleOperatorOptionFlag, MagickFalse }, { "+channel", 0L, ImageInfoOptionFlag | SimpleOperatorOptionFlag, MagickFalse }, { "-channel", 1L, ImageInfoOptionFlag | SimpleOperatorOptionFlag, MagickFalse }, - { "-channel-extract", 1L, SimpleOperatorOptionFlag, MagickFalse }, - { "-channel-inject", 0L, ListOperatorOptionFlag | FireOptionFlag, MagickTrue }, - { "-channel-swap", 1L, SimpleOperatorOptionFlag, MagickFalse }, + { "+channel-ops", 0L, ListOperatorOptionFlag | FireOptionFlag, MagickFalse }, + { "-channel-ops", 0L, ListOperatorOptionFlag | FireOptionFlag, MagickFalse }, { "+charcoal", 0L, DeprecateOptionFlag, MagickTrue }, { "-charcoal", 0L, SimpleOperatorOptionFlag, MagickFalse }, { "+chop", 1L, DeprecateOptionFlag, MagickTrue }, @@ -2522,13 +2521,13 @@ MagickExport ssize_t ParseCommandOption(const CommandOption option_table, % % A description of each parameter follows: % -% o options: One or more values separated by commas. +% o channels: One or more channels separated by commas. % */ MagickExport ssize_t ParsePixelChannelOption(const char *channels) { - register ssize_t - i; + char + *q; ssize_t channel; @@ -2536,84 +2535,10 @@ MagickExport ssize_t ParsePixelChannelOption(const char *channels) channel=ParseCommandOption(MagickPixelChannelOptions,MagickTrue,channels); if (channel >= 0) return(channel); - channel=0; - for (i=0; i < (ssize_t) strlen(channels); i++) - { - switch (channels[i]) - { - case 'A': - case 'a': - { - channel|=AlphaPixelChannel; - break; - } - case 'B': - case 'b': - { - channel|=BluePixelChannel; - break; - } - case 'C': - case 'c': - { - channel|=CyanPixelChannel; - break; - } - case 'g': - case 'G': - { - channel|=GreenPixelChannel; - break; - } - case 'K': - case 'k': - { - channel|=BlackPixelChannel; - break; - } - case 'M': - case 'm': - { - channel|=MagentaPixelChannel; - break; - } - case 'o': - case 'O': - { - channel|=AlphaPixelChannel; - break; - } - case 'R': - case 'r': - { - channel|=RedPixelChannel; - break; - } - case 'Y': - case 'y': - { - channel|=YellowPixelChannel; - break; - } - case ',': - { - ssize_t - type; - - /* - Gather the additional channel flags and merge with shorthand. - */ - type=ParseCommandOption(MagickPixelChannelOptions,MagickTrue, - channels+i+1); - if (type < 0) - return(type); - channel|=type; - return(channel); - } - default: - return(-1); - } - } + q=(char *) channels; + channel=InterpretLocaleValue(channels,&q); + if ((q == channels) || (channel < 0) || (channel >= MaxPixelChannels)) + return(-1); return(channel); } diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h index e7a6f7134..031d89ab2 100644 --- a/MagickCore/pixel.h +++ b/MagickCore/pixel.h @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. - MagickCore image constitute methods. + MagickCore image pixel methods. */ #ifndef _MAGICKCORE_PIXEL_H #define _MAGICKCORE_PIXEL_H diff --git a/MagickCore/version.h b/MagickCore/version.h index 94ab417c0..857963278 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "7019" +#define MagickSVNRevision "7036" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-03-02" +#define MagickReleaseDate "2012-03-03" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/MagickWand/convert.c b/MagickWand/convert.c index e23549787..a4df5c7cd 100644 --- a/MagickWand/convert.c +++ b/MagickWand/convert.c @@ -137,12 +137,8 @@ static MagickBooleanType ConvertUsage(void) static const char *channel_operators[]= { - "-channel-extract channel-list", - " extract the channels in order", - "-channel-inject channel-list", - " inject the channels in order", - "-channel-swap channel,channel", - " swap channels", + "-channel-ops expression", + " exchange, extract, or transfer one or more image channels", (char *) NULL }, *miscellaneous[]= @@ -889,39 +885,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, argv[i]); break; } - if (LocaleCompare("channel-extract",option+1) == 0) - { - ssize_t - channel; - - if (*option == '+') - break; - i++; - if (i == (ssize_t) (argc-1)) - ThrowConvertException(OptionError,"MissingArgument",option); - channel=ParsePixelChannelOption(argv[i]); - if (channel < 0) - ThrowConvertException(OptionError,"UnrecognizedChannelType", - argv[i]); - break; - } - if (LocaleCompare("channel-inject",option+1) == 0) - { - ssize_t - channel; - - if (*option == '+') - break; - i++; - if (i == (ssize_t) (argc-1)) - ThrowConvertException(OptionError,"MissingArgument",option); - channel=ParsePixelChannelOption(argv[i]); - if (channel < 0) - ThrowConvertException(OptionError,"UnrecognizedChannelType", - argv[i]); - break; - } - if (LocaleCompare("channel-swap",option+1) == 0) + if (LocaleCompare("channel-ops",option+1) == 0) { ssize_t channel; diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index c63d7b991..2ffbc07ac 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -1037,16 +1037,6 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, exception); break; } - if (LocaleCompare("channel-extract",option+1) == 0) - { - puts("stand by..."); - break; - } - if (LocaleCompare("channel-swap",option+1) == 0) - { - puts("stand by..."); - break; - } if (LocaleCompare("charcoal",option+1) == 0) { /* @@ -3267,12 +3257,8 @@ static MagickBooleanType MogrifyUsage(void) static const char *channel_operators[]= { - "-channel-extract channel-list", - " extract the channels in order", - "-channel-inject channel-list", - " inject the channels in order", - "-channel-swap channel,channel", - " swap channels", + "-channel-ops expression", + " exchange, extract, or transfer one or more image channels", (char *) NULL }, *miscellaneous[]= @@ -4047,39 +4033,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, argv[i]); break; } - if (LocaleCompare("channel-extract",option+1) == 0) - { - ssize_t - channel; - - if (*option == '+') - break; - i++; - if (i == (ssize_t) (argc-1)) - ThrowMogrifyException(OptionError,"MissingArgument",option); - channel=ParsePixelChannelOption(argv[i]); - if (channel < 0) - ThrowMogrifyException(OptionError,"UnrecognizedChannelType", - argv[i]); - break; - } - if (LocaleCompare("channel-inject",option+1) == 0) - { - ssize_t - channel; - - if (*option == '+') - break; - i++; - if (i == (ssize_t) (argc-1)) - ThrowMogrifyException(OptionError,"MissingArgument",option); - channel=ParsePixelChannelOption(argv[i]); - if (channel < 0) - ThrowMogrifyException(OptionError,"UnrecognizedChannelType", - argv[i]); - break; - } - if (LocaleCompare("channel-swap",option+1) == 0) + if (LocaleCompare("channel-ops",option+1) == 0) { ssize_t channel; @@ -7389,9 +7343,20 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, } case 'c': { - if (LocaleCompare("channel-inject",option+1) == 0) + if (LocaleCompare("channel-ops",option+1) == 0) { - puts("stand by..."); + Image + *channel_image; + + (void) SyncImagesSettings(mogrify_info,*images,exception); + channel_image=ChannelOperationImage(*images,argv[i+1],exception); + if (channel_image == (Image *) NULL) + { + status=MagickFalse; + break; + } + *images=DestroyImageList(*images); + *images=channel_image; break; } if (LocaleCompare("clut",option+1) == 0) diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 59ecb75fc..75395cda7 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -1885,16 +1885,6 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, SetPixelChannelMapMask(image,image_info->channel); break; } - if (LocaleCompare("channel-extract",option+1) == 0) - { - puts("stand by..."); - break; - } - if (LocaleCompare("channel-swap",option+1) == 0) - { - puts("stand by..."); - break; - } if (LocaleCompare("charcoal",option+1) == 0) { flags=ParseGeometry(arg1,&geometry_info); @@ -3545,9 +3535,9 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand, } case 'c': { - if (LocaleCompare("channel-inject",option+1) == 0) + if (LocaleCompare("channel-ops",option+1) == 0) { - puts("stand by..."); + new_images=ChannelOperationImage(images,arg1,exception); break; } if (LocaleCompare("clut",option+1) == 0) diff --git a/Makefile.in b/Makefile.in index 31ae9e149..cf63ac896 100644 --- a/Makefile.in +++ b/Makefile.in @@ -391,44 +391,45 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST = \ MagickCore/blob.c MagickCore/blob.h MagickCore/blob-private.h \ MagickCore/cache.c MagickCore/cache.h \ MagickCore/cache-private.h MagickCore/cache-view.c \ - MagickCore/cache-view.h MagickCore/cipher.c \ - MagickCore/cipher.h MagickCore/client.c MagickCore/client.h \ - MagickCore/coder.c MagickCore/coder.h MagickCore/color.c \ - MagickCore/color.h MagickCore/color-private.h \ - MagickCore/colormap.c MagickCore/colormap.h \ - MagickCore/colormap-private.h MagickCore/colorspace.c \ - MagickCore/colorspace.h MagickCore/colorspace-private.h \ - MagickCore/compare.c MagickCore/compare.h \ - MagickCore/composite.c MagickCore/composite.h \ - MagickCore/composite-private.h MagickCore/compress.c \ - MagickCore/compress.h MagickCore/configure.c \ - MagickCore/configure.h MagickCore/constitute.c \ - MagickCore/constitute.h MagickCore/decorate.c \ - MagickCore/decorate.h MagickCore/delegate.c \ - MagickCore/delegate.h MagickCore/delegate-private.h \ - MagickCore/deprecate.c MagickCore/deprecate.h \ - MagickCore/display.c MagickCore/display.h \ - MagickCore/display-private.h MagickCore/distort.c \ - MagickCore/distort.h MagickCore/draw.c MagickCore/draw.h \ - MagickCore/draw-private.h MagickCore/effect.c \ - MagickCore/effect.h MagickCore/enhance.c MagickCore/enhance.h \ - MagickCore/exception.c MagickCore/exception.h \ - MagickCore/exception-private.h MagickCore/feature.c \ - MagickCore/feature.h MagickCore/fourier.c MagickCore/fourier.h \ - MagickCore/fx.c MagickCore/fx.h MagickCore/fx-private.h \ - MagickCore/gem.c MagickCore/gem.h MagickCore/gem-private.h \ - MagickCore/geometry.c MagickCore/geometry.h \ - MagickCore/hashmap.c MagickCore/hashmap.h \ - MagickCore/histogram.c MagickCore/histogram.h \ - MagickCore/identify.c MagickCore/identify.h MagickCore/image.c \ - MagickCore/image.h MagickCore/image-private.h \ - MagickCore/image-view.c MagickCore/image-view.h \ - MagickCore/layer.c MagickCore/layer.h MagickCore/list.c \ - MagickCore/list.h MagickCore/locale.c MagickCore/locale_.h \ - MagickCore/log.c MagickCore/log.h MagickCore/mac.h \ - MagickCore/magic.c MagickCore/magic.h MagickCore/magick.c \ - MagickCore/magick-config.h MagickCore/magick-type.h \ - MagickCore/magick.h MagickCore/matrix.c MagickCore/matrix.h \ + MagickCore/cache-view.h MagickCore/channel.c \ + MagickCore/channel.h MagickCore/cipher.c MagickCore/cipher.h \ + MagickCore/client.c MagickCore/client.h MagickCore/coder.c \ + MagickCore/coder.h MagickCore/color.c MagickCore/color.h \ + MagickCore/color-private.h MagickCore/colormap.c \ + MagickCore/colormap.h MagickCore/colormap-private.h \ + MagickCore/colorspace.c MagickCore/colorspace.h \ + MagickCore/colorspace-private.h MagickCore/compare.c \ + MagickCore/compare.h MagickCore/composite.c \ + MagickCore/composite.h MagickCore/composite-private.h \ + MagickCore/compress.c MagickCore/compress.h \ + MagickCore/configure.c MagickCore/configure.h \ + MagickCore/constitute.c MagickCore/constitute.h \ + MagickCore/decorate.c MagickCore/decorate.h \ + MagickCore/delegate.c MagickCore/delegate.h \ + MagickCore/delegate-private.h MagickCore/deprecate.c \ + MagickCore/deprecate.h MagickCore/display.c \ + MagickCore/display.h MagickCore/display-private.h \ + MagickCore/distort.c MagickCore/distort.h MagickCore/draw.c \ + MagickCore/draw.h MagickCore/draw-private.h \ + MagickCore/effect.c MagickCore/effect.h MagickCore/enhance.c \ + MagickCore/enhance.h MagickCore/exception.c \ + MagickCore/exception.h MagickCore/exception-private.h \ + MagickCore/feature.c MagickCore/feature.h MagickCore/fourier.c \ + MagickCore/fourier.h MagickCore/fx.c MagickCore/fx.h \ + MagickCore/fx-private.h MagickCore/gem.c MagickCore/gem.h \ + MagickCore/gem-private.h MagickCore/geometry.c \ + MagickCore/geometry.h MagickCore/hashmap.c \ + MagickCore/hashmap.h MagickCore/histogram.c \ + MagickCore/histogram.h MagickCore/identify.c \ + MagickCore/identify.h MagickCore/image.c MagickCore/image.h \ + MagickCore/image-private.h MagickCore/image-view.c \ + MagickCore/image-view.h MagickCore/layer.c MagickCore/layer.h \ + MagickCore/list.c MagickCore/list.h MagickCore/locale.c \ + MagickCore/locale_.h MagickCore/log.c MagickCore/log.h \ + MagickCore/mac.h MagickCore/magic.c MagickCore/magic.h \ + MagickCore/magick.c MagickCore/magick-config.h \ + MagickCore/magick-type.h MagickCore/magick.h \ + MagickCore/matrix.c MagickCore/matrix.h \ MagickCore/matrix-private.h MagickCore/memory.c \ MagickCore/memory_.h MagickCore/method-attribute.h \ MagickCore/methods.h MagickCore/mime.c MagickCore/mime.h \ @@ -517,6 +518,7 @@ am__objects_1 = MagickCore/MagickCore_libMagickCore_la-accelerate.lo \ MagickCore/MagickCore_libMagickCore_la-blob.lo \ MagickCore/MagickCore_libMagickCore_la-cache.lo \ MagickCore/MagickCore_libMagickCore_la-cache-view.lo \ + MagickCore/MagickCore_libMagickCore_la-channel.lo \ MagickCore/MagickCore_libMagickCore_la-cipher.lo \ MagickCore/MagickCore_libMagickCore_la-client.lo \ MagickCore/MagickCore_libMagickCore_la-coder.lo \ @@ -753,6 +755,7 @@ am__objects_18 = MagickWand/MagickWand_libMagickWand_la-animate.lo \ MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo \ MagickWand/MagickWand_libMagickWand_la-identify.lo \ MagickWand/MagickWand_libMagickWand_la-import.lo \ + MagickWand/MagickWand_libMagickWand_la-magick-cli.lo \ MagickWand/MagickWand_libMagickWand_la-magick-image.lo \ MagickWand/MagickWand_libMagickWand_la-magick-property.lo \ MagickWand/MagickWand_libMagickWand_la-magick-cli.lo \ @@ -762,6 +765,7 @@ am__objects_18 = MagickWand/MagickWand_libMagickWand_la-animate.lo \ MagickWand/MagickWand_libMagickWand_la-operation.lo \ MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo \ MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo \ + MagickWand/MagickWand_libMagickWand_la-script-token.lo \ MagickWand/MagickWand_libMagickWand_la-stream.lo \ MagickWand/MagickWand_libMagickWand_la-wand.lo \ MagickWand/MagickWand_libMagickWand_la-wand-view.lo @@ -3958,6 +3962,8 @@ MAGICKCORE_BASE_SRCS = \ MagickCore/cache-private.h \ MagickCore/cache-view.c \ MagickCore/cache-view.h \ + MagickCore/channel.c \ + MagickCore/channel.h \ MagickCore/cipher.c \ MagickCore/cipher.h \ MagickCore/client.c \ @@ -4180,6 +4186,7 @@ MAGICKCORE_INCLUDE_HDRS = \ MagickCore/blob.h \ MagickCore/cache.h \ MagickCore/cache-view.h \ + MagickCore/channel.h \ MagickCore/cipher.h \ MagickCore/client.h \ MagickCore/coder.h \ @@ -4368,6 +4375,8 @@ MAGICKWAND_SOURCES = \ MagickWand/identify.h \ MagickWand/import.c \ MagickWand/import.h \ + MagickWand/magick-cli.c \ + MagickWand/magick-cli.h \ MagickWand/magick-image.c \ MagickWand/magick-image.h \ MagickWand/magick-property.c \ @@ -4390,6 +4399,8 @@ MAGICKWAND_SOURCES = \ MagickWand/pixel-wand.c \ MagickWand/pixel-wand.h \ MagickWand/pixel-wand-private.h \ + MagickWand/script-token.c \ + MagickWand/script-token.h \ MagickWand/stream.c \ MagickWand/stream.h \ MagickWand/studio.h \ @@ -4427,6 +4438,7 @@ MAGICKWAND_NOINST_HDRS = \ MagickWand/magick-wand-private.h \ MagickWand/operation-private.h \ MagickWand/pixel-wand-private.h \ + MagickWand/script-token.h \ MagickWand/studio.h \ MagickWand/wand.h @@ -5203,6 +5215,9 @@ MagickCore/MagickCore_libMagickCore_la-cache.lo: \ MagickCore/MagickCore_libMagickCore_la-cache-view.lo: \ MagickCore/$(am__dirstamp) \ MagickCore/$(DEPDIR)/$(am__dirstamp) +MagickCore/MagickCore_libMagickCore_la-channel.lo: \ + MagickCore/$(am__dirstamp) \ + MagickCore/$(DEPDIR)/$(am__dirstamp) MagickCore/MagickCore_libMagickCore_la-cipher.lo: \ MagickCore/$(am__dirstamp) \ MagickCore/$(DEPDIR)/$(am__dirstamp) @@ -5735,13 +5750,13 @@ MagickWand/MagickWand_libMagickWand_la-identify.lo: \ MagickWand/MagickWand_libMagickWand_la-import.lo: \ MagickWand/$(am__dirstamp) \ MagickWand/$(DEPDIR)/$(am__dirstamp) -MagickWand/MagickWand_libMagickWand_la-magick-image.lo: \ +MagickWand/MagickWand_libMagickWand_la-magick-cli.lo: \ MagickWand/$(am__dirstamp) \ MagickWand/$(DEPDIR)/$(am__dirstamp) -MagickWand/MagickWand_libMagickWand_la-magick-property.lo: \ +MagickWand/MagickWand_libMagickWand_la-magick-image.lo: \ MagickWand/$(am__dirstamp) \ MagickWand/$(DEPDIR)/$(am__dirstamp) -MagickWand/MagickWand_libMagickWand_la-magick-cli.lo: \ +MagickWand/MagickWand_libMagickWand_la-magick-property.lo: \ MagickWand/$(am__dirstamp) \ MagickWand/$(DEPDIR)/$(am__dirstamp) MagickWand/MagickWand_libMagickWand_la-magick-wand.lo: \ @@ -5762,6 +5777,9 @@ MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo: \ MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo: \ MagickWand/$(am__dirstamp) \ MagickWand/$(DEPDIR)/$(am__dirstamp) +MagickWand/MagickWand_libMagickWand_la-script-token.lo: \ + MagickWand/$(am__dirstamp) \ + MagickWand/$(DEPDIR)/$(am__dirstamp) MagickWand/MagickWand_libMagickWand_la-stream.lo: \ MagickWand/$(am__dirstamp) \ MagickWand/$(DEPDIR)/$(am__dirstamp) @@ -6678,6 +6696,8 @@ mostlyclean-compile: -rm -f MagickCore/MagickCore_libMagickCore_la-cache-view.lo -rm -f MagickCore/MagickCore_libMagickCore_la-cache.$(OBJEXT) -rm -f MagickCore/MagickCore_libMagickCore_la-cache.lo + -rm -f MagickCore/MagickCore_libMagickCore_la-channel.$(OBJEXT) + -rm -f MagickCore/MagickCore_libMagickCore_la-channel.lo -rm -f MagickCore/MagickCore_libMagickCore_la-cipher.$(OBJEXT) -rm -f MagickCore/MagickCore_libMagickCore_la-cipher.lo -rm -f MagickCore/MagickCore_libMagickCore_la-client.$(OBJEXT) @@ -6878,6 +6898,8 @@ mostlyclean-compile: -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-wand.$(OBJEXT) -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo + -rm -f MagickWand/MagickWand_libMagickWand_la-script-token.$(OBJEXT) + -rm -f MagickWand/MagickWand_libMagickWand_la-script-token.lo -rm -f MagickWand/MagickWand_libMagickWand_la-stream.$(OBJEXT) -rm -f MagickWand/MagickWand_libMagickWand_la-stream.lo -rm -f MagickWand/MagickWand_libMagickWand_la-wand-view.$(OBJEXT) @@ -7457,6 +7479,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-blob.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache-view.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-channel.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cipher.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-client.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-coder.Plo@am__quote@ @@ -7557,6 +7580,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-operation.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-iterator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-wand.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-script-token.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand-view.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand.Plo@am__quote@ @@ -7910,6 +7934,13 @@ MagickCore/MagickCore_libMagickCore_la-cache-view.lo: MagickCore/cache-view.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-cache-view.lo `test -f 'MagickCore/cache-view.c' || echo '$(srcdir)/'`MagickCore/cache-view.c +MagickCore/MagickCore_libMagickCore_la-channel.lo: MagickCore/channel.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-channel.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-channel.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-channel.lo `test -f 'MagickCore/channel.c' || echo '$(srcdir)/'`MagickCore/channel.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-channel.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-channel.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='MagickCore/channel.c' object='MagickCore/MagickCore_libMagickCore_la-channel.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-channel.lo `test -f 'MagickCore/channel.c' || echo '$(srcdir)/'`MagickCore/channel.c + MagickCore/MagickCore_libMagickCore_la-cipher.lo: MagickCore/cipher.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-cipher.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cipher.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-cipher.lo `test -f 'MagickCore/cipher.c' || echo '$(srcdir)/'`MagickCore/cipher.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cipher.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cipher.Plo @@ -9380,6 +9411,13 @@ MagickWand/MagickWand_libMagickWand_la-import.lo: MagickWand/import.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-import.lo `test -f 'MagickWand/import.c' || echo '$(srcdir)/'`MagickWand/import.c +MagickWand/MagickWand_libMagickWand_la-magick-cli.lo: MagickWand/magick-cli.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-cli.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-cli.lo `test -f 'MagickWand/magick-cli.c' || echo '$(srcdir)/'`MagickWand/magick-cli.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='MagickWand/magick-cli.c' object='MagickWand/MagickWand_libMagickWand_la-magick-cli.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-magick-cli.lo `test -f 'MagickWand/magick-cli.c' || echo '$(srcdir)/'`MagickWand/magick-cli.c + MagickWand/MagickWand_libMagickWand_la-magick-image.lo: MagickWand/magick-image.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-image.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-image.lo `test -f 'MagickWand/magick-image.c' || echo '$(srcdir)/'`MagickWand/magick-image.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Plo @@ -9394,13 +9432,6 @@ MagickWand/MagickWand_libMagickWand_la-magick-property.lo: MagickWand/magick-pro @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-magick-property.lo `test -f 'MagickWand/magick-property.c' || echo '$(srcdir)/'`MagickWand/magick-property.c -MagickWand/MagickWand_libMagickWand_la-magick-cli.lo: MagickWand/magick-cli.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-cli.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-cli.lo `test -f 'MagickWand/magick-cli.c' || echo '$(srcdir)/'`MagickWand/magick-cli.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='MagickWand/magick-cli.c' object='MagickWand/MagickWand_libMagickWand_la-magick-cli.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-magick-cli.lo `test -f 'MagickWand/magick-cli.c' || echo '$(srcdir)/'`MagickWand/magick-cli.c - MagickWand/MagickWand_libMagickWand_la-magick-wand.lo: MagickWand/magick-wand.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-wand.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-wand.lo `test -f 'MagickWand/magick-wand.c' || echo '$(srcdir)/'`MagickWand/magick-wand.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Plo @@ -9443,6 +9474,13 @@ MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo: MagickWand/pixel-wand.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo `test -f 'MagickWand/pixel-wand.c' || echo '$(srcdir)/'`MagickWand/pixel-wand.c +MagickWand/MagickWand_libMagickWand_la-script-token.lo: MagickWand/script-token.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-script-token.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-script-token.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-script-token.lo `test -f 'MagickWand/script-token.c' || echo '$(srcdir)/'`MagickWand/script-token.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-script-token.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-script-token.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='MagickWand/script-token.c' object='MagickWand/MagickWand_libMagickWand_la-script-token.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-script-token.lo `test -f 'MagickWand/script-token.c' || echo '$(srcdir)/'`MagickWand/script-token.c + MagickWand/MagickWand_libMagickWand_la-stream.lo: MagickWand/stream.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-stream.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-stream.lo `test -f 'MagickWand/stream.c' || echo '$(srcdir)/'`MagickWand/stream.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Plo diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index a4d1c178e..a09741921 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-03-02 + 2012-03-03 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-03-02 + 2012-03-03 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index a4e290aee..d300d3ab4 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index bf79ef775..9fc8adf89 100755 --- a/configure +++ b/configure @@ -3616,7 +3616,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=7019 +MAGICK_SVN_REVISION=7036