From: cristy Date: Sat, 26 Jun 2010 00:47:03 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9177 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7cb431570e143cb30e7ae29fd524882a1f40e63;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index f037c37db..3d8422134 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.2 -%global Patchlevel 8 +%global Patchlevel 9 Name: ImageMagick Version: %{VERSION} diff --git a/PerlMagick/check.sh.in b/PerlMagick/check.sh.in index 2e17f0121..854ea98af 100644 --- a/PerlMagick/check.sh.in +++ b/PerlMagick/check.sh.in @@ -41,10 +41,10 @@ fi if test -x PerlMagick -a -f Makefile.aperl ; then # Static build test incantation - ${MAKE} -f Makefile.aperl CC='@CC@' test + ${MAKE} -f Makefile.aperl CC='@CC@' TEST_VERBOSE=1 test elif test -f Makefile -a -f Magick.o; then # Shared build test incantation - ${MAKE} CC='@CC@' test + ${MAKE} CC='@CC@' TEST_VERBOSE=1 test else echo 'PerlMagick has not been built!' exit 1 diff --git a/coders/mat.c b/coders/mat.c index aedb2adbc..d6a59e0f9 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -1072,7 +1072,7 @@ ModuleExport size_t RegisterMATImage(void) entry->encoder=(EncodeImageHandler *) WriteMATImage; entry->blob_support=MagickFalse; entry->seekable_stream=MagickTrue; - entry->description=AcquireString("MATLAB image format"); + entry->description=AcquireString("MATLAB level 5 image format"); entry->module=AcquireString("MAT"); (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); diff --git a/config/configure.xml b/config/configure.xml index 893ad56ec..a9292f0a0 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/index.html b/index.html index 5f11f43ab..dcfcab793 100644 --- a/index.html +++ b/index.html @@ -228,7 +228,7 @@ Discourse Server • - Studio + Studio   diff --git a/libtool b/libtool index a606439db..888b11e43 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.6.2-8 +# Generated automatically by config.status (ImageMagick) 6.6.2-9 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/blob.c b/magick/blob.c index 8316d3054..e76796518 100644 --- a/magick/blob.c +++ b/magick/blob.c @@ -269,8 +269,8 @@ MagickExport MagickBooleanType BlobToFile(char *filename,const void *blob, break; } } - file=close(file)-1; - if (i < length) + file=close(file); + if ((file == -1) || (i < length)) { ThrowFileException(exception,BlobError,"UnableToWriteBlob",filename); return(MagickFalse); @@ -868,13 +868,19 @@ MagickExport unsigned char *FileToBlob(const char *filename,const size_t extent, if ((size_t) (i+count) >= extent) break; } - file=close(file)-1; + file=close(file); if (blob == (unsigned char *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",filename); return((unsigned char *) NULL); } + if (file == -1) + { + blob=(unsigned char *) RelinquishMagickMemory(blob); + ThrowFileException(exception,BlobError,"UnableToReadBlob",filename); + return((unsigned char *) NULL); + } *length=MagickMin(i+count,extent); blob[*length]='\0'; return(blob); @@ -919,8 +925,13 @@ MagickExport unsigned char *FileToBlob(const char *filename,const size_t extent, return((unsigned char *) NULL); } } - file=close(file)-1; blob[*length]='\0'; + file=close(file); + if (file == -1) + { + blob=(unsigned char *) RelinquishMagickMemory(blob); + ThrowFileException(exception,BlobError,"UnableToReadBlob",filename); + } return(blob); } @@ -1036,7 +1047,10 @@ MagickExport MagickBooleanType FileToImage(Image *image,const char *filename) break; } } - file=close(file)-1; + file=close(file); + if (file == -1) + ThrowFileException(&image->exception,BlobError,"UnableToWriteBlob", + filename); blob=(unsigned char *) RelinquishMagickMemory(blob); return(MagickTrue); } @@ -1568,9 +1582,9 @@ MagickExport MagickBooleanType ImageToFile(Image *image,char *filename, if (i < length) break; } - file=close(file)-1; + file=close(file); buffer=(unsigned char *) RelinquishMagickMemory(buffer); - if (i < length) + if ((file == -1) || (i < length)) { ThrowFileException(exception,BlobError,"UnableToWriteBlob",filename); return(MagickFalse); @@ -1870,7 +1884,9 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info, status=WriteBlobStream(image,(size_t) count,buffer) == count ? MagickTrue : MagickFalse; } - file=close(file)-1; + file=close(file); + if (file == -1) + ThrowFileException(exception,FileOpenError,"UnableToWriteBlob",filename); (void) RelinquishUniqueFileResource(filename); buffer=(unsigned char *) RelinquishMagickMemory(buffer); return(status); diff --git a/magick/magic.c b/magick/magic.c index 7dab5094e..9ce446b12 100644 --- a/magick/magic.c +++ b/magick/magic.c @@ -132,6 +132,7 @@ static const MagicMapInfo { "JPEG", 0, MagickString("\377\330\377") }, { "JPC", 0, MagickString("\377\117") }, { "JP2", 4, MagickString("\152\120\040\040\015") }, + { "MAT", 0, MagickString("MATLAB 5.0 MAT-file,") }, { "MIFF", 0, MagickString("Id=ImageMagick") }, { "MIFF", 0, MagickString("id=ImageMagick") }, { "MNG", 0, MagickString("\212MNG\r\n\032\n") }, diff --git a/magick/version.h b/magick/version.h index f5c1ab270..55721b8c4 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,10 +30,10 @@ extern "C" { #define MagickLibVersion 0x662 #define MagickLibVersionText "6.6.2" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-8" +#define MagickLibAddendum "-9" #define MagickLibInterface 3 #define MagickLibMinInterface 3 -#define MagickReleaseDate "2010-06-22" +#define MagickReleaseDate "2010-06-25" #define MagickChangeDate "20100622" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.2/index.html" diff --git a/version.sh b/version.sh index 5782b6cb4..aa3d544b9 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.2' PACKAGE_LIB_VERSION="0x662" -PACKAGE_RELEASE="8" +PACKAGE_RELEASE="9" PACKAGE_LIB_VERSION_NUMBER="6,6,2,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 76e694713..46e089003 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -176,7 +176,7 @@

The configure script looks at your environment and decides what it can cobble together to get ImageMagick compiled and installed on your system. This includes finding a compiler, where your compiler header files are located (e.g. stdlib.h), and if any delegate libraries are available for ImageMagick to use (e.g. JPEG, PNG, TIFF, etc.). If you are willing to accept configure's default options, and build from within the source directory, you can simply type:

-

$magick> cd ImageMagick-6.6.2-7 $magick> ./configure

+

$magick> cd ImageMagick-6.6.2-8 $magick> ./configure

Watch the configure script output to verify that it finds everything that you think it should. Pay particular attention to the last lines of the script output. For example, here is a recent report from our system:

@@ -528,7 +528,7 @@ Options used to compile and link:

Download the ImageMagick source distribution and verify the distribution against its message digest.

Unpack and change into the top-level ImageMagick directory:

-

$magick> tar xvfz ImageMagick-6.6.2-7.tar.gz $magick> cd ImageMagick-6.6.2-7

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.6.2-8.tar.gz $magick> cd ImageMagick-6.6.2-8

Configure ImageMagick:

$magick> ./configure --prefix=/opt --with-quantum-depth=16 \
--disable-dependency-tracking --with-x=yes \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \
@@ -548,7 +548,7 @@ Options used to compile and link:

Although you can download and install delegate libraries yourself, many are already available in the GnuWin32 distribution. Download and install whichever delegate libraries you require such as JPEG, PNG, TIFF, etc. Make sure you specify the development headers when you install a package. Next type,

-

$magick> tar jxvf ImageMagick-6.6.2-?.tar.bz2 $magick> cd ImageMagick-6.6.2-7 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

+

$magick> tar jxvf ImageMagick-6.6.2-?.tar.bz2 $magick> cd ImageMagick-6.6.2-8 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

