From: cristy Date: Tue, 19 Oct 2010 16:28:10 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8662 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5063d816dfeac959e6534d29262fe9d9cf5c281d;p=imagemagick --- diff --git a/index.html b/index.html index 921d582a9..da8ae5b23 100644 --- a/index.html +++ b/index.html @@ -180,7 +180,7 @@

The functionality of ImageMagick is typically utilized from the command line or you can use the features from programs written in your favorite programming language. Choose from these interfaces: G2F (Ada), MagickCore (C), MagickWand (C), ChMagick (Ch), ImageMagickObject (COM+), Magick++ (C++), JMagick (Java), L-Magick (Lisp), NMagick (Neko/haXe), MagickNet (.NET), PascalMagick (Pascal), PerlMagick (Perl), MagickWand for PHP (PHP), IMagick (PHP), PythonMagick (Python), RMagick (Ruby), or TclMagick (Tcl/TK). With a language interface, use ImageMagick to modify or create images dynamically and automagically.

-

ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may freely use, copy, modify, and distribute in both open and proprietary applications. It is distributed under an Apache 2.0-style license, approved by the OSI and recommended for use by the OSSCC.

+

ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may freely use, copy, modify, and distribute in both open and proprietary applications. It is distributed under the Apache 2.0 license, approved by the OSI and recommended for use by the OSSCC.

The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes memory and thread error detection to prevent security vulnerabilities.

diff --git a/wand/mogrify.c b/wand/mogrify.c index a0cada2d5..f21580c11 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -69,7 +69,7 @@ static const char % % % % % % -+ M a g i c k C o m m a n d G e n e s i s % +% M a g i c k C o m m a n d G e n e s i s % % % % % % % @@ -81,13 +81,17 @@ static const char % The format of the MagickCommandGenesis method is: % % MagickBooleanType MagickCommandGenesis(ImageInfo *image_info, -% MagickCommand command,const int argc,const char **argv,Image **image) +% MagickCommand command,int argc,char **argv,char **metadata, +% ExceptionInfo *exception) % % A description of each parameter follows: % % o image_info: the image info. % -% o command: the magick command. +% o command: Choose from ConvertImageCommand, IdentifyImageCommand, +% MogrifyImageCommand, CompositeImageCommand, CompareImageCommand, +% ConjureImageCommand, StreamImageCommand, ImportImageCommand, +% DisplayImageCommand, or AnimateImageCommand. % % o argc: Specifies a pointer to an integer describing the number of % elements in the argument vector. @@ -95,7 +99,7 @@ static const char % o argv: Specifies a pointer to a text array containing the command line % arguments. % -% o image: the image. +% o metadata: any metadata is returned here. % % o exception: return any errors or warnings in this structure. % @@ -3578,7 +3582,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, % % % % % % -% M o g r i f y I m a g e C o m m a n d % ++ M o g r i f y I m a g e C o m m a n d % % % % % % % diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 1fb5bf5d4..2ea77c359 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -128,7 +128,7 @@