From: cristy Date: Sat, 6 Jun 2015 18:23:08 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~944 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fa14339eaad5f0cfb6c8dfe6b905c308031eb85;p=imagemagick --- diff --git a/README.md b/README.md index ad6fca3a4..aab50bac9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/ImageMagick/ImageMagick.svg?branch=master)](https://travis-ci.org/ImageMagick/ImageMagick) +[![Build Status](https://travis-ci.org/ImageMagick/ImageMagick.svg?branch=ImageMagick-6)](https://travis-ci.org/ImageMagick/ImageMagick) #Introduction to ImageMagick @@ -23,19 +23,20 @@ and can read, process, or write mega-, giga-, or tera-pixel image sizes. 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. + or as source code that you may use, copy, modify, and distribute in both open + and proprietary applications. It is distributed under the Apache 2.0 license. 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. + that includes memory error and thread data race detection to prevent + security vulnerabilities. ImageMagick is available from http://www.imagemagick.org/download to download. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others. - The authoritative ImageMagick web site is http://www.imagemagick.org. + The authoritative ImageMagick web site is + http://www.imagemagick.org. The authoritative source code repository is + http://subversion.imagemagick.org/subversion/ImageMagick/. #Features and Capabilities @@ -93,10 +94,9 @@ * ImageMagick on the iPhone: convert, edit, or compose images on your iPhone. - Examples of ImageMagick Usage, http://www.imagemagick.org/Usage/, shows how - to use ImageMagick from the command-line to accomplish any of these tasks and - much more. Also, see Fred's ImageMagick Scripts, - http://www.fmwconcepts.com/imagemagick/: a plethora of command-line scripts - that perform geometric transforms, blurs, sharpens, edging, noise removal, - and color manipulations. - + Examples of ImageMagick Usage shows how to use ImageMagick from the + command-line to accomplish any of these tasks and much more. Also, + see Fred's ImageMagick Scripts: a plethora of command-line scripts that + perform geometric transforms, blurs, sharpens, edging, noise removal, + and color manipulations. With Magick.NET, use ImageMagick without having + to install ImageMagick on your server or desktop. diff --git a/README.txt b/README.txt index e6d791de6..0702134ae 100644 --- a/README.txt +++ b/README.txt @@ -3,15 +3,15 @@ Introduction to ImageMagick 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 200) including PNG, JPEG, JPEG-2000, GIF, TIFF, DPX, EXR, WebP, Postscript, - PDF, and SVG. Use ImageMagick to resize, flip, mirror, rotate, distort, + PDF, and SVG. 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. 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 + language. Choose from these interfaces: G2F (Ada), MagickCore (C), + MagickWand (C), ChMagick (Ch), ImageMagickObject (COM+), Magick++ (C++), + JMagick (Java), L-Magick (Lisp), Lua, NMagick (Neko/haXe), Magick.NET (.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 @@ -21,19 +21,21 @@ Introduction to ImageMagick and can read, process, or write mega-, giga-, or tera-pixel image sizes. 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. + or as source code that you may use, copy, modify, and distribute in both open + and proprietary applications. It is distributed under the Apache 2.0 license. 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. + that includes memory error and thread data race detection to prevent + security vulnerabilities. - ImageMagick is available from http://www.imagemagick.org/download to - download. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others. + The current release is ImageMagick 6.9.1-4 available from + http://www.imagemagick.org/download. It runs on Linux, Windows, Mac + Os X, iOS, Android OS, and others. - The authoritative ImageMagick web site is http://www.imagemagick.org. + The authoritative ImageMagick web site is + http://www.imagemagick.org. The authoritative source code repository is + http://subversion.imagemagick.org/subversion/ImageMagick/. Features and Capabilities @@ -89,12 +91,12 @@ Features and Capabilities concert across heterogeneous platforms consisting of CPUs, GPUs, and other processors. * ImageMagick on the iPhone: convert, edit, or compose images on your - iPhone. + iPhone or iPad. - Examples of ImageMagick Usage, http://www.imagemagick.org/Usage/, shows how - to use ImageMagick from the command-line to accomplish any of these tasks and - much more. Also, see Fred's ImageMagick Scripts, - http://www.fmwconcepts.com/imagemagick/: a plethora of command-line scripts - that perform geometric transforms, blurs, sharpens, edging, noise removal, - and color manipulations. + Examples of ImageMagick Usage shows how to use ImageMagick from the + command-line to accomplish any of these tasks and much more. Also, + see Fred's ImageMagick Scripts: a plethora of command-line scripts that + perform geometric transforms, blurs, sharpens, edging, noise removal, + and color manipulations. With Magick.NET, use ImageMagick without having + to install ImageMagick on your server or desktop.