Dealing with Unexpected Problems

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 0d133a4ef..a5fbea8c0 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -428,7 +428,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.2-7-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.6.2-8-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
  2. Complete the installer screens to install ImageMagick on your system.
diff --git a/www/animate.html b/www/animate.html index 5cd320e90..19e2cea63 100644 --- a/www/animate.html +++ b/www/animate.html @@ -143,7 +143,7 @@ Druckerei Online
diff --git a/www/api.html b/www/api.html index 8035d61ad..0cf7fb4cf 100644 --- a/www/api.html +++ b/www/api.html @@ -160,7 +160,7 @@

Ada

-

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

+

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

C

@@ -172,7 +172,7 @@

Ch

-

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

+

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

COM+

@@ -184,31 +184,31 @@

C++

-

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

+

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

Java

-

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

+

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

LabVIEW

-

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

+

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

Lisp

-

CL-Magick provides a Common Lisp interface to the ImageMagick library.

+

CL-Magick provides a Common Lisp interface to the ImageMagick library.

Neko

-

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

+

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

.NET

@@ -222,7 +222,7 @@

Pascal

-

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

+

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

Perl

@@ -234,50 +234,50 @@

PHP

-

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

+

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

-

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

+

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

-

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

+

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

Python

-

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

+

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

-

PythonMagick is an object-oriented Python interface to ImageMagick.

+

PythonMagick is an object-oriented Python interface to ImageMagick.

REALbasic

-

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

+

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

Ruby

-

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

+

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

-

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

+

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

-

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

+

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

-

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

+

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

Tcl/Tk

-

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

+

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

XML RPC

-

RemoteMagick is an XML-RPC web service that creates image thumbnails.

+

RemoteMagick is an XML-RPC web service that creates image thumbnails.

diff --git a/www/api/animate.html b/www/api/animate.html index 6b4f0f293..d0113ab98 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/annotate.html b/www/api/annotate.html index b7ea90f29..09d73273e 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -142,7 +142,7 @@ Druckerei Online @@ -322,7 +322,7 @@ _8c.html" target="source" name="GetTypeMetrics">GetTypeMetrics Discourse Server • - Studio + Studio   diff --git a/www/api/blob.html b/www/api/blob.html index 060634654..a3d0b67ea 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/cache.html b/www/api/cache.html index 91f445bff..c328f5ab7 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/colormap.html b/www/api/colormap.html index 3c6af74eb..c9e7b1252 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/compare.html b/www/api/compare.html index 287133b07..be6aecd1f 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -142,7 +142,7 @@ Druckerei Online @@ -325,7 +325,7 @@ _8c.html" target="source" name="SimilarityImage">SimilarityImage Discourse Server • - Studio + Studio   diff --git a/www/api/composite.html b/www/api/composite.html index 04e239ee6..75f98e476 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -232,7 +232,7 @@ _8c.html" target="source" name="TextureImage">TextureImage Discourse Server • - Studio + Studio   diff --git a/www/api/constitute.html b/www/api/constitute.html index 531e7fce9..284c7df5b 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -142,7 +142,7 @@ Druckerei Online @@ -333,7 +333,7 @@ _8c.html" target="source" name="WriteImages">WriteImages Discourse Server • - Studio + Studio   diff --git a/www/api/decorate.html b/www/api/decorate.html index 7d1795a07..389dc7bf5 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -142,7 +142,7 @@ Druckerei Online @@ -236,7 +236,7 @@ _8c.html" target="source" name="RaiseImage">RaiseImage Discourse Server • - Studio + Studio   diff --git a/www/api/display.html b/www/api/display.html index ecc321ed6..38bceab8f 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -236,7 +236,7 @@ _8c.html" target="source" name="XDisplayBackgroundImage">XDisplayBackgroundImage Discourse Server • - Studio + Studio   diff --git a/www/api/distort.html b/www/api/distort.html index fcf6016b5..11236f962 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -257,7 +257,7 @@ _8c.html" target="source" name="SparseColorImage">SparseColorImage Discourse Server • - Studio + Studio   diff --git a/www/api/draw.html b/www/api/draw.html index 23636257a..74f0773b3 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -141,6 +141,9 @@ + @@ -375,7 +378,7 @@ _8c.html" target="source" name="GetAffineMatrix">GetAffineMatrix Discourse Server • - Studio + Studio   diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 5e22b54b3..65435e81d 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -142,7 +142,7 @@ Druckerei Online @@ -526,7 +526,7 @@ _8c.html" target="source" name="DrawGetBorderColor">DrawGetBorderColor _8c.html" target="source" name="DrawGetClipPath">DrawGetClipPath
-

DrawGetClipPath() obtains the current clipping path ID. The value returned must be deallocated by the user when it is no ssize_ter needed.

+

DrawGetClipPath() obtains the current clipping path ID. The value returned must be deallocated by the user when it is no longer needed.

The format of the DrawGetClipPath method is:

@@ -678,7 +678,7 @@ _8c.html" target="source" name="DrawGetFillRule">DrawGetFillRule _8c.html" target="source" name="DrawGetFont">DrawGetFont
-

DrawGetFont() returns a null-terminaged string specifying the font used when annotating with text. The value returned must be freed by the user when no ssize_ter needed.

+

DrawGetFont() returns a null-terminaged string specifying the font used when annotating with text. The value returned must be freed by the user when no longer needed.

The format of the DrawGetFont method is:

@@ -696,7 +696,7 @@ _8c.html" target="source" name="DrawGetFont">DrawGetFont _8c.html" target="source" name="DrawGetFontFamily">DrawGetFontFamily
-

DrawGetFontFamily() returns the font family to use when annotating with text. The value returned must be freed by the user when it is no ssize_ter needed.

+

DrawGetFontFamily() returns the font family to use when annotating with text. The value returned must be freed by the user when it is no longer needed.

The format of the DrawGetFontFamily method is:

@@ -862,7 +862,7 @@ _8c.html" target="source" name="DrawGetStrokeColor">DrawGetStrokeColor _8c.html" target="source" name="DrawGetStrokeDashArray">DrawGetStrokeDashArray
-

DrawGetStrokeDashArray() returns an array representing the pattern of dashes and gaps used to stroke paths (see DrawSetStrokeDashArray). The array must be freed once it is no ssize_ter required by the user.

+

DrawGetStrokeDashArray() returns an array representing the pattern of dashes and gaps used to stroke paths (see DrawSetStrokeDashArray). The array must be freed once it is no longer required by the user.

The format of the DrawGetStrokeDashArray method is:

@@ -1046,7 +1046,7 @@ _8c.html" target="source" name="DrawGetTextDecoration">DrawGetTextDecoration _8c.html" target="source" name="DrawGetTextEncoding">DrawGetTextEncoding
-

DrawGetTextEncoding() returns a null-terminated string which specifies the code set used for text annotations. The string must be freed by the user once it is no ssize_ter required.

+

DrawGetTextEncoding() returns a null-terminated string which specifies the code set used for text annotations. The string must be freed by the user once it is no longer required.

The format of the DrawGetTextEncoding method is:

@@ -1118,7 +1118,7 @@ _8c.html" target="source" name="DrawGetTextInterwordSpacing">DrawGetTextInterwor _8c.html" target="source" name="DrawGetVectorGraphics">DrawGetVectorGraphics
-

DrawGetVectorGraphics() returns a null-terminated string which specifies the vector graphics generated by any graphics calls made since the wand was instantiated. The string must be freed by the user once it is no ssize_ter required.

+

DrawGetVectorGraphics() returns a null-terminated string which specifies the vector graphics generated by any graphics calls made since the wand was instantiated. The string must be freed by the user once it is no longer required.

The format of the DrawGetVectorGraphics method is:

