From 8749c1a8c9d2dc5c12b080005301e715d6d4c6e7 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 9 Apr 2016 08:23:57 -0400 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/163 --- Makefile.in | 2 ++ config/Makefile.am | 2 ++ configure | 2 +- utilities/magick-script.1 | 11 +++++++---- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4836ecb29..1bbf61934 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3028,6 +3028,7 @@ configlib_DATA = \ config/quantization-table.xml \ config/thresholds.xml \ config/type.xml \ + config/type-apple.xml \ config/type-dejavu.xml \ config/type-ghostscript.xml \ config/type-windows.xml @@ -3051,6 +3052,7 @@ CONFIG_EXTRA_DIST = \ config/quantization-table.xml \ config/sRGB.icm \ config/thresholds.xml \ + config/type-apple.xml.in \ config/type-dejavu.xml.in \ config/type-ghostscript.xml.in \ config/type-windows.xml.in \ diff --git a/config/Makefile.am b/config/Makefile.am index ffe7aa6de..6f93a54d0 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -42,6 +42,7 @@ configlib_DATA = \ config/quantization-table.xml \ config/thresholds.xml \ config/type.xml \ + config/type-apple.xml \ config/type-dejavu.xml \ config/type-ghostscript.xml \ config/type-windows.xml @@ -65,6 +66,7 @@ CONFIG_EXTRA_DIST = \ config/quantization-table.xml \ config/sRGB.icm \ config/thresholds.xml \ + config/type-apple.xml.in \ config/type-dejavu.xml.in \ config/type-ghostscript.xml.in \ config/type-windows.xml.in \ diff --git a/configure b/configure index 37b929a0e..b431f166e 100755 --- a/configure +++ b/configure @@ -4523,7 +4523,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_GIT_REVISION=17946:253f0a8:20160401 +MAGICK_GIT_REVISION=18000:b1b8626:20160409 # Substitute library versioning diff --git a/utilities/magick-script.1 b/utilities/magick-script.1 index 5d6360a30..562f79865 100644 --- a/utilities/magick-script.1 +++ b/utilities/magick-script.1 @@ -1,13 +1,16 @@ .TH magick 1 "Date: 2009/01/10 01:00:00" "ImageMagick" .SH NAME -magick \- convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. +magick-script \- scripting language that converts between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. .SH SYNOPSIS .TP -\fBmagick\fP [\fIinput-options\fP] \fIinput-file\fP [\fIoutput-options\fP] \fIoutput-file\fP +\fBmagick-script\fP [\fIinput-options\fP] \fIinput-file\fP [\fIoutput-options\fP] \fIoutput-file\fP .SH OVERVIEW -The \fBmagick\fP program is a member of the ImageMagick(1) suite of tools. Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. +The \fBmagick-script\fP program is a member of the ImageMagick(1) suite of tools. Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. Here is an example script: -For more information about the magick command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php. + #!/bin/env magick-script + -size 100x100 xc:red ( rose: -rotate -90 ) +append -write show: + +For more information about the magick-script command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/magick-script.html or http://www.imagemagick.org/script/magick-script.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file -- 2.40.0