From: Anthony Thyssen Date: Tue, 20 Dec 2016 01:05:09 +0000 (+1000) Subject: Monor comment changes (for clarity) X-Git-Tag: 7.0.4-1~38 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b7198d6bb4dafd1aed94a7672ec3d83c4bfaf4c;p=imagemagick Monor comment changes (for clarity) --- diff --git a/api_examples/README b/api_examples/README index 3f4d54888..5a904b8b8 100644 --- a/api_examples/README +++ b/api_examples/README @@ -17,7 +17,7 @@ ImageMagick Library. Shell API... - magick.sh A simple "magick" shell command (as above) + magick_shell.sh A simple "magick" shell command (as above) magick_script.mgk As a "magick" script file MagickCLI API... diff --git a/api_examples/cli_operators.c b/api_examples/cli_operators.c index f16be9486..d39a43fcd 100644 --- a/api_examples/cli_operators.c +++ b/api_examples/cli_operators.c @@ -10,13 +10,13 @@ gcc -lMagickWand -lMagickCore cli_operators.c -o cli_operators - Compile and run directly in Source Directory... + Compile and run directly from Source Directory... IM_PROG=api_examples/cli_operators gcc -I`pwd` -LMagickWand/.libs -LMagickCore/.libs \ -lMagickWand -lMagickCore $IM_PROG.c -o $IM_PROG - sh magick.sh $IM_PROG + sh ./magick.sh $IM_PROG */ diff --git a/api_examples/cli_process.c b/api_examples/cli_process.c index 1eb662df8..1f18c413c 100644 --- a/api_examples/cli_process.c +++ b/api_examples/cli_process.c @@ -9,13 +9,13 @@ gcc -lMagickWand -lMagickCore cli_process.c -o cli_process - Compile and run directly in Source Directory... + Compile and run directly from Source Directory... IM_PROG=api_examples/cli_process gcc -I`pwd` -LMagickWand/.libs -LMagickCore/.libs \ -lMagickWand -lMagickCore $IM_PROG.c -o $IM_PROG - sh magick.sh $IM_PROG + sh ./magick.sh $IM_PROG */ #include diff --git a/api_examples/magick_command.c b/api_examples/magick_command.c index 1b9734585..df608971d 100644 --- a/api_examples/magick_command.c +++ b/api_examples/magick_command.c @@ -7,13 +7,13 @@ gcc -lMagickWand -lMagickCore magick_command.c -o magick_command - Compile and run directly in Source Directory... + Compile and run directly from Source Directory... IM_PROG=api_examples/magick_command gcc -I`pwd` -LMagickWand/.libs -LMagickCore/.libs \ -lMagickWand -lMagickCore $IM_PROG.c -o $IM_PROG - sh magick.sh $IM_PROG + sh ./magick.sh $IM_PROG */ #include diff --git a/api_examples/magick_script.mgk b/api_examples/magick_script.mgk index b12b472b7..ed28366dc 100755 --- a/api_examples/magick_script.mgk +++ b/api_examples/magick_script.mgk @@ -2,12 +2,16 @@ # # Magick Script # +# Assumes the "magick-script" symlink to "magick" command has been installed +# -size 100x100 xc:red ( rose: -rotate -90 ) +append -write show: # exit - not really needed here -- more for pipelines and debugging -exit + + ------------------------------------------------------------------------------- This area is completely ignored by the magick script. diff --git a/api_examples/magick.sh b/api_examples/magick_shell.sh similarity index 64% rename from api_examples/magick.sh rename to api_examples/magick_shell.sh index 8ee4b1d11..c34d5e4b3 100755 --- a/api_examples/magick.sh +++ b/api_examples/magick_shell.sh @@ -1,4 +1,7 @@ #!/bin/sh +# +# Assumes the "magick" command has been installed +# magick -size 100x100 xc:red \ \( rose: -rotate -90 \) \ +append show: diff --git a/api_examples/wand.c b/api_examples/wand.c index 7d4e2e653..d71059bb8 100644 --- a/api_examples/wand.c +++ b/api_examples/wand.c @@ -10,13 +10,13 @@ gcc -lMagickWand -lMagickCore wand.c -o wand - Compile and run directly in Source Directory... + Compile and run directly from Source Directory... IM_PROG=api_examples/wand gcc -I`pwd` -LMagickWand/.libs -LMagickCore/.libs \ -lMagickWand -lMagickCore $IM_PROG.c -o $IM_PROG - sh magick.sh $IM_PROG + sh ./magick.sh $IM_PROG */ #include @@ -103,13 +103,13 @@ int main(int argc, char *argv[]) red = DestroyMagickWand(red); /* finished with 'red' wand */ /* NOTE ABOUT MagickAppendImages() * - * It is important to either set first or reset the iterator before + * It is important to either 'set first' or 'reset' the iterator before * appending images, as only images from current image onward are * appended together. * - * Also note how a new wand is created by this operation, and that want - * does not inherit any settings from the previous wand (at least not at - * this time). + * Also note how a new wand is created by this operation, and that new + * wand does not inherit any settings from the previous wand (at least not + * at this time). */ /* Final output */ @@ -123,11 +123,12 @@ int main(int argc, char *argv[]) } /* - * The above can be simplified further. + * The above can be simplified further, though that is not what "magick" + * command would do which we are simulating. * - * Specifically you can read the 'rose' image directly into the 'red' image - * wand. Then process just that rose image, even though it is sharing the - * same wand as another image. + * Specifically you can read the 'rose' image directly on the end of of + * 'red' image wand. Then process just that rose image, even though it is + * sharing the same wand as another image. * * Remember in MagickWand, simple image operators are only applied to the * current image in the wand an to no other image! To apply a simple image