@@ -3067,7 +3067,7 @@ _8c.html" target="source" name="PushDrawingWand">PushDrawingWand Discourse Server • - Studio + Studio  
diff --git a/www/api/feature.html b/www/api/feature.html index 2786db23e..c81d0822d 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -142,7 +142,7 @@ Druckerei Online
@@ -193,7 +193,7 @@ _8c.html" target="source" name="GetImageChannelFeatures">GetImageChannelFeatures Discourse Server • - Studio + Studio  
diff --git a/www/api/fx.html b/www/api/fx.html index 851021463..bb996852a 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -141,6 +141,9 @@ +
diff --git a/www/api/image.html b/www/api/image.html index 01b03332f..975fe850f 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -141,6 +141,9 @@ + @@ -1047,7 +1050,7 @@ _8c.html" target="source" name="SyncImageSettings">SyncImageSettings Discourse Server • - Studio + Studio   diff --git a/www/api/list.html b/www/api/list.html index e23b50fbb..d1895c573 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index e6a7438b8..557629cc4 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -979,7 +979,7 @@ _8c.html" target="source" name="PixelIteratorGetException">PixelIteratorGetExcep Discourse Server • - Studio + Studio   diff --git a/www/api/magick-property.html b/www/api/magick-property.html index b6b7ea41b..651a87d58 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -142,7 +142,7 @@ Druckerei Online @@ -1627,7 +1627,7 @@ _8c.html" target="source" name="MagickSetType">MagickSetType Discourse Server • - Studio + Studio   diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index 0f8610a99..a4835c610 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -632,7 +632,7 @@ _8c.html" target="source" name="NewMagickWandFromImage">NewMagickWandFromImage  --> Discourse Server • - Studio + Studio   diff --git a/www/api/magick.html b/www/api/magick.html index b3e2c4256..3bdc66a48 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -240,7 +240,7 @@ _8c.html" target="source" name="SetMagickPrecision">SetMagickPrecision Discourse Server • - Studio + Studio   diff --git a/www/api/memory.html b/www/api/memory.html index 522cd71db..f6e00a766 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -404,7 +404,7 @@ _8c.html" target="source" name="SetMagickMemoryMethods">SetMagickMemoryMethods  --> Discourse Server • - Studio + Studio   diff --git a/www/api/module.html b/www/api/module.html index 6d723498c..8a0cc0009 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -516,7 +516,7 @@ _8c.html" target="source" name="UnregisterModule">UnregisterModule Discourse Server • - Studio + Studio   diff --git a/www/api/montage.html b/www/api/montage.html index 394c74578..e25f3d507 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -253,7 +253,7 @@ _8c.html" target="source" name="MontageImageList">MontageImageList Discourse Server • - Studio + Studio   diff --git a/www/api/morphology.html b/www/api/morphology.html index 835db371a..d42932774 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -142,7 +142,7 @@ Druckerei Online @@ -152,7 +152,7 @@
-

[** This macro IsNaN • AcquireKernelInfo • AcquireKernelBuiltIn • CloneKernelInfo • DestroyKernelInfo • ExpandMirrorKernelInfo • ExpandRotateKernelInfo • MorphologyApply • MorphologyImageChannel • ScaleGeometryKernelInfo • ScaleKernelInfo • ShowKernelInfo • UnityAddKernelInfo • ZeroKernelNans]

+

[** This macro IsNaN • AcquireKernelInfo • AcquireKernelBuiltIn • CloneKernelInfo • DestroyKernelInfo • MorphologyApply • MorphologyImageChannel • ScaleGeometryKernelInfo • ScaleKernelInfo • ShowKernelInfo • UnityAddKernelInfo • ZeroKernelNans]

** This macro IsNaN

@@ -168,7 +168,7 @@ _8c.html" target="source" name="AcquireKernelInfo">AcquireKernelInfo

The kernel so generated can be any rectangular array of floating point values (doubles) with the 'control point' or 'pixel being affected' anywhere within that array of values.

-

Previously IM was restricted to a square of odd size using the exact center as origin, this is no ssize_ter the case, and any rectangular kernel with any value being declared the origin. This in turn allows the use of highly asymmetrical kernels.

+

Previously IM was restricted to a square of odd size using the exact center as origin, this is no longer the case, and any rectangular kernel with any value being declared the origin. This in turn allows the use of highly asymmetrical kernels.

The floating point values in the kernel can also include a special value known as 'nan' or 'not a number' to indicate that this value is not part of the kernel array. This allows you to shaped the kernel within its rectangular area. That is 'nan' values provide a 'mask' for the kernel shape. However at least one non-nan value must be provided for correct working of a kernel.

@@ -376,7 +376,7 @@ _8c.html" target="source" name="AcquireKernelBuiltIn">AcquireKernelBuiltInCloneKernelInfo
-

CloneKernelInfo() creates a new clone of the given Kernel List so that its can be modified without effecting the original. The cloned kernel should be destroyed using DestoryKernelInfo() when no ssize_ter needed.

+

CloneKernelInfo() creates a new clone of the given Kernel List so that its can be modified without effecting the original. The cloned kernel should be destroyed using DestoryKernelInfo() when no longer needed.

The format of the CloneKernelInfo method is:

@@ -409,51 +409,6 @@ _8c.html" target="source" name="DestroyKernelInfo">DestroyKernelInfo

ExpandMirrorKernelInfo

-
- -

ExpandMirrorKernelInfo() takes a single kernel, and expands it into a sequence of 90-degree rotated kernels but providing a reflected 180 rotatation, before the -/+ 90-degree rotations.

- -

This special rotation order produces a better, more symetrical thinning of objects.

- -

The format of the ExpandMirrorKernelInfo method is:

- -
-  void ExpandMirrorKernelInfo(KernelInfo *kernel)
-
- -

A description of each parameter follows:

- -
kernel
-

    the Morphology/Convolution kernel

- -

This function is only internel to this module, as it is not finalized, especially with regard to non-orthogonal angles, and rotation of larger 2D kernels.

-
-

ExpandRotateKernelInfo

-
- -

ExpandRotateKernelInfo() takes a kernel list, and expands it by rotating incrementally by the angle given, until the first kernel repeats.

- -

WARNING: 45 degree rotations only works for 3x3 kernels. While 90 degree roatations only works for linear and square kernels

- -

The format of the ExpandRotateKernelInfo method is:

- -
-  void ExpandRotateKernelInfo(KernelInfo *kernel, double angle)
-
- -

A description of each parameter follows:

- -
kernel
-

    the Morphology/Convolution kernel

- -
angle
-

    angle to rotate in degrees

- -

This function is only internel to this module, as it is not finalized, especially with regard to non-orthogonal angles, and rotation of larger 2D kernels.

-
-

MorphologyApply

diff --git a/www/api/paint.html b/www/api/paint.html index e8b3b684e..77f92c05f 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -142,7 +142,7 @@ Druckerei Online
@@ -326,7 +326,7 @@ _8c.html" target="source" name="TransparentPaintImageChroma">TransparentPaintIma Discourse Server • - Studio + Studio   diff --git a/www/api/pixel-view.html b/www/api/pixel-view.html index 73b7bc89b..63857479f 100644 --- a/www/api/pixel-view.html +++ b/www/api/pixel-view.html @@ -567,7 +567,7 @@ _8c.html" target="source" name="UpdatePixelViewIterator">UpdatePixelViewIterator Discourse Server • - Studio + Studio   diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index 920501ecf..6b94b9bf8 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -1397,7 +1397,7 @@ _8c.html" target="source" name="PixelSetYellowQuantum">PixelSetYellowQuantum Discourse Server • - Studio + Studio   diff --git a/www/api/property.html b/www/api/property.html index c5a8132b8..a54e665c3 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -141,9 +141,6 @@ - @@ -397,7 +394,7 @@ _8c.html" target="source" name="SetImageProperty">SetImageProperty Discourse Server • - Studio + Studio   diff --git a/www/api/quantize.html b/www/api/quantize.html index a789a9b96..8383b5666 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -141,9 +141,6 @@ - @@ -482,7 +479,7 @@ _8c.html" target="source" name="SetGrayscaleImage">SetGrayscaleImage Discourse Server • - Studio + Studio   diff --git a/www/api/registry.html b/www/api/registry.html index 1cd009cf0..452134a28 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -142,7 +142,7 @@ Druckerei Online @@ -314,7 +314,7 @@ _8c.html" target="source" name="SetImageRegistry">SetImageRegistry Discourse Server • - Studio + Studio   diff --git a/www/api/resource.html b/www/api/resource.html index a3b6c2305..331a0ec0b 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/segment.html b/www/api/segment.html index eebe9632d..df615e38f 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -142,7 +142,7 @@ Druckerei Online @@ -193,7 +193,7 @@ _8c.html" target="source" name="SegmentImage">SegmentImage Discourse Server • - Studio + Studio   diff --git a/www/api/shear.html b/www/api/shear.html index 473862235..6c9d6bd21 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -142,7 +142,7 @@ Druckerei Online @@ -265,7 +265,7 @@ _8c.html" target="source" name="ShearImage">ShearImage Discourse Server • - Studio + Studio   diff --git a/www/api/statistic.html b/www/api/statistic.html index 0485343e3..2cc3bccef 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/stream.html b/www/api/stream.html index 8e8316a0c..3aa344c40 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/version.html b/www/api/version.html index 025f33b3b..bd0959b11 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/architecture.html b/www/architecture.html index 7a367af4c..ebb422622 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -239,7 +239,7 @@

When the pixel cache is initialized, pixels are scaled from whatever bit depth they originated from to that required by the pixel cache. For example, a 1-channel 1-bit monochrome PBM image is scaled to a 4 channel 8-bit RGBA image, if you are using the Q8 version of ImageMagick, and 16-bit RGBA for the Q16 version. You can determine which version you have with the ‑version option:

-

$magick> identify -versionVersion: ImageMagick 6.6.2-7 2010-74-75 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.6.2-8 2010-84-85 Q16 http://www.imagemagick.org

As you can see, the convenience of the pixel cache sometimes comes with a trade-off in storage (e.g. storing a 1-bit monochrome image as 16-bit RGBA is wasteful) and speed (i.e. storing the entire image in memory is generally slower than accessing one scanline of pixels at a time). In most cases, the benefits of the pixel cache typically outweigh any disadvantages.

@@ -1332,7 +1332,7 @@ ModuleExport unsigned long analyzeImage(Image **images,const int argc, Discourse Server • - Studio + Studio   diff --git a/www/binary-releases.html b/www/binary-releases.html index 4defbfb52..acb5c0f04 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -174,16 +174,16 @@ - ImageMagick-6.6.2-7.i386.rpm - download - download + ImageMagick-6.6.2-8.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.6.2-7.x86_64.rpm - download - download + ImageMagick-6.6.2-8.x86_64.rpm + download + download CentOS 5.4 x86_64 RPM @@ -213,7 +213,7 @@

ImageMagick RPM's are self-installing. Simply type the following command and you're ready to start using ImageMagick:

-

$magick> rpm -Uvh ImageMagick-6.6.2-7.i386.rpm

+

$magick> rpm -Uvh ImageMagick-6.6.2-8.i386.rpm

For other systems, create (or choose) a directory to install the package into and change to that directory, for example:

$magick> cd $HOME

@@ -295,7 +295,7 @@

ImageMagick runs on all recent Windows releases except Windows 95 / 98. We recommend its use on an NT-based version of Windows (NT4, 2000, 2003, XP, or Vista). Starting with ImageMagick 5.5.7, older versions such as Windows 95 / 98 are not supported anymore. The amount of memory can be an important factor, especially if you intend to work on large images. A minimum of 256 MB of RAM is recommended, but the more RAM the better. Although ImageMagick runs fine on a single core computer, it automagically runs in parallel on dual and quad-core systems reducing run times considerably.

The Windows version of ImageMagick is self-installing. Simply click on the appropriate version below and it will launch itself and ask you a few installation questions. Versions with Q8 in the name are 8 bits-per-pixel component (e.g. 8-bit red, 8-bit green, etc.), whereas, Q16 in the filename are 16 bits-per-pixel component. A Q16 version permits you to read or write 16-bit images without losing precision but requires twice as much resources as the Q8 version. Versions with dll in the filename include ImageMagick libraries as dynamic link libraries. If you are not sure which version is appropriate, choose -ImageMagick-6.6.2-7-Q16-windows-dll.exe.

+ImageMagick-6.6.2-8-Q16-windows-dll.exe.

@@ -307,44 +307,44 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/www/changelog.html b/www/changelog.html index 55723ba72..528c8d9e7 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -152,7 +152,12 @@
-
    2010-06-17 6.6.2-7 Cristy <quetzlzacatenango@image...>
    +
      2010-06-22 6.6.2-8 Cristy <quetzlzacatenango@image...>
      +
    • Skip byte when DDS bitcount is 32 (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=16487).
      • +
    • Montage now uses final background setting (e.g. montage -background none ... -background lightblue show:).
      • +
    • Do not annotate directory paths in ListFiles().
      • +
    • Reset the image matte for png:color-type=2.

      • +
      2010-06-17 6.6.2-7 Cristy <quetzlzacatenango@image...>
    • Support new label:pointsize property.
    • Miscellany->Slide Show, in the display program, now cycles through the image sequence.
    • Recognize certain hex color values (e.g. #b9e1cc00) for the -fx argument.
      • @@ -1586,7 +1591,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/cipher.html b/www/cipher.html index 27d50f14b..ba791bb73 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -143,7 +143,7 @@ Druckerei Online @@ -206,7 +206,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/color.html b/www/color.html index 1f430a23d..9949c3c24 100644 --- a/www/color.html +++ b/www/color.html @@ -5018,7 +5018,7 @@ color swatch of that color and to convert to all the other color models. Discourse Server • - Studio + Studio   diff --git a/www/command-line-options.html b/www/command-line-options.html index 684554d8b..67b956888 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -146,7 +146,7 @@ Druckerei Online @@ -5986,7 +5986,7 @@ percentage, which defaults to 100 percent (no color change).

Discourse Server • - Studio + Studio   diff --git a/www/command-line-tools.html b/www/command-line-tools.html index 4883d7f98..06f4341c4 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -154,11 +154,11 @@

[animate • compare • composite • conjure • convert • display • identify • import • mogrify • montage • stream]

-

ImageMagick includes a number of command-line utilities for manipulating images. Most of you are probably accustomed to editing images one at a time with a graphical user interface (GUI) with such programs as gimp or Photoshop. However, a GUI is not always convenient. Suppose you want to process an image dynamically from a web script or you want to apply the same operations to many images or repeat a specific operation at different times to the same or different image. For these types of operations, the command-line image processing utility is appropriate.

+

ImageMagick includes a number of command-line utilities for manipulating images. Most of you are probably accustomed to editing images one at a time with a graphical user interface (GUI) with such programs as gimp or Photoshop. However, a GUI is not always convenient. Suppose you want to process an image dynamically from a web script or you want to apply the same operations to many images or repeat a specific operation at different times to the same or different image. For these types of operations, the command-line image processing utility is appropriate.

The ImageMagick command-line tools exit with a status of 0 if the command line arguments have a proper syntax and no problems are encountered. Expect a descriptive message and an exit status of 1 if any exception occurs such as improper syntax, a problem reading or writing an image, or any other problem that prevents the command from completing successfully.

-

In the paragraphs below, find a short description for each command-line tool. Click on the program name to get details about the program usage and a list of command-line options that alters how the program behaves. If you are just getting acquainted with ImageMagick, start with the convert program. Be sure to peruse Anthony Thyssen's tutorial on how to use ImageMagick utilities to convert, compose, or edit images from the command-line.

+

In the paragraphs below, find a short description for each command-line tool. Click on the program name to get details about the program usage and a list of command-line options that alters how the program behaves. If you are just getting acquainted with ImageMagick, start with the convert program. Be sure to peruse Anthony Thyssen's tutorial on how to use ImageMagick utilities to convert, compose, or edit images from the command-line.

animate

@@ -232,7 +232,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/composite.html b/www/composite.html index cde443ef6..a6747c621 100644 --- a/www/composite.html +++ b/www/composite.html @@ -600,7 +600,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/conjure.html b/www/conjure.html index 2501d0fba..6870cd447 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -306,7 +306,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/contact.html b/www/contact.html index 7e145a533..a77e9dfe4 100644 --- a/www/contact.html +++ b/www/contact.html @@ -142,7 +142,7 @@ Druckerei Online @@ -160,7 +160,7 @@

Contact the Development Team

-

Use this form to contact the ImageMagick Wizards for any of the issues listed below. You can expect a reply within 24-48 hours if your message is on topic and is a sponsorshp, license, or security issue. The bug and documentation issues are for reporting only. For any other issue, post your message to the discourse server.

+

Use this form to contact the ImageMagick Wizards for any of the issues listed below. You can expect a reply within 24-48 hours if your message is on topic and is a sponsorshp, license, or security issue. The bug and documentation issues are for reporting only. For any other issue, post your message to the discourse server.

Contact the Wizards

Enter this code, diff --git a/www/download.html b/www/download.html index 5ad93a53e..88cd22185 100644 --- a/www/download.html +++ b/www/download.html @@ -142,7 +142,7 @@ Druckerei Online

@@ -154,7 +154,7 @@

ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below. ImageMagick stable and development source releases are also available from Subversion. Before you download, you may want to review recent changes to the ImageMagick distribution.

-

The latest release of ImageMagick is version 6.6.2-7.

+

The latest release of ImageMagick is version 6.6.2-8.

Australia
ftp://mirror.aarnet.edu.au/pub/ImageMagick/
diff --git a/www/escape.html b/www/escape.html index 9c33606f9..77c9e1039 100644 --- a/www/escape.html +++ b/www/escape.html @@ -143,7 +143,7 @@ Druckerei Online @@ -441,7 +441,7 @@ for an image with filename bird.miff and whose width is 512 and heigh Discourse Server • - Studio + Studio   diff --git a/www/examples.html b/www/examples.html index e13f5ce8b..fd09350a2 100644 --- a/www/examples.html +++ b/www/examples.html @@ -142,7 +142,7 @@ Druckerei Online @@ -152,7 +152,7 @@
-

Here are a few examples of what you can do with an image using ImageMagick from the command line, a program interface, or script. You can generate this image yourself with this PerlMagick script, examples.pl.


+

Here are a few examples of what you can do with an image using ImageMagick from the command line, a program interface, or script. You can generate this image yourself with this PerlMagick script, examples.pl.


[ImageMagick] @@ -164,7 +164,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/exception.html b/www/exception.html index e33c63d69..77bcf8441 100644 --- a/www/exception.html +++ b/www/exception.html @@ -142,7 +142,7 @@ Druckerei Online
@@ -354,7 +354,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/formats.html b/www/formats.html index 2ebe1b274..e50a865bf 100644 --- a/www/formats.html +++ b/www/formats.html @@ -1768,7 +1768,7 @@ convert \( -size 15x15 xc:black xc:white -append \) \ Discourse Server • - Studio + Studio   diff --git a/www/fx.html b/www/fx.html index bb4d3024c..c367d7b1c 100644 --- a/www/fx.html +++ b/www/fx.html @@ -143,7 +143,7 @@ Druckerei Online @@ -473,7 +473,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index 8f23acc60..d712577e8 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/history.html b/www/history.html index d57f12520..733441a04 100644 --- a/www/history.html +++ b/www/history.html @@ -164,7 +164,7 @@ I swear by my life and my love of it that I will never live for the sake of anot

The next generation of ImageMagick, version 5, started when Bob Friesenhahn contacted me and suggested I improve the application programming interface so users could leverage the image-processing algorithms from other languages or scripts. Bob also wrote a C++ wrapper for ImageMagick called Magick++, and began contributing enhancements such as the module loader facility, automatic file identification, and test suites. In the mean-time, the project picked up a few other notable contributors: Glenn Randers-Pehrson, William Radcliffe, and Leonard Rosenthol. By now, ImageMagick was being utilized by tens of thousands of users, who reacted gruffly when a new release broke an existing API call or script. The other members of the group wanted to freeze the API and command line but I was not quite ready, since ImageMagick was not quite what I had envisioned it could be. Bob and the others created a fork of ImageMagick while I continued to develop ImageMagick.

-

I did not work alone for long. Anthony Thyssen contacted me about deficiencies in the ImageMagick command line programs. He pointed out that the command line was confusing when dealing with more than one image. He suggested an orderly, well-defined method for dealing with the command line, and this became ImageMagick version 6 (the current release). His efforts are detailed on his web pages, Examples of ImageMagick Usage. I highly recommend that you peruse his site. He has illustrated the power of ImageMagick in ways that even I did not know were possible.

+

I did not work alone for long. Anthony Thyssen contacted me about deficiencies in the ImageMagick command line programs. He pointed out that the command line was confusing when dealing with more than one image. He suggested an orderly, well-defined method for dealing with the command line, and this became ImageMagick version 6 (the current release). His efforts are detailed on his web pages, Examples of ImageMagick Usage. I highly recommend that you peruse his site. He has illustrated the power of ImageMagick in ways that even I did not know were possible.

Another notable contributer, Fred Weinhaus, makes available a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.

@@ -178,7 +178,7 @@ I swear by my life and my love of it that I will never live for the sake of anot Discourse Server • - Studio + Studio   diff --git a/www/identify.html b/www/identify.html index bc30b61ff..25804a19d 100644 --- a/www/identify.html +++ b/www/identify.html @@ -142,7 +142,7 @@ Druckerei Online @@ -222,7 +222,7 @@ Tainted: False
Filesize: 3.97266kb
Number pixels: 3.14453kb
- Version: ImageMagick 6.6.2-7 2010-74-75 Q16 http://www.imagemagick.org

+ Version: ImageMagick 6.6.2-8 2010-84-85 Q16 http://www.imagemagick.org

To get the print size in inches of an image at 72 DPI, use:

$magick> identify -format "%[fx:w/72] by %[fx:h/72] inches" document.png8.5 x 11 inches

@@ -430,7 +430,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/import.html b/www/import.html index 7a52c0159..a7da3d78c 100644 --- a/www/import.html +++ b/www/import.html @@ -495,7 +495,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/index.html b/www/index.html index c810c6ac7..828da9cd6 100644 --- a/www/index.html +++ b/www/index.html @@ -228,7 +228,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/install-source.html b/www/install-source.html index 2642f5f8c..428f21546 100644 --- a/www/install-source.html +++ b/www/install-source.html @@ -223,7 +223,7 @@ to compile the program and on completion run the program.

Discourse Server • - Studio + Studio   diff --git a/www/jp2.html b/www/jp2.html index 11ebe9a3d..a10fdd8d7 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -168,6 +168,9 @@

$magick> convert wizard.png -define jp2:cblkwidth=64 -define jp2:cblkheight=32 \
-define jp2:nomct -define jp2:numrlvls=4 -define jp2:rate=0.015625 wizard.jpc

+

Here we convert a giga-byte TIFF image to JPEG-2000 with a reduced memory footprint:

+ +

$magick> convert frame-00038.tif -define jp2:tilewidth=256 -define jp2:tileheight=256 frame-00038.jp2

Here is a complete list of JPEG-2000 encoding options:

diff --git a/www/license.html b/www/license.html index 91c2341e6..f7ba25759 100644 --- a/www/license.html +++ b/www/license.html @@ -274,7 +274,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/links.html b/www/links.html index 94bb5b5f6..6e60f6eb3 100644 --- a/www/links.html +++ b/www/links.html @@ -142,7 +142,7 @@ Druckerei Online @@ -160,23 +160,23 @@

Command-line Tutorials

@@ -184,18 +184,18 @@
@@ -203,10 +203,10 @@
@@ -214,24 +214,24 @@

ImageMagick Book Review

Mailing List Archives

@@ -239,13 +239,13 @@
Denmark
-
http://imagemagick.europnews.de

+
http://imagemagick.europnews.de

Germany
-
http://imagemagick.linux-mirror.org

+
http://imagemagick.linux-mirror.org

Ireland
-
http://imagemagick.oss-mirror.org

+
http://imagemagick.oss-mirror.org

United States
-
http://www.imagemagick.org
+
http://www.imagemagick.org
@@ -253,16 +253,16 @@
    -
    G'MIC: convert, manipulate and visualize generic 1D/2D/3D multi-spectral image files
    -
    Image Commander: bulk picture processing with a GUI
    +
    G'MIC: convert, manipulate and visualize generic 1D/2D/3D multi-spectral image files
    +
    Image Commander: bulk picture processing with a GUI

Other Projects Hosted by ImageMagick Studio

diff --git a/www/magick-core.html b/www/magick-core.html index 870fabd8c..7673e6167 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -287,7 +287,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/magick-wand.html b/www/magick-wand.html index d89fa69f9..91cf507c0 100644 --- a/www/magick-wand.html +++ b/www/magick-wand.html @@ -455,7 +455,7 @@ int main(int argc,char **argv) Discourse Server • - Studio + Studio   diff --git a/www/miff.html b/www/miff.html index f20f52113..dcc434f4b 100644 --- a/www/miff.html +++ b/www/miff.html @@ -142,7 +142,7 @@ Druckerei Online @@ -308,7 +308,7 @@ or fewer colors in the image, each byte of image data contains an index value. I Discourse Server • - Studio + Studio   diff --git a/www/mirrors.html b/www/mirrors.html index a72b7a5ff..515e6220e 100644 --- a/www/mirrors.html +++ b/www/mirrors.html @@ -155,9 +155,9 @@

The ImageMagick web site is available from a variety of web mirrors around the world listed below.

France
-
http://imagemagick.europnews.de/

+
http://imagemagick.europnews.de/

Unites States
-
http://www.imagemagick.org/
+
http://www.imagemagick.org/

If you want to add a new web-site mirror, please contact us.

@@ -167,7 +167,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/montage.html b/www/montage.html index 5b10364a7..5fca5ddf9 100644 --- a/www/montage.html +++ b/www/montage.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/motion-picture.html b/www/motion-picture.html index d89a06c1b..3e12fa4ef 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/perl-magick.html b/www/perl-magick.html index 685ddb708..0482fb772 100644 --- a/www/perl-magick.html +++ b/www/perl-magick.html @@ -2558,7 +2558,7 @@ blobs in any of these image formats and provid Discourse Server • - Studio + Studio   diff --git a/www/quantize.html b/www/quantize.html index 5af83b8b1..99653de45 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -285,7 +285,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/search.html b/www/search.html index 8c1b6d52b..78ecf86c8 100644 --- a/www/search.html +++ b/www/search.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/sitemap.html b/www/sitemap.html index d8b4850d4..3c4aeed3d 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -142,7 +142,7 @@ Druckerei Online @@ -163,7 +163,7 @@
Introduction: convert, edit, and compose images from the command-line or program interface.
Examples of ImageMagick usage: a few examples that show what you can do with an image using ImageMagick.
-
Anthony Thyssen's examples of ImageMagick usage: a comprehensive tutorial of using ImageMagick from the command line.
+
Anthony Thyssen's examples of ImageMagick usage: a comprehensive tutorial of using ImageMagick from the command line.
Color names: how to specify a color name, a hex color, or a numerical RGB, RGBA, HSL, HSLA, CMYK, or CMYKA color.
Resources: ImageMagick depends on external resources including configuration files, loadable modules, fonts, and environment variables.
Architecture: get to know more about the software and algorithms behind ImageMagick.
@@ -177,12 +177,12 @@
Download ImageMagick: ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors.
@@ -221,7 +221,7 @@
Command line processing: the anatomy of the command line.
Command line options: annotated list of all options that can appear on the command-line.
Fx: apply a mathematical expression to an image or image channels.
-
Fred's ImageMagick Scripts: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.
+
Fred's ImageMagick Scripts: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.
@@ -231,21 +231,21 @@
Program interfaces: application programming interfaces.
    -
    ChMagick: is a Ch an embeddable MagickCore C/C++ interpreter for cross-platform scripting.
    -
    CL-Magick: provides a Common Lisp interface to the ImageMagick library.
    -
    G2F: implements an Ada 95 binding to a subset of the low-level MagickCore library.
    -
    Magick++: provides an object-oriented C++ interface to ImageMagick.
    -
    IMagick: is a native PHP extension to create and modify images using the ImageMagick API.
    -
    JMagick: provides an object-oriented Java interface to ImageMagick.
    +
    ChMagick: is a Ch an embeddable MagickCore C/C++ interpreter for cross-platform scripting.
    +
    CL-Magick: provides a Common Lisp interface to the ImageMagick library.
    +
    G2F: implements an Ada 95 binding to a subset of the low-level MagickCore library.
    +
    Magick++: provides an object-oriented C++ interface to ImageMagick.
    +
    IMagick: is a native PHP extension to create and modify images using the ImageMagick API.
    +
    JMagick: provides an object-oriented Java interface to ImageMagick.
    MagickCore: C API, recommended for wizard-level developers.
    MagickWand: convert, compose, and edit images from the C language.
    -
    MagickWand for PHP: a native PHP-extension to the ImageMagick MagickWand API.
    -
    nMagick: is a port of the ImageMagick library to the haXe and Neko platforms.
    -
    PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
    +
    MagickWand for PHP: a native PHP-extension to the ImageMagick MagickWand API.
    +
    nMagick: is a port of the ImageMagick library to the haXe and Neko platforms.
    +
    PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
    PerlMagick: convert, compose, and edit images from the Perl language.
    -
    PythonMagick: an object-oriented Python interface to ImageMagick.
    -
    RMagick: is an interface between the Ruby programming language and ImageMagick.
    -
    TclMagick: a native Tcl-extension to the ImageMagick MagickWand API.
    +
    PythonMagick: an object-oriented Python interface to ImageMagick.
    +
    RMagick: is an interface between the Ruby programming language and ImageMagick.
    +
    TclMagick: a native Tcl-extension to the ImageMagick MagickWand API.
@@ -265,8 +265,8 @@
-
Definitive Guide to ImageMagick: this book explains ImageMagick in a practical, learn-by-example fashion.
-
ImageMagick Tricks: this book is packed with examples of photo manipulations, logo creation, animations, and complete web projects.
+
Definitive Guide to ImageMagick: this book explains ImageMagick in a practical, learn-by-example fashion.
+
ImageMagick Tricks: this book is packed with examples of photo manipulations, logo creation, animations, and complete web projects.
Discourse server: get help from fellow ImageMagick users and developers, post to these forums.
Contact the Wizards: for bug reports (only if you do not want to sign up to the discourse server), a source or documentation patch, a security or license issue, or if you want to be a sponsor of the ImageMagick project.
@@ -276,7 +276,7 @@
-
Report bugs and vulnerabilities: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can contact the ImageMagick developers with a convenient web form.
+
Report bugs and vulnerabilities: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can contact the ImageMagick developers with a convenient web form.
Sponsor ImageMagick: contribute bug fixes, enhancements, hardware, funds, etc. to ensure the ImageMagick project thrives.
ImageMagick t-shirt: donate $25 USD and we acknowledge your gift with a logoed t-shirt.
@@ -302,8 +302,8 @@

Technology Sandbox

-
Fourier Transform Processing With ImageMagick
-
ImageMagick v6 Examples -- Fourier Transforms
+
Fourier Transform Processing With ImageMagick
+
ImageMagick v6 Examples -- Fourier Transforms
diff --git a/www/source/examples.pl b/www/source/examples.pl index 49a02c1c9..b14fd3f71 100644 --- a/www/source/examples.pl +++ b/www/source/examples.pl @@ -1,460 +1,2 @@ -#!/usr/bin/perl -# -# Overall demo of the major PerlMagick methods. -# -use Image::Magick; +Error: Can't locate object method "Label" via package "Exception 410: no images defined `Image::Magick' @ error/Magick.xs/XS_Image__Magick_Clone/2886" (perhaps you forgot to load "Exception 410: no images defined `Image::Magick' @ error/Magick.xs/XS_Image__Magick_Clone/2886"?) at /var/www/html/ImageMagick/source/examples.pl line 35. -# -# Read model & smile image. -# -print "Read...\n"; -$null=Image::Magick->new; -$null->Set(size=>'70x70'); -$x=$null->ReadImage('NULL:black'); -warn "$x" if "$x"; - -$model=Image::Magick->new(); -$x=$model->ReadImage('model.gif'); -warn "$x" if "$x"; -$model->Label('Magick'); -$model->Set(background=>'white'); - -$smile=Image::Magick->new; -$x=$smile->ReadImage('smile.gif'); -warn "$x" if "$x"; -$smile->Label('Smile'); -$smile->Set(background=>'white'); -# -# Create image stack. -# -print "Transform image...\n"; -$images=Image::Magick->new(); - -print "Adaptive Blur...\n"; -$example=$model->Clone(); -$example->Label('Adaptive Blur'); -$example->AdaptiveBlur('0x1'); -push(@$images,$example); - -print "Adaptive Resize...\n"; -$example=$model->Clone(); -$example->Label('Adaptive Resize'); -$example->AdaptiveResize('60%'); -push(@$images,$example); - -print "Adaptive Sharpen...\n"; -$example=$model->Clone(); -$example->Label('Adaptive Sharpen'); -$example->AdaptiveSharpen('0x1'); -push(@$images,$example); - -print "Adaptive Threshold...\n"; -$example=$model->Clone(); -$example->Label('Adaptive Threshold'); -$example->AdaptiveThreshold('5x5+5%'); -push(@$images,$example); - -print "Add Noise...\n"; -$example=$model->Clone(); -$example->Label('Add Noise'); -$example->AddNoise("Laplacian"); -push(@$images,$example); - -print "Annotate...\n"; -$example=$model->Clone(); -$example->Label('Annotate'); -$example->Annotate(text=>'Magick',geometry=>'+0+20',font=>'Generic.ttf', - fill=>'gold',gravity=>'North',pointsize=>14); -push(@$images,$example); - -print "Auto-gamma...\n"; -$example=$model->Clone(); -$example->Label('Auto Gamma'); -$example->AutoGamma(); -push(@$images,$example); - -print "Auto-level...\n"; -$example=$model->Clone(); -$example->Label('Auto Level'); -$example->AutoLevel(); -push(@$images,$example); - -print "Blur...\n"; -$example=$model->Clone(); -$example->Label('Blur'); -$example->Blur('0.0x1.0'); -push(@$images,$example); - -print "Border...\n"; -$example=$model->Clone(); -$example->Label('Border'); -$example->Border(geometry=>'6x6',color=>'gold'); -push(@$images,$example); - -print "Channel...\n"; -$example=$model->Clone(); -$example->Label('Channel'); -$example->Channel(channel=>'red'); -push(@$images,$example); - -print "Charcoal...\n"; -$example=$model->Clone(); -$example->Label('Charcoal'); -$example->Charcoal('0x1'); -push(@$images,$example); - -print "ColorMatrix...\n"; -$example=$model->Clone(); -$example->Label('ColorMatrix'); -$example->ColorMatrix([1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0.5, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1]); -push(@$images,$example); - -print "Composite...\n"; -$example=$model->Clone(); -$example->Label('Composite'); -$example->Composite(image=>$smile,compose=>'over',geometry=>'+35+65'); -push(@$images,$example); - -print "Contrast...\n"; -$example=$model->Clone(); -$example->Label('Contrast'); -$example->Contrast(); -push(@$images,$example); - -print "Contrast Stretch...\n"; -$example=$model->Clone(); -$example->Label('Contrast Stretch'); -$example->ContrastStretch('5%'); -push(@$images,$example); - -print "Convolve...\n"; -$example=$model->Clone(); -$example->Label('Convolve'); -$example->Convolve([1, 1, 1, 1, 4, 1, 1, 1, 1]); -push(@$images,$example); - -print "Crop...\n"; -$example=$model->Clone(); -$example->Label('Crop'); -$example->Crop(geometry=>'80x80+25+50'); -$example->Set(page=>'0x0+0+0'); -push(@$images,$example); - -print "Despeckle...\n"; -$example=$model->Clone(); -$example->Label('Despeckle'); -$example->Despeckle(); -push(@$images,$example); - -print "Distort...\n"; -$example=$model->Clone(); -$example->Label('Distort'); -$example->Distort(method=>'arc',points=>[60],'virtual-pixel'=>'white'); -push(@$images,$example); - -print "Draw...\n"; -$example=$model->Clone(); -$example->Label('Draw'); -$example->Draw(fill=>'none',stroke=>'gold',primitive=>'circle', - points=>'60,90 60,120',strokewidth=>2); -push(@$images,$example); - -print "Detect Edges...\n"; -$example=$model->Clone(); -$example->Label('Detect Edges'); -$example->Edge(); -push(@$images,$example); - -print "Emboss...\n"; -$example=$model->Clone(); -$example->Label('Emboss'); -$example->Emboss('0x1'); -push(@$images,$example); - -print "Equalize...\n"; -$example=$model->Clone(); -$example->Label('Equalize'); -$example->Equalize(); -push(@$images,$example); - -print "Implode...\n"; -$example=$model->Clone(); -$example->Label('Explode'); -$example->Implode(-1); -push(@$images,$example); - -print "Flip...\n"; -$example=$model->Clone(); -$example->Label('Flip'); -$example->Flip(); -push(@$images,$example); - -print "Flop...\n"; -$example=$model->Clone(); -$example->Label('Flop'); -$example->Flop(); -push(@$images,$example); - -print "Frame...\n"; -$example=$model->Clone(); -$example->Label('Frame'); -$example->Frame('15x15+3+3'); -push(@$images,$example); - -print "Fx...\n"; -$example=$model->Clone(); -$example->Label('Fx'); -push(@$images,$example->Fx(expression=>'0.5*u')); - -print "Gamma...\n"; -$example=$model->Clone(); -$example->Label('Gamma'); -$example->Gamma(1.6); -push(@$images,$example); - -print "Gaussian Blur...\n"; -$example=$model->Clone(); -$example->Label('Gaussian Blur'); -$example->GaussianBlur('0.0x1.5'); -push(@$images,$example); - -print "Gradient...\n"; -$gradient=Image::Magick->new; -$gradient->Set(size=>'130x194'); -$x=$gradient->ReadImage('gradient:#20a0ff-#ffff00'); -warn "$x" if "$x"; -$gradient->Label('Gradient'); -push(@$images,$gradient); - -print "Grayscale...\n"; -$example=$model->Clone(); -$example->Label('Grayscale'); -$example->Set(type=>'grayscale'); -push(@$images,$example); - -print "Implode...\n"; -$example=$model->Clone(); -$example->Label('Implode'); -$example->Implode(0.5); -push(@$images,$example); - -print "Level...\n"; -$example=$model->Clone(); -$example->Label('Level'); -$example->Level('20%'); -push(@$images,$example); - -print "Median Filter...\n"; -$example=$model->Clone(); -$example->Label('Median Filter'); -$example->MedianFilter(); -push(@$images,$example); - -print "Modulate...\n"; -$example=$model->Clone(); -$example->Label('Modulate'); -$example->Modulate(brightness=>110,saturation=>110,hue=>110); -push(@$images,$example); -$example=$model->Clone(); - -print "Monochrome...\n"; -$example=$model->Clone(); -$example->Label('Monochrome'); -$example->Quantize(colorspace=>'gray',colors=>2,dither=>'false'); -push(@$images,$example); - -print "Morphology...\n"; -$example=$model->Clone(); -$example->Label('Morphology'); -$example->Morphology(method=>'Dilate',kernel=>'Diamond',iterations=>3); -push(@$images,$example); - -print "Motion Blur...\n"; -$example=$model->Clone(); -$example->Label('Motion Blur'); -$example->MotionBlur('0x13+10-10'); -push(@$images,$example); - -print "Negate...\n"; -$example=$model->Clone(); -$example->Label('Negate'); -$example->Negate(); -push(@$images,$example); - -print "Normalize...\n"; -$example=$model->Clone(); -$example->Label('Normalize'); -$example->Normalize(); -push(@$images,$example); - -print "Oil Paint...\n"; -$example=$model->Clone(); -$example->Label('Oil Paint'); -$example->OilPaint(); -push(@$images,$example); - -print "Plasma...\n"; -$plasma=Image::Magick->new; -$plasma->Set(size=>'130x194'); -$x=$plasma->ReadImage('plasma:fractal'); -warn "$x" if "$x"; -$plasma->Label('Plasma'); -push(@$images,$plasma); - -print "Polaroid...\n"; -$example=$model->Clone(); -$example->Label('Polaroid'); -$example->Polaroid(caption=>'Magick',rotate=>-5.0,gravity=>'center'); -push(@$images,$example); - -print "Quantize...\n"; -$example=$model->Clone(); -$example->Label('Quantize'); -$example->Quantize(); -push(@$images,$example); - -print "Radial Blur...\n"; -$example=$model->Clone(); -$example->Label('Radial Blur'); -$example->RadialBlur(10); -push(@$images,$example); - -print "Raise...\n"; -$example=$model->Clone(); -$example->Label('Raise'); -$example->Raise('10x10'); -push(@$images,$example); - -print "Reduce Noise...\n"; -$example=$model->Clone(); -$example->Label('Reduce Noise'); -$example->ReduceNoise(); -push(@$images,$example); - -print "Resize...\n"; -$example=$model->Clone(); -$example->Label('Resize'); -$example->Resize('60%'); -push(@$images,$example); - -print "Roll...\n"; -$example=$model->Clone(); -$example->Label('Roll'); -$example->Roll(geometry=>'+20+10'); -push(@$images,$example); - -print "Rotate...\n"; -$example=$model->Clone(); -$example->Label('Rotate'); -$example->Rotate(45); -push(@$images,$example); - -print "Sample...\n"; -$example=$model->Clone(); -$example->Label('Sample'); -$example->Sample('60%'); -push(@$images,$example); - -print "Scale...\n"; -$example=$model->Clone(); -$example->Label('Scale'); -$example->Scale('60%'); -push(@$images,$example); - -print "Segment...\n"; -$example=$model->Clone(); -$example->Label('Segment'); -$example->Segment(); -push(@$images,$example); - -print "Shade...\n"; -$example=$model->Clone(); -$example->Label('Shade'); -$example->Shade(geometry=>'30x30',gray=>'true'); -push(@$images,$example); - -print "Sharpen...\n"; -$example=$model->Clone(); -$example->Label('Sharpen'); -$example->Sharpen('0.0x1.0'); -push(@$images,$example); - -print "Shave...\n"; -$example=$model->Clone(); -$example->Label('Shave'); -$example->Shave('10x10'); -push(@$images,$example); - -print "Shear...\n"; -$example=$model->Clone(); -$example->Label('Shear'); -$example->Shear('-20x20'); -push(@$images,$example); - -print "Sketch...\n"; -$example=$model->Clone(); -$example->Label('Sketch'); -$example->Set(colorspace=>'Gray'); -$example->Sketch('0x20+120'); -push(@$images,$example); - -print "Sigmoidal Contrast...\n"; -$example=$model->Clone(); -$example->Label('Sigmoidal Contrast'); -$example->SigmoidalContrast("3x50%"); -push(@$images,$example); - -print "Spread...\n"; -$example=$model->Clone(); -$example->Label('Spread'); -$example->Spread(); -push(@$images,$example); - -print "Solarize...\n"; -$example=$model->Clone(); -$example->Label('Solarize'); -$example->Solarize(); -push(@$images,$example); - -print "Swirl...\n"; -$example=$model->Clone(); -$example->Label('Swirl'); -$example->Swirl(90); -push(@$images,$example); - -print "Unsharp Mask...\n"; -$example=$model->Clone(); -$example->Label('Unsharp Mask'); -$example->UnsharpMask('0.0x1.0'); -push(@$images,$example); - -print "Vignette...\n"; -$example=$model->Clone(); -$example->Label('Vignette'); -$example->Vignette('0x20'); -push(@$images,$example); - -print "Wave...\n"; -$example=$model->Clone(); -$example->Label('Wave'); -$example->Wave('25x150'); -push(@$images,$example); -# -# Create image montage. -# -print "Montage...\n"; -$montage=$images->Montage(geometry=>'128x160+8+4>',gravity=>'Center', - tile=>'5x+10+200',compose=>'over',background=>'#ffffff', - font=>'Generic.ttf',pointsize=>18,fill=>'#600',stroke=>'none', - shadow=>'true'); - -$logo=Image::Magick->new(); -$logo->Read('logo:'); -$logo->Zoom('40%'); -$montage->Composite(image=>$logo,gravity=>'North'); - -print "Write...\n"; -$montage->Set(matte=>'false'); -$montage->Write('demo.jpg'); -print "Display...\n"; -$montage->Write('win:'); diff --git a/www/sponsors.html b/www/sponsors.html index 912762cbd..be448be04 100644 --- a/www/sponsors.html +++ b/www/sponsors.html @@ -141,6 +141,9 @@ + diff --git a/www/stream.html b/www/stream.html index bda420b3d..ad55ca6e7 100644 --- a/www/stream.html +++ b/www/stream.html @@ -143,7 +143,7 @@ Druckerei Online @@ -341,7 +341,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/subversion.html b/www/subversion.html index dd15baec5..a97a06ac1 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -176,7 +176,7 @@ ImageMagick-6.6.2

Discourse Server • - Studio + Studio   diff --git a/www/t-shirt.html b/www/t-shirt.html index cbbdb9c13..e39cac1c8 100644 --- a/www/t-shirt.html +++ b/www/t-shirt.html @@ -142,7 +142,7 @@ Druckerei Online @@ -191,7 +191,7 @@ Discourse Server • - Studio + Studio  
ImageMagick-6.6.2-7-Q16-windows-dll.exedownloaddownloadImageMagick-6.6.2-8-Q16-windows-dll.exedownloaddownload Win32 dynamic at 16 bits-per-pixel
ImageMagick-6.6.2-7-Q16-windows-static.exedownloaddownloadImageMagick-6.6.2-8-Q16-windows-static.exedownloaddownload Win32 static at 16 bits-per-pixel
ImageMagick-6.6.2-7-Q16-windows-x64-dll.exedownloaddownloadImageMagick-6.6.2-8-Q16-windows-x64-dll.exedownloaddownload x64 dynamic at 16 bits-per-pixel
ImageMagick-6.6.2-7-Q16-windows-x64-static.exedownloaddownloadImageMagick-6.6.2-8-Q16-windows-x64-static.exedownloaddownload x64 static at 16 bits-per-pixel
ImageMagick-6.6.2-7-Q8-windows-dll.exedownloaddownloadImageMagick-6.6.2-8-Q8-windows-dll.exedownloaddownload Win32 dynamic at 8 bits-per-pixel
ImageMagick-6.6.2-7-Q8-windows-static.exedownloaddownloadImageMagick-6.6.2-8-Q8-windows-static.exedownloaddownload Win32 static at 8 bits-per-pixel